Fixed tests broken by role changes.