Support testing for deadlock with batches too