fix the failure of a few global unit tests.