Merge testsuite ERROR fixes from HEAD.
5 files changed