Merge "Fix so wfResetOutputBuffers doesn't break unit tests"