More Unittest updates