Merge "Update CPP test to use new APIs."