Expand EnvironmentVariables + Testing