cleanup set-org-role tests

[#68475822]