Now all tests pass - time to clean-up the route tokeniser code