Merge "Fix partial bucket unit tests." into pi-dev