BVTCK-45 Adapting to changed schema and re-enabling test fixed by HV-755 and HV-757