Fixed broken rspec tests