HCSVLAB-649/652 Improve autotests