Fix broken rspec tests