Fix a few tests using Globals.