refactor rspec files