Make the C++ test case more like the Java one
Make the C++ test case more like the Java one

AeroNotix/algostructure,AeroNotix/algostructure,AeroNotix/algostructure,AeroNotix/algostructure,AeroNotix/algostructure,AeroNotix/algostructure