Merge "Remove redundant import from scenario tests"