Final touches on TestStuff.c++