Refactored the Executors to remove an expected-call-top-super antipattern