Refactored Rspec Tests