Fix controller tests
Update model tests