Provide tests cases for #10197 and #10198
Merge pull request #10217 from s0undt3ch/issues/10198-missed-saltenv

Provide tests cases for #10197 and #10198