AutoBatch test case updates