Refactored rspec