Add test case for new functonality and fix a major test skipping oversight
Add test case for new functonality and fix a major test skipping oversight

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