Refactor rspec WIP