Improve tests for buffer removal