Cleanup + extend tests/pillars
2 files changed