HCSVLAB-632: Added automated tests for HCSVLAB-605