Eliminate the use of globals in tests