Refactoring all test cases and routers