Some warning fixes in cpp-tests.
Merge pull request #5560 from dumganhar/develop

Some warning fixes in cpp-tests.