Fix failing tests for routing