HCSVLAB-376: Update tests