Fixing CustomCommandEnvVariable test cases
Adding proper commandline generation to custom commands with environment variables