DocExtract: fixes for regression tests