Made rspec tests pass