Improve Bucket#toString and its tests