Rspec test fixes