Followup for Issue 6628 + fixes test cookies/general/clipboard