Make Test Executor fix to support no- options clearance