Fixes to StaleEntityCleapupTest, which is looking good now, also some import cleanups.