Coverted additional test cases to cppunit.