Updated the IterationTest.java tests and did a minor cleanup of Iteration.java.