Many updates to C++ tests