Refactor/move some Env tests.