Fix a bug with buckets stream and add tests