Bug 1032436 and added tests for EnvironmentVariablesController