Update tests to use explicit globals