Majority of test suite complete for Model and ModelFactory