Fixed all tests that were broken by improvements to MockExecutor API