Fixed eviction processor and eviction tests.
Small refactorings.