HCSVLAB-145 Improve tests