[HV-VES] Improve hv-ves suite