Port existing tests to rspec methods