Upgrading from rspec2 to rspec3