It's good that there is a test for both batched and unbatched scenarios, but there is a lot of copy and paste from the other test - is it possible to factor this such that the `executeQuery`/`executeBatch` function execution is somehow parameterized?