SimpleStrategyTest extends CleanupHelper to avoid heisenbugs from other tests' left-overs patch by jbellis