Fixed failing specs and implementation of UnsetOrgRole