diff --git a/rdrf/report/tests/schema_tests.py b/rdrf/report/tests/schema_tests.py
index a0fcb7a2d..d363279f3 100644
--- a/rdrf/report/tests/schema_tests.py
+++ b/rdrf/report/tests/schema_tests.py
@@ -73,7 +73,7 @@ def test_query_data_summary_max_address_count(self):
             test {
                 allPatients {
                     dataSummary {
-                        maxAddressCount
+                        patientaddressSet { maxCount }
                     }
                 }
             }
@@ -86,7 +86,11 @@ def test_query_data_summary_max_address_count(self):
             {
                 "data": {
                     "test": {
-                        "allPatients": {"dataSummary": {"maxAddressCount": 0}}
+                        "allPatients": {
+                            "dataSummary": {
+                                "patientaddressSet": {"maxCount": 0}
+                            }
+                        }
                     }
                 }
             },
@@ -106,7 +110,11 @@ def test_query_data_summary_max_address_count(self):
             {
                 "data": {
                     "test": {
-                        "allPatients": {"dataSummary": {"maxAddressCount": 2}}
+                        "allPatients": {
+                            "dataSummary": {
+                                "patientaddressSet": {"maxCount": 2}
+                            }
+                        }
                     }
                 }
             },
@@ -140,7 +148,7 @@ def test_query_data_summary_max_working_group_count(self):
             test {
                 allPatients {
                     dataSummary {
-                        maxWorkingGroupCount
+                        workingGroups { maxCount }
                     }
                 }
             }
@@ -154,7 +162,7 @@ def test_query_data_summary_max_working_group_count(self):
                 "data": {
                     "test": {
                         "allPatients": {
-                            "dataSummary": {"maxWorkingGroupCount": 0}
+                            "dataSummary": {"workingGroups": {"maxCount": 0}}
                         }
                     }
                 }
@@ -174,7 +182,7 @@ def test_query_data_summary_max_working_group_count(self):
                 "data": {
                     "test": {
                         "allPatients": {
-                            "dataSummary": {"maxWorkingGroupCount": 3}
+                            "dataSummary": {"workingGroups": {"maxCount": 3}}
                         }
                     }
                 }
@@ -214,7 +222,7 @@ def test_query_data_summary_max_clinician_count(self):
             test {
                 allPatients {
                     dataSummary {
-                        maxClinicianCount
+                        registeredClinicians { maxCount }
                     }
                 }
             }
@@ -227,7 +235,11 @@ def test_query_data_summary_max_clinician_count(self):
             {
                 "data": {
                     "test": {
-                        "allPatients": {"dataSummary": {"maxClinicianCount": 0}}
+                        "allPatients": {
+                            "dataSummary": {
+                                "registeredClinicians": {"maxCount": 0}
+                            }
+                        }
                     }
                 }
             },
@@ -244,7 +256,11 @@ def test_query_data_summary_max_clinician_count(self):
             {
                 "data": {
                     "test": {
-                        "allPatients": {"dataSummary": {"maxClinicianCount": 4}}
+                        "allPatients": {
+                            "dataSummary": {
+                                "registeredClinicians": {"maxCount": 4}
+                            }
+                        }
                     }
                 }
             },
@@ -270,7 +286,7 @@ def test_query_data_summary_max_parent_guardian_count(self):
             test {
                 allPatients {
                     dataSummary {
-                        maxParentGuardianCount
+                        parentguardianSet { maxCount }
                     }
                 }
             }
@@ -284,7 +300,9 @@ def test_query_data_summary_max_parent_guardian_count(self):
                 "data": {
                     "test": {
                         "allPatients": {
-                            "dataSummary": {"maxParentGuardianCount": 0}
+                            "dataSummary": {
+                                "parentguardianSet": {"maxCount": 0}
+                            }
                         }
                     }
                 }
@@ -306,7 +324,9 @@ def test_query_data_summary_max_parent_guardian_count(self):
                 "data": {
                     "test": {
                         "allPatients": {
-                            "dataSummary": {"maxParentGuardianCount": 2}
+                            "dataSummary": {
+                                "parentguardianSet": {"maxCount": 2}
+                            }
                         }
                     }
                 }
@@ -319,7 +339,7 @@ def test_query_data_summary_max_parent_guardian_count(self):
             another {
                 allPatients {
                     dataSummary {
-                        maxParentGuardianCount
+                        parentguardianSet { maxCount }
                     }
                 }
             }
@@ -332,7 +352,9 @@ def test_query_data_summary_max_parent_guardian_count(self):
                 "data": {
                     "another": {
                         "allPatients": {
-                            "dataSummary": {"maxParentGuardianCount": 3}
+                            "dataSummary": {
+                                "parentguardianSet": {"maxCount": 3}
+                            }
                         }
                     }
                 }