Fixes to tests_corpusbuilders.