DO NOT COMMIT -- improve test error reporting.