#4137 Fix core tests
#4137 start on Batch classes