Unit tests and buffers have been improved.