HMap: testsuite + fixes.