executor clean up and adding tests for coverage
executor clean up and adding tests for coverage