That seems a bit outside of the scope of this pr... Although, sure thats part of the general QA on the batch-api