Made changes to select/create org for env tests