Refactor SingleTestRun