Refactored some batch tests.
Fixed batch name.