More work done on ModelTest.