Cleanup + extend tests/pillars
7 files changed