Fixed up some rspec tests