Update to include test for buffer output problem