HCSVLAB-154: Fixed some tests.