Fixes for bucket tests in 3.3.1
Merge remote-tracking branch 'origin/testing' into testing