Refactor rspec files