eviction test fixes