Finished routes
Rspec refactoring, not finished...