Merge "Cleanup ScenarioGeneral unit tests"