Merge "Cleanup of identity/admin/test_users.py"