Upgrade to rspec3