Converted to using CppUnitTest2.