More batch iterator tests & fixes.