Tidy and tighten HMap merge testing