Merge "Fix finding router for scenario tests"