Clean up routes and tests