HCSVLAB-605-6 Add extra automatic tests