Moved all standard options into a helper class/compilation unit as to reuse it in the Tests Moved the MaxIteration set call in the tests Former-commit-id: f436511107
f436511107