Added test count based batching strategy