Add some C++ style code to test classes.