Merge pull request #1 from salt-formulas/known-fixups

Cleanup + extend tests/pillars