More Fixes for unittrest.