Refactor routes and tests