fixed some of the test cases for new model