Merge "Update tests for scoped tokens and default roles"