Fix Picking + Picking24 and add MultiPart test