fix OrgInstructorRole definition and add tests