fix unit tests
fix unit tests
Merge branch 'develop' of github.com:giantlock/salt into develop
Merge pull request #4393 from giantlock/develop

fix unit tests