cleanup some code in tests (ModelTest)