cleaning up a little and restoring error handling outside expectation running
Merge branch 'expandingNamedBlocks' into addReporter