HCOLL-167 fixed up the tests