Improvements to InstrumentedExecutorServiceTest