Some issues fixed in ScenarioTest.cs