Revert buffers to the previous implementation, and remove a test file