update routing and tests