Added more C++ tests