task1, removed some code dublications; fixed tests to use assertequals, assertsame, removed loop in ParameterizedIteratorTest