fixing controllers and tests for new model