refactoring(routes, tests)