salt-run: fixes for test failures