Fixed C++ tests