[#1665] Test with organizations as well