small adjustments in Buffer and tests