Don't include test stubs in build
Create generic batching bucket updater