Minimum changes and a unit test showing Stream event batching