Fix test cases with new model setup. cgmcandrews