Fixing iteration tests
Merging origin/skhan/master-pending-iterationHelperTestRefactor into master