Add c++mode for test