Work in Progress

@robert-chiniquy Changed in ba0af52. The internal buffer is still left there in case `highWaterMark` is hit. It seems `highWaterMark` isn't limiting the number of tests anymore. Shall we lower the `highWaterMark` from 1024 to a lower value?