Fix broken test
Fix bufferTimed + add bufferSizedAndTimed