Revert "Fixed some failing tests"

This reverts commit d09802fe89f118f72a5973557642533ddb7262ee.
Revert "Revert "Fixed some failing tests""

This reverts commit b392bcbe57e999c2b88996e979c6e8ee2f70ee55.
Merge branch 'master' of github.com:emc2/saltlang