Account for more tests that are not in 2017.7
Account for more tests that are not in 2017.7

I also made sure there are no other missing tests since this bit me once
already.

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