Improved tests for mapstore and eviction in HZ