HCSVLAB-661: Fixed broken tests.