Undo name change in C++ tests for now