Clean up messy/duplicate iteration tests

@bug W-2045512@
@rev rjayaramappa@
Merging origin/tbliss/master-pending-cleanup-iteration-tests into master