Fix failing rspec tests