Simplifying Org/Env creation for system tests.
Merge pull request #633 from omaciel/builtinenv

Simplifying Org/Env creation for system tests.