More clean testing, with a conversion to C++!