Fix in test_cpp for bad macro expansion.