Add more test cases for batches, don't make lazy by default