Refactor RSPEC