Refactor Batching tests