All but one test case for the router now passes