Don't shadow globals
Do a better job of cleanin up before running the tests