Switch away from CPPUNIT to CppUniteLite2 complete.