- Add support for environments to the integration test framework - Add integration tests for simple + merged environments