Batch calls test refactoring