adding test for batch support