Improved tests for mapstore and eviction in HZ
Improved tests for mapstore and eviction in HZ