Removed test code and re-enabled buffering.