Add unit coverage to new Buffer changes