Test
Changed test framework to be C++ instead of C.
Updated mkmk.
Folded the C test code together with the C++ stuff.
Forgot an important rename.
Self-review