Rename Buffer in the tests