HCOLL-134  commented out and removed test
HCOLL-134  added test back in