Split up batch tests into separate files"
Refactored batch operations