Use CBS in HV-VES testsuites