diff --git a/monitoring/uss_qualifier/scenarios/astm/netrid/common/dss/isa_simple.py b/monitoring/uss_qualifier/scenarios/astm/netrid/common/dss/isa_simple.py
index c1d6dc5ae1..c8f4a8b16e 100644
--- a/monitoring/uss_qualifier/scenarios/astm/netrid/common/dss/isa_simple.py
+++ b/monitoring/uss_qualifier/scenarios/astm/netrid/common/dss/isa_simple.py
@@ -361,7 +361,7 @@ def _search_huge_area_step():
             ) as check:
                 _ = self._dss_wrapper.search_isas_expect_response_code(
                     check,
-                    expected_error_codes={413},
+                    expected_error_codes={400, 413},
                     area=self._huge_area,
                 )
 
diff --git a/monitoring/uss_qualifier/scenarios/astm/netrid/common/dss/subscription_simple.py b/monitoring/uss_qualifier/scenarios/astm/netrid/common/dss/subscription_simple.py
index 9e648fba71..2025227093 100644
--- a/monitoring/uss_qualifier/scenarios/astm/netrid/common/dss/subscription_simple.py
+++ b/monitoring/uss_qualifier/scenarios/astm/netrid/common/dss/subscription_simple.py
@@ -441,7 +441,7 @@ def _test_huge_area_search_sub(self):
         ) as check:
             self._dss_wrapper.search_subs_expect_response_code(
                 check=check,
-                expected_codes={413},
+                expected_codes={400, 413},
                 area=self._problematically_big_area,
             )
 
diff --git a/monitoring/uss_qualifier/scenarios/astm/netrid/display_data_evaluator.py b/monitoring/uss_qualifier/scenarios/astm/netrid/display_data_evaluator.py
index 956da71fda..cc2ada5ebb 100644
--- a/monitoring/uss_qualifier/scenarios/astm/netrid/display_data_evaluator.py
+++ b/monitoring/uss_qualifier/scenarios/astm/netrid/display_data_evaluator.py
@@ -574,7 +574,7 @@ def _evaluate_area_too_large_observation(
         with self._test_scenario.check(
             "Area too large", [observer.participant_id]
         ) as check:
-            if query.status_code != 413:
+            if query.status_code not in (400, 413):
                 check.record_failed(
                     summary="Did not receive expected error code for too-large area request",
                     details=f"{observer.participant_id} was queried for flights in {_rect_str(rect)} with a diagonal of {diagonal} which is larger than the maximum allowed diagonal of {self._rid_version.max_diagonal_km}.  The expected error code is 413, but instead code {query.status_code} was received.",
diff --git a/monitoring/uss_qualifier/test_data/che/rid/foca.kml b/monitoring/uss_qualifier/test_data/che/rid/foca.kml
index 65d96e03f6..dc979da3b7 100644
--- a/monitoring/uss_qualifier/test_data/che/rid/foca.kml
+++ b/monitoring/uss_qualifier/test_data/che/rid/foca.kml
@@ -315,7 +315,7 @@
 			<description>serial_number: 36ZN8ZAJFH6N3
 operation_description: Bend west
 operator_id: OP-000002che
-registration_number: CHE2h6zwko1y0xr6
+registration_number: HB.2h6zwko1y0xr6
 aircraft_type: HybridLift
 operator_name: Participant 2
 timestamp_accuracy: 1.0
@@ -417,7 +417,7 @@ accuracy_v: VAUnknown</description>
 			<description>serial_number: VF0M3GRU
 operation_description: Bend west
 operator_id: OP-000001che
-registration_number: CHE5jwwg00t0vfhc
+registration_number: HB.5jwwg00t0vfhc
 aircraft_type: HybridLift
 operator_name: Participant 1
 timestamp_accuracy: 1.0
diff --git a/monitoring/uss_qualifier/test_data/usa/kentland/rid.kml b/monitoring/uss_qualifier/test_data/usa/kentland/rid.kml
index 82503d7bae..be8d4366bd 100644
--- a/monitoring/uss_qualifier/test_data/usa/kentland/rid.kml
+++ b/monitoring/uss_qualifier/test_data/usa/kentland/rid.kml
@@ -317,7 +317,7 @@
 			<description>serial_number: EXPL3123
 operation_description: U-turn south of takeoff
 operator_id: EXAMPLE_OPERATOR2
-registration_number: EXAMPLE_REGISTRATION2
+registration_number: N.123456
 aircraft_type: HybridLift
 operator_name: UFT Participant 2
 timestamp_accuracy: 1.0
@@ -434,7 +434,7 @@ accuracy_v: VAUnknown</description>
 			<description>serial_number: EXAMPLE_SERIAL1
 operation_description: Circle around dairy complex
 operator_id: EXAMPLE_OPERATOR1
-registration_number: EXAMPLE_REGISTRATION1
+registration_number: N.123456
 aircraft_type: Helicopter
 operator_name: UFT Participant 1
 timestamp_accuracy: 1.0
diff --git a/monitoring/uss_qualifier/test_data/usa/netrid/dcdemo.kml b/monitoring/uss_qualifier/test_data/usa/netrid/dcdemo.kml
index ed8928c7d7..5f13a45850 100644
--- a/monitoring/uss_qualifier/test_data/usa/netrid/dcdemo.kml
+++ b/monitoring/uss_qualifier/test_data/usa/netrid/dcdemo.kml
@@ -101,7 +101,7 @@
 			<description>serial_number: EXMPLx31bclx2guk
 operation_description: Traffic Monitoring
 operator_id: OP-d7p4o3l2
-registration_number: FA-atqbGtF5FFc
+registration_number: N.123456
 aircraft_type: Helicopter
 operator_name: Johnson Group
 timestamp_accuracy: 1.0