Fixed bug and update for cppunit