tweak-tests.diff
improve-error-reporting.diff
