Got all rspec tests to pass