Fix failing tests.

Two buffers are needed now that handleFatalError() is blowing one up.
Related to pull request #1158