Modify non-standard for each to iterator-based for loop
Modify unit test to initialize sut for each test method