ENG-6260 fix more executor regressions found by junits