Refactored testexecutor