Update tests to reflect API changes
Rewrite buffers again