Fix existing tests by proper patching and reusing existing constants
Fix existing tests by proper patching and reusing existing constants

saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt