HCSVLAB-631 Fix tests