Adding tests, updating buffers'
'