More tests, here and there minor changes
Compute the bucket as soon as possible