Fixing CustomCommandEnvVariable test cases