Copied test from raet that belongs in salt
Merge remote-tracking branch 'upstream/develop' into sam_raet_38
Unittestified a couple of tests
Merge pull request #12502 from SmithSamuelM/sam_raet_38

Added unittest