Update to Rspec 3.1 syntax