diff --git a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_distinct_values_plan__dfp_0.xml b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_distinct_values_plan__dfp_0.xml
index 387eb97250..29f0eaa0ed 100644
--- a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_distinct_values_plan__dfp_0.xml
+++ b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_distinct_values_plan__dfp_0.xml
@@ -5,16 +5,13 @@
         <OrderByLimitNode>
             <!-- description = Order By ['listing__country_latest'] Limit 100 -->
             <!-- node_id = obl_0 -->
-            <!-- order_by_spec =                                                         -->
-            <!--   {'class': 'OrderBySpec',                                              -->
-            <!--    'descending': False,                                                 -->
-            <!--    'metric_spec': None,                                                 -->
-            <!--    'dimension_spec': {'class': 'DimensionSpec',                         -->
-            <!--                       'element_name': 'country_latest',                 -->
-            <!--                       'entity_links': ({'class': 'EntityReference',     -->
-            <!--                                         'element_name': 'listing'},)},  -->
-            <!--    'time_dimension_spec': None,                                         -->
-            <!--    'entity_spec': None}                                                 -->
+            <!-- order_by_spec =                                                        -->
+            <!--   {'class': 'OrderBySpec',                                             -->
+            <!--    'instance_spec': {'class': 'DimensionSpec',                         -->
+            <!--                      'element_name': 'country_latest',                 -->
+            <!--                      'entity_links': ({'class': 'EntityReference',     -->
+            <!--                                        'element_name': 'listing'},)},  -->
+            <!--    'descending': False}                                                -->
             <!-- limit = 100 -->
             <FilterElementsNode>
                 <!-- description =                    -->
diff --git a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_order_by_plan__dfp_0.xml b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_order_by_plan__dfp_0.xml
index ea902f79a7..1298e65b05 100644
--- a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_order_by_plan__dfp_0.xml
+++ b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_order_by_plan__dfp_0.xml
@@ -5,30 +5,24 @@
         <OrderByLimitNode>
             <!-- description = Order By ['metric_time__day', 'bookings'] -->
             <!-- node_id = obl_0 -->
-            <!-- order_by_spec =                                                      -->
-            <!--   {'class': 'OrderBySpec',                                           -->
-            <!--    'descending': False,                                              -->
-            <!--    'metric_spec': None,                                              -->
-            <!--    'dimension_spec': None,                                           -->
-            <!--    'time_dimension_spec': {'class': 'TimeDimensionSpec',             -->
-            <!--                            'element_name': 'metric_time',            -->
-            <!--                            'entity_links': (),                       -->
-            <!--                            'time_granularity': TimeGranularity.DAY,  -->
-            <!--                            'date_part': None,                        -->
-            <!--                            'aggregation_state': None},               -->
-            <!--    'entity_spec': None}                                              -->
-            <!-- order_by_spec =                                 -->
-            <!--   {'class': 'OrderBySpec',                      -->
-            <!--    'descending': True,                          -->
-            <!--    'metric_spec': {'class': 'MetricSpec',       -->
-            <!--                    'element_name': 'bookings',  -->
-            <!--                    'constraint': None,          -->
-            <!--                    'alias': None,               -->
-            <!--                    'offset_window': None,       -->
-            <!--                    'offset_to_grain': None},    -->
-            <!--    'dimension_spec': None,                      -->
-            <!--    'time_dimension_spec': None,                 -->
-            <!--    'entity_spec': None}                         -->
+            <!-- order_by_spec =                                                -->
+            <!--   {'class': 'OrderBySpec',                                     -->
+            <!--    'instance_spec': {'class': 'TimeDimensionSpec',             -->
+            <!--                      'element_name': 'metric_time',            -->
+            <!--                      'entity_links': (),                       -->
+            <!--                      'time_granularity': TimeGranularity.DAY,  -->
+            <!--                      'date_part': None,                        -->
+            <!--                      'aggregation_state': None},               -->
+            <!--    'descending': False}                                        -->
+            <!-- order_by_spec =                                   -->
+            <!--   {'class': 'OrderBySpec',                        -->
+            <!--    'instance_spec': {'class': 'MetricSpec',       -->
+            <!--                      'element_name': 'bookings',  -->
+            <!--                      'constraint': None,          -->
+            <!--                      'alias': None,               -->
+            <!--                      'offset_window': None,       -->
+            <!--                      'offset_to_grain': None},    -->
+            <!--    'descending': True}                            -->
             <!-- limit = None -->
             <ComputeMetricsNode>
                 <!-- description = Compute Metrics via Expressions -->