Some warning fixes in cpp-tests.