Fix IterationModelTest failures

-Most tests now using mocks