0.9: Fix router tests

This PR fixes the test runner so that the router tests run. All tests now pass except 2 of the policy integration tests dealing with errors.