Fix some C++ test dependencies
2 files changed