Merge "Modify roles tests to deal with a default role."