HCSVLAB-655 Fix tests