fix batchService and test