Merge "Adding tests for EnvironmentProcessor"