ENG-5021: fix broken cpp tests causing by removing one field in TVE.