HCSVLAB-526 Add couple more automated tests