Model and Controller rspec corrections