Fix failing tests on Py3
Fix failing tests on Py3

These should have been failing across the board. I don't know what's
going on with the tests suite

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