update cpp_tests from master