Fix around the whole test envs