HCOLL-20 Improve TestCoverage of SHM