Better UnitTests and more buffer functions