Port one C++ test...

other to do...