improved tests and routers