tweak tests to work with bucket types