Bridge replace flakey II

The bridge_replace function is flakey again after adjusting the logic to remove spare buckets first and adding the ReplaceSuccess::Removed option.`