testing/factory: added MakeEnvironment helper to Factory

To support testing of multi-environment scenarios.

Also removed some comments which are no longer accurate.