use new work-router, add tests