eviction test fixes
Merge pull request #2003 from enesakar/eviction-test-fixes

eviction test fixes