Simplifying Org/Env creation for system tests.

Easy PR