Configuration builder tests
Remove cruft