Fix test failures

**Ready to merge, tests passed**

http://jenkins.saltstack.com/job/salt-rs-rhel5/1511/