Updating routes
Improve routes
Refactoring tests