Fixing router.
Minor fix for tests.