Finish Refactoring Rspec