Merge "More TestEnvironment Stuff" into ics-mr0