#3 simplify batching test setup/teardown