router passes all the tests, refactoring is all that remains