Modify roles tests to deal with a default role.

Change-Id: I82535f0fe7df9a50c06e4eb468a3258cc4270c5f
Merge "Modify roles tests to deal with a default role."