Finally get all test envs working (I think)