Finish refactoring-rspec-tests