fixes randomly failing tests
fixes randomly failing tests review
fixes randomly failing tests review 2
Merge pull request #1930 from ahmetmircik/fixesRandomlyFailingEvictionTests

Fixes randomly failing tests