executor clean up and adding tests for coverage