misc bucket types test fixes