Testing improvements

Without this, the tests will interfere with the environment they are ran in.