Wrote a TestFactory helper class and updated ModelTest.