Update to rspec3