updating for better routes and tests