Update globals to correctly run tests under make