More work towards fixing routing tests.