revised controllers, added and passed Rspec tests