refactored routes, refactored rspec