Update tests to avoid glocal lookup deprecation notices