Update to that a buffer with no re-writes will be output verbatim
Tidy up the test area a little