Fix issues with UnitTester