Passing some buffer tests, but I might break them again