Updates to specs, controllers and models for passing rspec tests