Trying to get buffer tests to pass