No real changes, just simplify by using CATCH macros and a simple fixture instead of CppUnit::TestCase.