HCOLL-211 Fixing a few tests to cover the use cases.