Fix minor bucket test issues