BROKEN: Breaking change to configuration, part way through refactor of tests