Nearing completion of test suite for Model and ModelFactory