Merge "Improve test_implied_domain_roles"