Rewrote buffer test