Improved routes and tests