Fix up C++ basic API test

Change-Id: I80cd8d74e7b12c2097da5b16725dbbd3c079573c
3 files changed