refactored rspec files