internal executor shutdown fix
test fix and cleanup