Merge "Fix import grouping in scenario tests"