BVTCK-32 Enabling and fixing tests related to HV-679