Test suite complete for Model and ModelFactory
ModelFactory now replaces Model