Made some additional fixes to ModelTest