HCOLL-81 removed unnecessary code and fixed test