Switch to Rspec 3