Add some C++ stuff
Add a small C++ test