Remove EnvInject dependency - see if related tests pass