Begin rewrite of tests for IterationModel