c++ify tests