cleanups to the route and router tests