Fixed typos, removed repeated unit tests, and applied code fixes suggested by linter.
Fixed typos, removed repeated unit tests, and applied code fixes suggested by linter.

saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt