Modified test executor to take advantage of new extendable DefaultTestExecutor