Fixing some rspec tests (rspec 3 required)