Refactored batch fetch tests