More work towards removing UnitTest++