Added test for batcher's currentBatch, fixed bug