HCOLL-134 improved test cases