Upgrading to rspec 3