Getting the env stuff tests in a better place