fix findbugs issue
Renamed TestScenario to TestRun
refactored TestRun handling