HCSVLAB-605-6 Further updates to automatic tests