HCOLL-197 updated tests