Update to Rspec 3