fix unit tests
Merge branch 'develop' of github.com:giantlock/salt into develop