Revert "Fix unit tests getting the wrong envrionment var (not sure what changed)" This reverts commit ce247dd3bd66aaad88b3b73b8e8ab8297dc38d9d.