HCSVLAB-886 Fix tests