Test automation fixes
Port ReadEnv tests