Merge "Refactor test_roles_client"