Change the API of Bucketed
Adjust tests for Bucketed API change