HCSVLAB-865: Fixed some failing test.