Port tests to rspec3