refactor TestExecutor