Review changes to some of the global variables, removing where no longer necessary, and ensuring that they are reset after tests are run where they have been used, to maintain test independence