For ENG-5256, fix compilation of C++ tests, still have to fix the failing ones