HugeHashMap override fix and unit test