Refactored: Batch tests