Fix bucket unit tests