More testing with some better buffer control