#2 tests improved, BucketRule added
#2 implemented and tested