Fix model tests
Update model tests