Try to fix Cpp unit tests. DONTBUILD