Refactored rspec's