made changes to select/create org for env tests
Merge pull request #494 from sghai/content_env

Made changes to select/create org for env tests