diff --git a/metricflow/test/plan_conversion/test_dataflow_to_sql_plan.py b/metricflow/test/plan_conversion/test_dataflow_to_sql_plan.py
index 4c4d143e44..6368e85e1e 100644
--- a/metricflow/test/plan_conversion/test_dataflow_to_sql_plan.py
+++ b/metricflow/test/plan_conversion/test_dataflow_to_sql_plan.py
@@ -1011,204 +1011,6 @@ def test_compute_metrics_node_ratio_from_multiple_semantic_models(
     )
 
 
-@pytest.mark.sql_engine_snapshot
-def test_cumulative_metric(
-    request: FixtureRequest,
-    mf_test_session_state: MetricFlowTestSessionState,
-    dataflow_plan_builder: DataflowPlanBuilder,
-    dataflow_to_sql_converter: DataflowToSqlQueryPlanConverter,
-    consistent_id_object_repository: ConsistentIdObjectRepository,
-    sql_client: SqlClient,
-) -> None:
-    """Tests converting a dataflow plan to a SQL query plan where there is a cumulative metric to compute."""
-    dataflow_plan = dataflow_plan_builder.build_plan(
-        MetricFlowQuerySpec(
-            metric_specs=(MetricSpec(element_name="trailing_2_months_revenue"),),
-            dimension_specs=(),
-            time_dimension_specs=(
-                TimeDimensionSpec(
-                    element_name="ds",
-                    entity_links=(),
-                    time_granularity=TimeGranularity.MONTH,
-                ),
-            ),
-        )
-    )
-
-    convert_and_check(
-        request=request,
-        mf_test_session_state=mf_test_session_state,
-        dataflow_to_sql_converter=dataflow_to_sql_converter,
-        sql_client=sql_client,
-        node=dataflow_plan.sink_output_nodes[0].parent_node,
-    )
-
-
-@pytest.mark.sql_engine_snapshot
-def test_cumulative_metric_with_time_constraint(
-    request: FixtureRequest,
-    mf_test_session_state: MetricFlowTestSessionState,
-    dataflow_plan_builder: DataflowPlanBuilder,
-    dataflow_to_sql_converter: DataflowToSqlQueryPlanConverter,
-    consistent_id_object_repository: ConsistentIdObjectRepository,
-    sql_client: SqlClient,
-) -> None:
-    """Tests converting a dataflow plan to a SQL query plan where there is a cumulative metric to compute."""
-    dataflow_plan = dataflow_plan_builder.build_plan(
-        MetricFlowQuerySpec(
-            metric_specs=(MetricSpec(element_name="trailing_2_months_revenue"),),
-            dimension_specs=(),
-            time_dimension_specs=(
-                TimeDimensionSpec(
-                    element_name="ds",
-                    entity_links=(),
-                    time_granularity=TimeGranularity.MONTH,
-                ),
-            ),
-            time_range_constraint=TimeRangeConstraint(
-                start_time=as_datetime("2020-01-01"), end_time=as_datetime("2020-01-01")
-            ),
-        )
-    )
-
-    convert_and_check(
-        request=request,
-        mf_test_session_state=mf_test_session_state,
-        dataflow_to_sql_converter=dataflow_to_sql_converter,
-        sql_client=sql_client,
-        node=dataflow_plan.sink_output_nodes[0].parent_node,
-    )
-
-
-@pytest.mark.sql_engine_snapshot
-def test_cumulative_metric_no_ds(
-    request: FixtureRequest,
-    mf_test_session_state: MetricFlowTestSessionState,
-    dataflow_plan_builder: DataflowPlanBuilder,
-    dataflow_to_sql_converter: DataflowToSqlQueryPlanConverter,
-    consistent_id_object_repository: ConsistentIdObjectRepository,
-    sql_client: SqlClient,
-) -> None:
-    """Tests converting a dataflow plan to a SQL query plan where there is a cumulative metric to compute."""
-    dataflow_plan = dataflow_plan_builder.build_plan(
-        MetricFlowQuerySpec(
-            metric_specs=(MetricSpec(element_name="trailing_2_months_revenue"),),
-            dimension_specs=(),
-            time_dimension_specs=(),
-        )
-    )
-
-    convert_and_check(
-        request=request,
-        mf_test_session_state=mf_test_session_state,
-        dataflow_to_sql_converter=dataflow_to_sql_converter,
-        sql_client=sql_client,
-        node=dataflow_plan.sink_output_nodes[0].parent_node,
-    )
-
-
-@pytest.mark.sql_engine_snapshot
-def test_cumulative_metric_no_window(
-    request: FixtureRequest,
-    mf_test_session_state: MetricFlowTestSessionState,
-    dataflow_plan_builder: DataflowPlanBuilder,
-    dataflow_to_sql_converter: DataflowToSqlQueryPlanConverter,
-    consistent_id_object_repository: ConsistentIdObjectRepository,
-    sql_client: SqlClient,
-) -> None:
-    """Tests converting a dataflow plan to a SQL query plan where there is a windowless cumulative metric to compute."""
-    dataflow_plan = dataflow_plan_builder.build_plan(
-        MetricFlowQuerySpec(
-            metric_specs=(MetricSpec(element_name="revenue_all_time"),),
-            dimension_specs=(),
-            time_dimension_specs=(
-                TimeDimensionSpec(
-                    element_name="ds",
-                    entity_links=(),
-                    time_granularity=TimeGranularity.MONTH,
-                ),
-            ),
-        )
-    )
-
-    convert_and_check(
-        request=request,
-        mf_test_session_state=mf_test_session_state,
-        dataflow_to_sql_converter=dataflow_to_sql_converter,
-        sql_client=sql_client,
-        node=dataflow_plan.sink_output_nodes[0].parent_node,
-    )
-
-
-@pytest.mark.sql_engine_snapshot
-def test_cumulative_metric_no_window_with_time_constraint(
-    request: FixtureRequest,
-    mf_test_session_state: MetricFlowTestSessionState,
-    dataflow_plan_builder: DataflowPlanBuilder,
-    dataflow_to_sql_converter: DataflowToSqlQueryPlanConverter,
-    consistent_id_object_repository: ConsistentIdObjectRepository,
-    sql_client: SqlClient,
-) -> None:
-    """Tests converting a dataflow plan to a SQL query plan where there is a windowless cumulative metric to compute."""
-    dataflow_plan = dataflow_plan_builder.build_plan(
-        MetricFlowQuerySpec(
-            metric_specs=(MetricSpec(element_name="revenue_all_time"),),
-            dimension_specs=(),
-            time_dimension_specs=(
-                TimeDimensionSpec(
-                    element_name="ds",
-                    entity_links=(),
-                    time_granularity=TimeGranularity.MONTH,
-                ),
-            ),
-            time_range_constraint=TimeRangeConstraint(
-                start_time=as_datetime("2020-01-01"), end_time=as_datetime("2020-01-01")
-            ),
-        )
-    )
-
-    convert_and_check(
-        request=request,
-        mf_test_session_state=mf_test_session_state,
-        dataflow_to_sql_converter=dataflow_to_sql_converter,
-        sql_client=sql_client,
-        node=dataflow_plan.sink_output_nodes[0].parent_node,
-    )
-
-
-@pytest.mark.sql_engine_snapshot
-def test_cumulative_metric_grain_to_date(
-    request: FixtureRequest,
-    mf_test_session_state: MetricFlowTestSessionState,
-    dataflow_plan_builder: DataflowPlanBuilder,
-    dataflow_to_sql_converter: DataflowToSqlQueryPlanConverter,
-    consistent_id_object_repository: ConsistentIdObjectRepository,
-    sql_client: SqlClient,
-) -> None:
-    """Tests converting a dataflow plan to a SQL query plan where grain_to_date cumulative metric to compute."""
-    dataflow_plan = dataflow_plan_builder.build_plan(
-        MetricFlowQuerySpec(
-            metric_specs=(MetricSpec(element_name="revenue_mtd"),),
-            dimension_specs=(),
-            time_dimension_specs=(
-                TimeDimensionSpec(
-                    element_name="ds",
-                    entity_links=(),
-                    time_granularity=TimeGranularity.MONTH,
-                ),
-            ),
-        )
-    )
-
-    convert_and_check(
-        request=request,
-        mf_test_session_state=mf_test_session_state,
-        dataflow_to_sql_converter=dataflow_to_sql_converter,
-        sql_client=sql_client,
-        node=dataflow_plan.sink_output_nodes[0].parent_node,
-    )
-
-
 @pytest.mark.sql_engine_snapshot
 def test_derived_metric(  # noqa: D
     request: FixtureRequest,
diff --git a/metricflow/test/query_rendering/test_cumulative_metric_rendering.py b/metricflow/test/query_rendering/test_cumulative_metric_rendering.py
new file mode 100644
index 0000000000..89f323837c
--- /dev/null
+++ b/metricflow/test/query_rendering/test_cumulative_metric_rendering.py
@@ -0,0 +1,219 @@
+"""Tests cumulative metric query rendering by comparing rendered output against snapshot files."""
+
+from __future__ import annotations
+
+import pytest
+from _pytest.fixtures import FixtureRequest
+from dbt_semantic_interfaces.test_utils import as_datetime
+from dbt_semantic_interfaces.type_enums.time_granularity import TimeGranularity
+
+from metricflow.dataflow.builder.dataflow_plan_builder import DataflowPlanBuilder
+from metricflow.filters.time_constraint import TimeRangeConstraint
+from metricflow.plan_conversion.dataflow_to_sql import DataflowToSqlQueryPlanConverter
+from metricflow.protocols.sql_client import SqlClient
+from metricflow.specs.specs import (
+    MetricFlowQuerySpec,
+    MetricSpec,
+    TimeDimensionSpec,
+)
+from metricflow.test.fixtures.model_fixtures import ConsistentIdObjectRepository
+from metricflow.test.fixtures.setup_fixtures import MetricFlowTestSessionState
+from metricflow.test.query_rendering.compare_rendered_query import convert_and_check
+
+
+@pytest.mark.sql_engine_snapshot
+def test_cumulative_metric(
+    request: FixtureRequest,
+    mf_test_session_state: MetricFlowTestSessionState,
+    dataflow_plan_builder: DataflowPlanBuilder,
+    dataflow_to_sql_converter: DataflowToSqlQueryPlanConverter,
+    consistent_id_object_repository: ConsistentIdObjectRepository,
+    sql_client: SqlClient,
+) -> None:
+    """Tests converting a dataflow plan to a SQL query plan where there is a cumulative metric to compute."""
+    dataflow_plan = dataflow_plan_builder.build_plan(
+        MetricFlowQuerySpec(
+            metric_specs=(MetricSpec(element_name="trailing_2_months_revenue"),),
+            dimension_specs=(),
+            time_dimension_specs=(
+                TimeDimensionSpec(
+                    element_name="ds",
+                    entity_links=(),
+                    time_granularity=TimeGranularity.MONTH,
+                ),
+            ),
+        )
+    )
+
+    convert_and_check(
+        request=request,
+        mf_test_session_state=mf_test_session_state,
+        dataflow_to_sql_converter=dataflow_to_sql_converter,
+        sql_client=sql_client,
+        node=dataflow_plan.sink_output_nodes[0].parent_node,
+    )
+
+
+@pytest.mark.sql_engine_snapshot
+def test_cumulative_metric_with_time_constraint(
+    request: FixtureRequest,
+    mf_test_session_state: MetricFlowTestSessionState,
+    dataflow_plan_builder: DataflowPlanBuilder,
+    dataflow_to_sql_converter: DataflowToSqlQueryPlanConverter,
+    consistent_id_object_repository: ConsistentIdObjectRepository,
+    sql_client: SqlClient,
+) -> None:
+    """Tests converting a dataflow plan to a SQL query plan where there is a cumulative metric to compute."""
+    dataflow_plan = dataflow_plan_builder.build_plan(
+        MetricFlowQuerySpec(
+            metric_specs=(MetricSpec(element_name="trailing_2_months_revenue"),),
+            dimension_specs=(),
+            time_dimension_specs=(
+                TimeDimensionSpec(
+                    element_name="ds",
+                    entity_links=(),
+                    time_granularity=TimeGranularity.MONTH,
+                ),
+            ),
+            time_range_constraint=TimeRangeConstraint(
+                start_time=as_datetime("2020-01-01"), end_time=as_datetime("2020-01-01")
+            ),
+        )
+    )
+
+    convert_and_check(
+        request=request,
+        mf_test_session_state=mf_test_session_state,
+        dataflow_to_sql_converter=dataflow_to_sql_converter,
+        sql_client=sql_client,
+        node=dataflow_plan.sink_output_nodes[0].parent_node,
+    )
+
+
+@pytest.mark.sql_engine_snapshot
+def test_cumulative_metric_no_ds(
+    request: FixtureRequest,
+    mf_test_session_state: MetricFlowTestSessionState,
+    dataflow_plan_builder: DataflowPlanBuilder,
+    dataflow_to_sql_converter: DataflowToSqlQueryPlanConverter,
+    consistent_id_object_repository: ConsistentIdObjectRepository,
+    sql_client: SqlClient,
+) -> None:
+    """Tests converting a dataflow plan to a SQL query plan where there is a cumulative metric to compute."""
+    dataflow_plan = dataflow_plan_builder.build_plan(
+        MetricFlowQuerySpec(
+            metric_specs=(MetricSpec(element_name="trailing_2_months_revenue"),),
+            dimension_specs=(),
+            time_dimension_specs=(),
+        )
+    )
+
+    convert_and_check(
+        request=request,
+        mf_test_session_state=mf_test_session_state,
+        dataflow_to_sql_converter=dataflow_to_sql_converter,
+        sql_client=sql_client,
+        node=dataflow_plan.sink_output_nodes[0].parent_node,
+    )
+
+
+@pytest.mark.sql_engine_snapshot
+def test_cumulative_metric_no_window(
+    request: FixtureRequest,
+    mf_test_session_state: MetricFlowTestSessionState,
+    dataflow_plan_builder: DataflowPlanBuilder,
+    dataflow_to_sql_converter: DataflowToSqlQueryPlanConverter,
+    consistent_id_object_repository: ConsistentIdObjectRepository,
+    sql_client: SqlClient,
+) -> None:
+    """Tests converting a dataflow plan to a SQL query plan where there is a windowless cumulative metric to compute."""
+    dataflow_plan = dataflow_plan_builder.build_plan(
+        MetricFlowQuerySpec(
+            metric_specs=(MetricSpec(element_name="revenue_all_time"),),
+            dimension_specs=(),
+            time_dimension_specs=(
+                TimeDimensionSpec(
+                    element_name="ds",
+                    entity_links=(),
+                    time_granularity=TimeGranularity.MONTH,
+                ),
+            ),
+        )
+    )
+
+    convert_and_check(
+        request=request,
+        mf_test_session_state=mf_test_session_state,
+        dataflow_to_sql_converter=dataflow_to_sql_converter,
+        sql_client=sql_client,
+        node=dataflow_plan.sink_output_nodes[0].parent_node,
+    )
+
+
+@pytest.mark.sql_engine_snapshot
+def test_cumulative_metric_no_window_with_time_constraint(
+    request: FixtureRequest,
+    mf_test_session_state: MetricFlowTestSessionState,
+    dataflow_plan_builder: DataflowPlanBuilder,
+    dataflow_to_sql_converter: DataflowToSqlQueryPlanConverter,
+    consistent_id_object_repository: ConsistentIdObjectRepository,
+    sql_client: SqlClient,
+) -> None:
+    """Tests converting a dataflow plan to a SQL query plan where there is a windowless cumulative metric to compute."""
+    dataflow_plan = dataflow_plan_builder.build_plan(
+        MetricFlowQuerySpec(
+            metric_specs=(MetricSpec(element_name="revenue_all_time"),),
+            dimension_specs=(),
+            time_dimension_specs=(
+                TimeDimensionSpec(
+                    element_name="ds",
+                    entity_links=(),
+                    time_granularity=TimeGranularity.MONTH,
+                ),
+            ),
+            time_range_constraint=TimeRangeConstraint(
+                start_time=as_datetime("2020-01-01"), end_time=as_datetime("2020-01-01")
+            ),
+        )
+    )
+
+    convert_and_check(
+        request=request,
+        mf_test_session_state=mf_test_session_state,
+        dataflow_to_sql_converter=dataflow_to_sql_converter,
+        sql_client=sql_client,
+        node=dataflow_plan.sink_output_nodes[0].parent_node,
+    )
+
+
+@pytest.mark.sql_engine_snapshot
+def test_cumulative_metric_grain_to_date(
+    request: FixtureRequest,
+    mf_test_session_state: MetricFlowTestSessionState,
+    dataflow_plan_builder: DataflowPlanBuilder,
+    dataflow_to_sql_converter: DataflowToSqlQueryPlanConverter,
+    consistent_id_object_repository: ConsistentIdObjectRepository,
+    sql_client: SqlClient,
+) -> None:
+    """Tests converting a dataflow plan to a SQL query plan where grain_to_date cumulative metric to compute."""
+    dataflow_plan = dataflow_plan_builder.build_plan(
+        MetricFlowQuerySpec(
+            metric_specs=(MetricSpec(element_name="revenue_mtd"),),
+            dimension_specs=(),
+            time_dimension_specs=(
+                TimeDimensionSpec(
+                    element_name="ds",
+                    entity_links=(),
+                    time_granularity=TimeGranularity.MONTH,
+                ),
+            ),
+        )
+    )
+
+    convert_and_check(
+        request=request,
+        mf_test_session_state=mf_test_session_state,
+        dataflow_to_sql_converter=dataflow_to_sql_converter,
+        sql_client=sql_client,
+        node=dataflow_plan.sink_output_nodes[0].parent_node,
+    )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric__plan0.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric__plan0.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric__plan0.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric__plan0.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric__plan0_optimized.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric__plan0_optimized.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric__plan0_optimized.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric__plan0_optimized.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_grain_to_date__plan0.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_grain_to_date__plan0.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_grain_to_date__plan0.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_grain_to_date__plan0.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_grain_to_date__plan0_optimized.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_grain_to_date__plan0_optimized.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_grain_to_date__plan0_optimized.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_grain_to_date__plan0_optimized.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_ds__plan0.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_ds__plan0.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_ds__plan0.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_ds__plan0.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_ds__plan0_optimized.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_ds__plan0_optimized.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_ds__plan0_optimized.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_ds__plan0_optimized.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window__plan0.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window__plan0.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window__plan0.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window__plan0.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window__plan0_optimized.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window__plan0_optimized.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window__plan0_optimized.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window__plan0_optimized.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window_with_time_constraint__plan0.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_time_constraint__plan0.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_time_constraint__plan0.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_time_constraint__plan0.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_time_constraint__plan0.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_time_constraint__plan0_optimized.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_time_constraint__plan0_optimized.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_time_constraint__plan0_optimized.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_time_constraint__plan0_optimized.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric__plan0.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric__plan0.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric__plan0.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric__plan0.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric__plan0_optimized.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric__plan0_optimized.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric__plan0_optimized.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric__plan0_optimized.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_grain_to_date__plan0.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_grain_to_date__plan0.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_grain_to_date__plan0.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_grain_to_date__plan0.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_grain_to_date__plan0_optimized.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_grain_to_date__plan0_optimized.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_grain_to_date__plan0_optimized.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_grain_to_date__plan0_optimized.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_ds__plan0.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_ds__plan0.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_ds__plan0.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_ds__plan0.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_ds__plan0_optimized.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_ds__plan0_optimized.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_ds__plan0_optimized.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_ds__plan0_optimized.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_window__plan0.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_window__plan0.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_window__plan0.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_window__plan0.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_window__plan0_optimized.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_window__plan0_optimized.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_window__plan0_optimized.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_window__plan0_optimized.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_window_with_time_constraint__plan0.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_time_constraint__plan0.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_time_constraint__plan0.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_time_constraint__plan0.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_time_constraint__plan0.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_time_constraint__plan0_optimized.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_time_constraint__plan0_optimized.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_time_constraint__plan0_optimized.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_time_constraint__plan0_optimized.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric__plan0.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric__plan0.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric__plan0.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric__plan0.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric__plan0_optimized.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric__plan0_optimized.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric__plan0_optimized.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric__plan0_optimized.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_grain_to_date__plan0.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_grain_to_date__plan0.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_grain_to_date__plan0.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_grain_to_date__plan0.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_grain_to_date__plan0_optimized.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_grain_to_date__plan0_optimized.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_grain_to_date__plan0_optimized.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_grain_to_date__plan0_optimized.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_ds__plan0.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_ds__plan0.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_ds__plan0.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_ds__plan0.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_ds__plan0_optimized.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_ds__plan0_optimized.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_ds__plan0_optimized.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_ds__plan0_optimized.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window__plan0.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window__plan0.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window__plan0.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window__plan0.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window__plan0_optimized.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window__plan0_optimized.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window__plan0_optimized.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window__plan0_optimized.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window_with_time_constraint__plan0.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_time_constraint__plan0.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_time_constraint__plan0.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_time_constraint__plan0.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_time_constraint__plan0.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_time_constraint__plan0_optimized.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_time_constraint__plan0_optimized.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_time_constraint__plan0_optimized.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_time_constraint__plan0_optimized.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric__plan0.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric__plan0.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric__plan0.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric__plan0.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric__plan0_optimized.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric__plan0_optimized.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric__plan0_optimized.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric__plan0_optimized.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_grain_to_date__plan0.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_grain_to_date__plan0.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_grain_to_date__plan0.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_grain_to_date__plan0.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_grain_to_date__plan0_optimized.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_grain_to_date__plan0_optimized.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_grain_to_date__plan0_optimized.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_grain_to_date__plan0_optimized.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_ds__plan0.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_ds__plan0.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_ds__plan0.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_ds__plan0.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_ds__plan0_optimized.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_ds__plan0_optimized.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_ds__plan0_optimized.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_ds__plan0_optimized.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_window__plan0.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_window__plan0.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_window__plan0.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_window__plan0.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_window__plan0_optimized.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_window__plan0_optimized.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_window__plan0_optimized.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_window__plan0_optimized.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_window_with_time_constraint__plan0.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_time_constraint__plan0.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_time_constraint__plan0.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_time_constraint__plan0.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_time_constraint__plan0.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_time_constraint__plan0_optimized.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_time_constraint__plan0_optimized.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_time_constraint__plan0_optimized.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_time_constraint__plan0_optimized.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric__plan0.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric__plan0.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric__plan0.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric__plan0.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric__plan0_optimized.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric__plan0_optimized.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric__plan0_optimized.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric__plan0_optimized.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_grain_to_date__plan0.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_grain_to_date__plan0.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_grain_to_date__plan0.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_grain_to_date__plan0.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_grain_to_date__plan0_optimized.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_grain_to_date__plan0_optimized.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_grain_to_date__plan0_optimized.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_grain_to_date__plan0_optimized.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_ds__plan0.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_ds__plan0.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_ds__plan0.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_ds__plan0.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_ds__plan0_optimized.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_ds__plan0_optimized.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_ds__plan0_optimized.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_ds__plan0_optimized.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_window__plan0.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_window__plan0.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_window__plan0.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_window__plan0.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_window__plan0_optimized.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_window__plan0_optimized.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_window__plan0_optimized.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_window__plan0_optimized.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_window_with_time_constraint__plan0.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_time_constraint__plan0.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_time_constraint__plan0.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_time_constraint__plan0.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_time_constraint__plan0.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_time_constraint__plan0_optimized.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_time_constraint__plan0_optimized.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_time_constraint__plan0_optimized.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_time_constraint__plan0_optimized.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric__plan0.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric__plan0.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric__plan0.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric__plan0.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric__plan0_optimized.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric__plan0_optimized.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric__plan0_optimized.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric__plan0_optimized.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_grain_to_date__plan0.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_grain_to_date__plan0.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_grain_to_date__plan0.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_grain_to_date__plan0.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_grain_to_date__plan0_optimized.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_grain_to_date__plan0_optimized.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_grain_to_date__plan0_optimized.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_grain_to_date__plan0_optimized.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_ds__plan0.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_ds__plan0.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_ds__plan0.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_ds__plan0.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_ds__plan0_optimized.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_ds__plan0_optimized.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_ds__plan0_optimized.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_ds__plan0_optimized.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_window__plan0.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_window__plan0.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_window__plan0.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_window__plan0.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_window__plan0_optimized.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_window__plan0_optimized.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_window__plan0_optimized.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_window__plan0_optimized.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_window_with_time_constraint__plan0.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_time_constraint__plan0.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_time_constraint__plan0.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_time_constraint__plan0.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_time_constraint__plan0.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_time_constraint__plan0_optimized.sql b/metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_time_constraint__plan0_optimized.sql
similarity index 100%
rename from metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_time_constraint__plan0_optimized.sql
rename to metricflow/test/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_time_constraint__plan0_optimized.sql
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric__plan0.xml
deleted file mode 100644
index 7e2773e0af..0000000000
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric__plan0.xml
+++ /dev/null
@@ -1,311 +0,0 @@
-<SqlQueryPlan>
-    <SqlSelectStatementNode>
-        <!-- description = Compute Metrics via Expressions -->
-        <!-- node_id = ss_10 -->
-        <!-- col0 =                                                    -->
-        <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
-        <!--    'column_alias': 'ds__month'}                           -->
-        <!-- col1 =                                                    -->
-        <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
-        <!--    'column_alias': 'trailing_2_months_revenue'}           -->
-        <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
-        <!-- where = None -->
-        <SqlSelectStatementNode>
-            <!-- description = Aggregate Measures -->
-            <!-- node_id = ss_9 -->
-            <!-- col0 =                                                    -->
-            <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
-            <!--    'column_alias': 'ds__month'}                           -->
-            <!-- col1 =                                                                       -->
-            <!--   {'class': 'SqlSelectColumn',                                               -->
-            <!--    'expr': SqlAggregateFunctionExpression(node_id=fnc_0, sql_function=SUM),  -->
-            <!--    'column_alias': 'txn_revenue'}                                            -->
-            <!-- from_source = SqlSelectStatementNode(node_id=ss_8) -->
-            <!-- group_by0 =                                               -->
-            <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
-            <!--    'column_alias': 'ds__month'}                           -->
-            <!-- where = None -->
-            <SqlSelectStatementNode>
-                <!-- description =                     -->
-                <!--   Pass Only Elements:             -->
-                <!--     ['txn_revenue', 'ds__month']  -->
-                <!-- node_id = ss_8 -->
-                <!-- col0 =                                                    -->
-                <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
-                <!--    'column_alias': 'ds__month'}                           -->
-                <!-- col1 =                                                    -->
-                <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
-                <!--    'column_alias': 'txn_revenue'}                         -->
-                <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
-                <!-- where = None -->
-                <SqlSelectStatementNode>
-                    <!-- description = Metric Time Dimension 'ds' -->
-                    <!-- node_id = ss_7 -->
-                    <!-- col0 =                                                    -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_449),  -->
-                    <!--    'column_alias': 'ds__day'}                             -->
-                    <!-- col1 =                                                    -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_450),  -->
-                    <!--    'column_alias': 'ds__week'}                            -->
-                    <!-- col2 =                                                    -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_451),  -->
-                    <!--    'column_alias': 'ds__month'}                           -->
-                    <!-- col3 =                                                    -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_452),  -->
-                    <!--    'column_alias': 'ds__quarter'}                         -->
-                    <!-- col4 =                                                    -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_453),  -->
-                    <!--    'column_alias': 'ds__year'}                            -->
-                    <!-- col5 =                                                    -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_454),  -->
-                    <!--    'column_alias': 'ds__extract_year'}                    -->
-                    <!-- col6 =                                                    -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_455),  -->
-                    <!--    'column_alias': 'ds__extract_quarter'}                 -->
-                    <!-- col7 =                                                    -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),  -->
-                    <!--    'column_alias': 'ds__extract_month'}                   -->
-                    <!-- col8 =                                                    -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),  -->
-                    <!--    'column_alias': 'ds__extract_day'}                     -->
-                    <!-- col9 =                                                    -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_458),  -->
-                    <!--    'column_alias': 'ds__extract_dow'}                     -->
-                    <!-- col10 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_459),  -->
-                    <!--    'column_alias': 'ds__extract_doy'}                     -->
-                    <!-- col11 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_460),  -->
-                    <!--    'column_alias': 'company__ds__day'}                    -->
-                    <!-- col12 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_461),  -->
-                    <!--    'column_alias': 'company__ds__week'}                   -->
-                    <!-- col13 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_462),  -->
-                    <!--    'column_alias': 'company__ds__month'}                  -->
-                    <!-- col14 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_463),  -->
-                    <!--    'column_alias': 'company__ds__quarter'}                -->
-                    <!-- col15 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_464),  -->
-                    <!--    'column_alias': 'company__ds__year'}                   -->
-                    <!-- col16 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_465),  -->
-                    <!--    'column_alias': 'company__ds__extract_year'}           -->
-                    <!-- col17 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_466),  -->
-                    <!--    'column_alias': 'company__ds__extract_quarter'}        -->
-                    <!-- col18 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_467),  -->
-                    <!--    'column_alias': 'company__ds__extract_month'}          -->
-                    <!-- col19 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_468),  -->
-                    <!--    'column_alias': 'company__ds__extract_day'}            -->
-                    <!-- col20 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
-                    <!--    'column_alias': 'company__ds__extract_dow'}            -->
-                    <!-- col21 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_470),  -->
-                    <!--    'column_alias': 'company__ds__extract_doy'}            -->
-                    <!-- col22 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_471),  -->
-                    <!--    'column_alias': 'metric_time__day'}                    -->
-                    <!-- col23 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_472),  -->
-                    <!--    'column_alias': 'metric_time__week'}                   -->
-                    <!-- col24 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_473),  -->
-                    <!--    'column_alias': 'metric_time__month'}                  -->
-                    <!-- col25 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_474),  -->
-                    <!--    'column_alias': 'metric_time__quarter'}                -->
-                    <!-- col26 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_475),  -->
-                    <!--    'column_alias': 'metric_time__year'}                   -->
-                    <!-- col27 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_476),  -->
-                    <!--    'column_alias': 'metric_time__extract_year'}           -->
-                    <!-- col28 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_477),  -->
-                    <!--    'column_alias': 'metric_time__extract_quarter'}        -->
-                    <!-- col29 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_478),  -->
-                    <!--    'column_alias': 'metric_time__extract_month'}          -->
-                    <!-- col30 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_479),  -->
-                    <!--    'column_alias': 'metric_time__extract_day'}            -->
-                    <!-- col31 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_480),  -->
-                    <!--    'column_alias': 'metric_time__extract_dow'}            -->
-                    <!-- col32 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_481),  -->
-                    <!--    'column_alias': 'metric_time__extract_doy'}            -->
-                    <!-- col33 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_482),  -->
-                    <!--    'column_alias': 'user'}                                -->
-                    <!-- col34 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
-                    <!--    'column_alias': 'company__user'}                       -->
-                    <!-- col35 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_448),  -->
-                    <!--    'column_alias': 'txn_revenue'}                         -->
-                    <!-- from_source = SqlSelectStatementNode(node_id=ss_10006) -->
-                    <!-- where = None -->
-                    <SqlSelectStatementNode>
-                        <!-- description = Read Elements From Semantic Model 'revenue' -->
-                        <!-- node_id = ss_10006 -->
-                        <!-- col0 =                                                      -->
-                        <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10068),  -->
-                        <!--    'column_alias': 'txn_revenue'}                           -->
-                        <!-- col1 =                                                -->
-                        <!--   {'class': 'SqlSelectColumn',                        -->
-                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10080),  -->
-                        <!--    'column_alias': 'ds__day'}                         -->
-                        <!-- col2 =                                                -->
-                        <!--   {'class': 'SqlSelectColumn',                        -->
-                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10081),  -->
-                        <!--    'column_alias': 'ds__week'}                        -->
-                        <!-- col3 =                                                -->
-                        <!--   {'class': 'SqlSelectColumn',                        -->
-                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10082),  -->
-                        <!--    'column_alias': 'ds__month'}                       -->
-                        <!-- col4 =                                                -->
-                        <!--   {'class': 'SqlSelectColumn',                        -->
-                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10083),  -->
-                        <!--    'column_alias': 'ds__quarter'}                     -->
-                        <!-- col5 =                                                -->
-                        <!--   {'class': 'SqlSelectColumn',                        -->
-                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10084),  -->
-                        <!--    'column_alias': 'ds__year'}                        -->
-                        <!-- col6 =                                              -->
-                        <!--   {'class': 'SqlSelectColumn',                      -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10096),  -->
-                        <!--    'column_alias': 'ds__extract_year'}              -->
-                        <!-- col7 =                                              -->
-                        <!--   {'class': 'SqlSelectColumn',                      -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10097),  -->
-                        <!--    'column_alias': 'ds__extract_quarter'}           -->
-                        <!-- col8 =                                              -->
-                        <!--   {'class': 'SqlSelectColumn',                      -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10098),  -->
-                        <!--    'column_alias': 'ds__extract_month'}             -->
-                        <!-- col9 =                                              -->
-                        <!--   {'class': 'SqlSelectColumn',                      -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10099),  -->
-                        <!--    'column_alias': 'ds__extract_day'}               -->
-                        <!-- col10 =                                             -->
-                        <!--   {'class': 'SqlSelectColumn',                      -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10100),  -->
-                        <!--    'column_alias': 'ds__extract_dow'}               -->
-                        <!-- col11 =                                             -->
-                        <!--   {'class': 'SqlSelectColumn',                      -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10101),  -->
-                        <!--    'column_alias': 'ds__extract_doy'}               -->
-                        <!-- col12 =                                               -->
-                        <!--   {'class': 'SqlSelectColumn',                        -->
-                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10085),  -->
-                        <!--    'column_alias': 'company__ds__day'}                -->
-                        <!-- col13 =                                               -->
-                        <!--   {'class': 'SqlSelectColumn',                        -->
-                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10086),  -->
-                        <!--    'column_alias': 'company__ds__week'}               -->
-                        <!-- col14 =                                               -->
-                        <!--   {'class': 'SqlSelectColumn',                        -->
-                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10087),  -->
-                        <!--    'column_alias': 'company__ds__month'}              -->
-                        <!-- col15 =                                               -->
-                        <!--   {'class': 'SqlSelectColumn',                        -->
-                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10088),  -->
-                        <!--    'column_alias': 'company__ds__quarter'}            -->
-                        <!-- col16 =                                               -->
-                        <!--   {'class': 'SqlSelectColumn',                        -->
-                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10089),  -->
-                        <!--    'column_alias': 'company__ds__year'}               -->
-                        <!-- col17 =                                             -->
-                        <!--   {'class': 'SqlSelectColumn',                      -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10102),  -->
-                        <!--    'column_alias': 'company__ds__extract_year'}     -->
-                        <!-- col18 =                                             -->
-                        <!--   {'class': 'SqlSelectColumn',                      -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10103),  -->
-                        <!--    'column_alias': 'company__ds__extract_quarter'}  -->
-                        <!-- col19 =                                             -->
-                        <!--   {'class': 'SqlSelectColumn',                      -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10104),  -->
-                        <!--    'column_alias': 'company__ds__extract_month'}    -->
-                        <!-- col20 =                                             -->
-                        <!--   {'class': 'SqlSelectColumn',                      -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10105),  -->
-                        <!--    'column_alias': 'company__ds__extract_day'}      -->
-                        <!-- col21 =                                             -->
-                        <!--   {'class': 'SqlSelectColumn',                      -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10106),  -->
-                        <!--    'column_alias': 'company__ds__extract_dow'}      -->
-                        <!-- col22 =                                             -->
-                        <!--   {'class': 'SqlSelectColumn',                      -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10107),  -->
-                        <!--    'column_alias': 'company__ds__extract_doy'}      -->
-                        <!-- col23 =                                                     -->
-                        <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10071),  -->
-                        <!--    'column_alias': 'user'}                                  -->
-                        <!-- col24 =                                                     -->
-                        <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10072),  -->
-                        <!--    'column_alias': 'company__user'}                         -->
-                        <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10006) -->
-                        <!-- where = None -->
-                        <SqlTableFromClauseNode>
-                            <!-- description = Read from ***************************.fct_revenue -->
-                            <!-- node_id = tfc_10006 -->
-                            <!-- table_id = ***************************.fct_revenue -->
-                        </SqlTableFromClauseNode>
-                    </SqlSelectStatementNode>
-                </SqlSelectStatementNode>
-            </SqlSelectStatementNode>
-        </SqlSelectStatementNode>
-    </SqlSelectStatementNode>
-</SqlQueryPlan>
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_grain_to_date__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_grain_to_date__plan0.xml
deleted file mode 100644
index 9e80834f37..0000000000
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_grain_to_date__plan0.xml
+++ /dev/null
@@ -1,311 +0,0 @@
-<SqlQueryPlan>
-    <SqlSelectStatementNode>
-        <!-- description = Compute Metrics via Expressions -->
-        <!-- node_id = ss_10 -->
-        <!-- col0 =                                                    -->
-        <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
-        <!--    'column_alias': 'ds__month'}                           -->
-        <!-- col1 =                                                    -->
-        <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
-        <!--    'column_alias': 'revenue_mtd'}                         -->
-        <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
-        <!-- where = None -->
-        <SqlSelectStatementNode>
-            <!-- description = Aggregate Measures -->
-            <!-- node_id = ss_9 -->
-            <!-- col0 =                                                    -->
-            <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
-            <!--    'column_alias': 'ds__month'}                           -->
-            <!-- col1 =                                                                       -->
-            <!--   {'class': 'SqlSelectColumn',                                               -->
-            <!--    'expr': SqlAggregateFunctionExpression(node_id=fnc_0, sql_function=SUM),  -->
-            <!--    'column_alias': 'txn_revenue'}                                            -->
-            <!-- from_source = SqlSelectStatementNode(node_id=ss_8) -->
-            <!-- group_by0 =                                               -->
-            <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
-            <!--    'column_alias': 'ds__month'}                           -->
-            <!-- where = None -->
-            <SqlSelectStatementNode>
-                <!-- description =                     -->
-                <!--   Pass Only Elements:             -->
-                <!--     ['txn_revenue', 'ds__month']  -->
-                <!-- node_id = ss_8 -->
-                <!-- col0 =                                                    -->
-                <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
-                <!--    'column_alias': 'ds__month'}                           -->
-                <!-- col1 =                                                    -->
-                <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
-                <!--    'column_alias': 'txn_revenue'}                         -->
-                <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
-                <!-- where = None -->
-                <SqlSelectStatementNode>
-                    <!-- description = Metric Time Dimension 'ds' -->
-                    <!-- node_id = ss_7 -->
-                    <!-- col0 =                                                    -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_449),  -->
-                    <!--    'column_alias': 'ds__day'}                             -->
-                    <!-- col1 =                                                    -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_450),  -->
-                    <!--    'column_alias': 'ds__week'}                            -->
-                    <!-- col2 =                                                    -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_451),  -->
-                    <!--    'column_alias': 'ds__month'}                           -->
-                    <!-- col3 =                                                    -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_452),  -->
-                    <!--    'column_alias': 'ds__quarter'}                         -->
-                    <!-- col4 =                                                    -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_453),  -->
-                    <!--    'column_alias': 'ds__year'}                            -->
-                    <!-- col5 =                                                    -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_454),  -->
-                    <!--    'column_alias': 'ds__extract_year'}                    -->
-                    <!-- col6 =                                                    -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_455),  -->
-                    <!--    'column_alias': 'ds__extract_quarter'}                 -->
-                    <!-- col7 =                                                    -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),  -->
-                    <!--    'column_alias': 'ds__extract_month'}                   -->
-                    <!-- col8 =                                                    -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),  -->
-                    <!--    'column_alias': 'ds__extract_day'}                     -->
-                    <!-- col9 =                                                    -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_458),  -->
-                    <!--    'column_alias': 'ds__extract_dow'}                     -->
-                    <!-- col10 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_459),  -->
-                    <!--    'column_alias': 'ds__extract_doy'}                     -->
-                    <!-- col11 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_460),  -->
-                    <!--    'column_alias': 'company__ds__day'}                    -->
-                    <!-- col12 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_461),  -->
-                    <!--    'column_alias': 'company__ds__week'}                   -->
-                    <!-- col13 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_462),  -->
-                    <!--    'column_alias': 'company__ds__month'}                  -->
-                    <!-- col14 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_463),  -->
-                    <!--    'column_alias': 'company__ds__quarter'}                -->
-                    <!-- col15 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_464),  -->
-                    <!--    'column_alias': 'company__ds__year'}                   -->
-                    <!-- col16 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_465),  -->
-                    <!--    'column_alias': 'company__ds__extract_year'}           -->
-                    <!-- col17 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_466),  -->
-                    <!--    'column_alias': 'company__ds__extract_quarter'}        -->
-                    <!-- col18 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_467),  -->
-                    <!--    'column_alias': 'company__ds__extract_month'}          -->
-                    <!-- col19 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_468),  -->
-                    <!--    'column_alias': 'company__ds__extract_day'}            -->
-                    <!-- col20 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
-                    <!--    'column_alias': 'company__ds__extract_dow'}            -->
-                    <!-- col21 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_470),  -->
-                    <!--    'column_alias': 'company__ds__extract_doy'}            -->
-                    <!-- col22 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_471),  -->
-                    <!--    'column_alias': 'metric_time__day'}                    -->
-                    <!-- col23 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_472),  -->
-                    <!--    'column_alias': 'metric_time__week'}                   -->
-                    <!-- col24 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_473),  -->
-                    <!--    'column_alias': 'metric_time__month'}                  -->
-                    <!-- col25 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_474),  -->
-                    <!--    'column_alias': 'metric_time__quarter'}                -->
-                    <!-- col26 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_475),  -->
-                    <!--    'column_alias': 'metric_time__year'}                   -->
-                    <!-- col27 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_476),  -->
-                    <!--    'column_alias': 'metric_time__extract_year'}           -->
-                    <!-- col28 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_477),  -->
-                    <!--    'column_alias': 'metric_time__extract_quarter'}        -->
-                    <!-- col29 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_478),  -->
-                    <!--    'column_alias': 'metric_time__extract_month'}          -->
-                    <!-- col30 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_479),  -->
-                    <!--    'column_alias': 'metric_time__extract_day'}            -->
-                    <!-- col31 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_480),  -->
-                    <!--    'column_alias': 'metric_time__extract_dow'}            -->
-                    <!-- col32 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_481),  -->
-                    <!--    'column_alias': 'metric_time__extract_doy'}            -->
-                    <!-- col33 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_482),  -->
-                    <!--    'column_alias': 'user'}                                -->
-                    <!-- col34 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
-                    <!--    'column_alias': 'company__user'}                       -->
-                    <!-- col35 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_448),  -->
-                    <!--    'column_alias': 'txn_revenue'}                         -->
-                    <!-- from_source = SqlSelectStatementNode(node_id=ss_10006) -->
-                    <!-- where = None -->
-                    <SqlSelectStatementNode>
-                        <!-- description = Read Elements From Semantic Model 'revenue' -->
-                        <!-- node_id = ss_10006 -->
-                        <!-- col0 =                                                      -->
-                        <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10068),  -->
-                        <!--    'column_alias': 'txn_revenue'}                           -->
-                        <!-- col1 =                                                -->
-                        <!--   {'class': 'SqlSelectColumn',                        -->
-                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10080),  -->
-                        <!--    'column_alias': 'ds__day'}                         -->
-                        <!-- col2 =                                                -->
-                        <!--   {'class': 'SqlSelectColumn',                        -->
-                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10081),  -->
-                        <!--    'column_alias': 'ds__week'}                        -->
-                        <!-- col3 =                                                -->
-                        <!--   {'class': 'SqlSelectColumn',                        -->
-                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10082),  -->
-                        <!--    'column_alias': 'ds__month'}                       -->
-                        <!-- col4 =                                                -->
-                        <!--   {'class': 'SqlSelectColumn',                        -->
-                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10083),  -->
-                        <!--    'column_alias': 'ds__quarter'}                     -->
-                        <!-- col5 =                                                -->
-                        <!--   {'class': 'SqlSelectColumn',                        -->
-                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10084),  -->
-                        <!--    'column_alias': 'ds__year'}                        -->
-                        <!-- col6 =                                              -->
-                        <!--   {'class': 'SqlSelectColumn',                      -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10096),  -->
-                        <!--    'column_alias': 'ds__extract_year'}              -->
-                        <!-- col7 =                                              -->
-                        <!--   {'class': 'SqlSelectColumn',                      -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10097),  -->
-                        <!--    'column_alias': 'ds__extract_quarter'}           -->
-                        <!-- col8 =                                              -->
-                        <!--   {'class': 'SqlSelectColumn',                      -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10098),  -->
-                        <!--    'column_alias': 'ds__extract_month'}             -->
-                        <!-- col9 =                                              -->
-                        <!--   {'class': 'SqlSelectColumn',                      -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10099),  -->
-                        <!--    'column_alias': 'ds__extract_day'}               -->
-                        <!-- col10 =                                             -->
-                        <!--   {'class': 'SqlSelectColumn',                      -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10100),  -->
-                        <!--    'column_alias': 'ds__extract_dow'}               -->
-                        <!-- col11 =                                             -->
-                        <!--   {'class': 'SqlSelectColumn',                      -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10101),  -->
-                        <!--    'column_alias': 'ds__extract_doy'}               -->
-                        <!-- col12 =                                               -->
-                        <!--   {'class': 'SqlSelectColumn',                        -->
-                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10085),  -->
-                        <!--    'column_alias': 'company__ds__day'}                -->
-                        <!-- col13 =                                               -->
-                        <!--   {'class': 'SqlSelectColumn',                        -->
-                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10086),  -->
-                        <!--    'column_alias': 'company__ds__week'}               -->
-                        <!-- col14 =                                               -->
-                        <!--   {'class': 'SqlSelectColumn',                        -->
-                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10087),  -->
-                        <!--    'column_alias': 'company__ds__month'}              -->
-                        <!-- col15 =                                               -->
-                        <!--   {'class': 'SqlSelectColumn',                        -->
-                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10088),  -->
-                        <!--    'column_alias': 'company__ds__quarter'}            -->
-                        <!-- col16 =                                               -->
-                        <!--   {'class': 'SqlSelectColumn',                        -->
-                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10089),  -->
-                        <!--    'column_alias': 'company__ds__year'}               -->
-                        <!-- col17 =                                             -->
-                        <!--   {'class': 'SqlSelectColumn',                      -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10102),  -->
-                        <!--    'column_alias': 'company__ds__extract_year'}     -->
-                        <!-- col18 =                                             -->
-                        <!--   {'class': 'SqlSelectColumn',                      -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10103),  -->
-                        <!--    'column_alias': 'company__ds__extract_quarter'}  -->
-                        <!-- col19 =                                             -->
-                        <!--   {'class': 'SqlSelectColumn',                      -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10104),  -->
-                        <!--    'column_alias': 'company__ds__extract_month'}    -->
-                        <!-- col20 =                                             -->
-                        <!--   {'class': 'SqlSelectColumn',                      -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10105),  -->
-                        <!--    'column_alias': 'company__ds__extract_day'}      -->
-                        <!-- col21 =                                             -->
-                        <!--   {'class': 'SqlSelectColumn',                      -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10106),  -->
-                        <!--    'column_alias': 'company__ds__extract_dow'}      -->
-                        <!-- col22 =                                             -->
-                        <!--   {'class': 'SqlSelectColumn',                      -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10107),  -->
-                        <!--    'column_alias': 'company__ds__extract_doy'}      -->
-                        <!-- col23 =                                                     -->
-                        <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10071),  -->
-                        <!--    'column_alias': 'user'}                                  -->
-                        <!-- col24 =                                                     -->
-                        <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10072),  -->
-                        <!--    'column_alias': 'company__user'}                         -->
-                        <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10006) -->
-                        <!-- where = None -->
-                        <SqlTableFromClauseNode>
-                            <!-- description = Read from ***************************.fct_revenue -->
-                            <!-- node_id = tfc_10006 -->
-                            <!-- table_id = ***************************.fct_revenue -->
-                        </SqlTableFromClauseNode>
-                    </SqlSelectStatementNode>
-                </SqlSelectStatementNode>
-            </SqlSelectStatementNode>
-        </SqlSelectStatementNode>
-    </SqlSelectStatementNode>
-</SqlQueryPlan>
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_no_ds__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_no_ds__plan0.xml
deleted file mode 100644
index ef67de0f3d..0000000000
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_no_ds__plan0.xml
+++ /dev/null
@@ -1,295 +0,0 @@
-<SqlQueryPlan>
-    <SqlSelectStatementNode>
-        <!-- description = Compute Metrics via Expressions -->
-        <!-- node_id = ss_10 -->
-        <!-- col0 =                                                    -->
-        <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
-        <!--    'column_alias': 'trailing_2_months_revenue'}           -->
-        <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
-        <!-- where = None -->
-        <SqlSelectStatementNode>
-            <!-- description = Aggregate Measures -->
-            <!-- node_id = ss_9 -->
-            <!-- col0 =                                                                       -->
-            <!--   {'class': 'SqlSelectColumn',                                               -->
-            <!--    'expr': SqlAggregateFunctionExpression(node_id=fnc_0, sql_function=SUM),  -->
-            <!--    'column_alias': 'txn_revenue'}                                            -->
-            <!-- from_source = SqlSelectStatementNode(node_id=ss_8) -->
-            <!-- where = None -->
-            <SqlSelectStatementNode>
-                <!-- description =          -->
-                <!--   Pass Only Elements:  -->
-                <!--     ['txn_revenue']    -->
-                <!-- node_id = ss_8 -->
-                <!-- col0 =                                                    -->
-                <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
-                <!--    'column_alias': 'txn_revenue'}                         -->
-                <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
-                <!-- where = None -->
-                <SqlSelectStatementNode>
-                    <!-- description = Metric Time Dimension 'ds' -->
-                    <!-- node_id = ss_7 -->
-                    <!-- col0 =                                                    -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_449),  -->
-                    <!--    'column_alias': 'ds__day'}                             -->
-                    <!-- col1 =                                                    -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_450),  -->
-                    <!--    'column_alias': 'ds__week'}                            -->
-                    <!-- col2 =                                                    -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_451),  -->
-                    <!--    'column_alias': 'ds__month'}                           -->
-                    <!-- col3 =                                                    -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_452),  -->
-                    <!--    'column_alias': 'ds__quarter'}                         -->
-                    <!-- col4 =                                                    -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_453),  -->
-                    <!--    'column_alias': 'ds__year'}                            -->
-                    <!-- col5 =                                                    -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_454),  -->
-                    <!--    'column_alias': 'ds__extract_year'}                    -->
-                    <!-- col6 =                                                    -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_455),  -->
-                    <!--    'column_alias': 'ds__extract_quarter'}                 -->
-                    <!-- col7 =                                                    -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),  -->
-                    <!--    'column_alias': 'ds__extract_month'}                   -->
-                    <!-- col8 =                                                    -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),  -->
-                    <!--    'column_alias': 'ds__extract_day'}                     -->
-                    <!-- col9 =                                                    -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_458),  -->
-                    <!--    'column_alias': 'ds__extract_dow'}                     -->
-                    <!-- col10 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_459),  -->
-                    <!--    'column_alias': 'ds__extract_doy'}                     -->
-                    <!-- col11 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_460),  -->
-                    <!--    'column_alias': 'company__ds__day'}                    -->
-                    <!-- col12 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_461),  -->
-                    <!--    'column_alias': 'company__ds__week'}                   -->
-                    <!-- col13 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_462),  -->
-                    <!--    'column_alias': 'company__ds__month'}                  -->
-                    <!-- col14 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_463),  -->
-                    <!--    'column_alias': 'company__ds__quarter'}                -->
-                    <!-- col15 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_464),  -->
-                    <!--    'column_alias': 'company__ds__year'}                   -->
-                    <!-- col16 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_465),  -->
-                    <!--    'column_alias': 'company__ds__extract_year'}           -->
-                    <!-- col17 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_466),  -->
-                    <!--    'column_alias': 'company__ds__extract_quarter'}        -->
-                    <!-- col18 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_467),  -->
-                    <!--    'column_alias': 'company__ds__extract_month'}          -->
-                    <!-- col19 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_468),  -->
-                    <!--    'column_alias': 'company__ds__extract_day'}            -->
-                    <!-- col20 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
-                    <!--    'column_alias': 'company__ds__extract_dow'}            -->
-                    <!-- col21 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_470),  -->
-                    <!--    'column_alias': 'company__ds__extract_doy'}            -->
-                    <!-- col22 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_471),  -->
-                    <!--    'column_alias': 'metric_time__day'}                    -->
-                    <!-- col23 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_472),  -->
-                    <!--    'column_alias': 'metric_time__week'}                   -->
-                    <!-- col24 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_473),  -->
-                    <!--    'column_alias': 'metric_time__month'}                  -->
-                    <!-- col25 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_474),  -->
-                    <!--    'column_alias': 'metric_time__quarter'}                -->
-                    <!-- col26 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_475),  -->
-                    <!--    'column_alias': 'metric_time__year'}                   -->
-                    <!-- col27 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_476),  -->
-                    <!--    'column_alias': 'metric_time__extract_year'}           -->
-                    <!-- col28 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_477),  -->
-                    <!--    'column_alias': 'metric_time__extract_quarter'}        -->
-                    <!-- col29 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_478),  -->
-                    <!--    'column_alias': 'metric_time__extract_month'}          -->
-                    <!-- col30 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_479),  -->
-                    <!--    'column_alias': 'metric_time__extract_day'}            -->
-                    <!-- col31 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_480),  -->
-                    <!--    'column_alias': 'metric_time__extract_dow'}            -->
-                    <!-- col32 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_481),  -->
-                    <!--    'column_alias': 'metric_time__extract_doy'}            -->
-                    <!-- col33 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_482),  -->
-                    <!--    'column_alias': 'user'}                                -->
-                    <!-- col34 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
-                    <!--    'column_alias': 'company__user'}                       -->
-                    <!-- col35 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_448),  -->
-                    <!--    'column_alias': 'txn_revenue'}                         -->
-                    <!-- from_source = SqlSelectStatementNode(node_id=ss_10006) -->
-                    <!-- where = None -->
-                    <SqlSelectStatementNode>
-                        <!-- description = Read Elements From Semantic Model 'revenue' -->
-                        <!-- node_id = ss_10006 -->
-                        <!-- col0 =                                                      -->
-                        <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10068),  -->
-                        <!--    'column_alias': 'txn_revenue'}                           -->
-                        <!-- col1 =                                                -->
-                        <!--   {'class': 'SqlSelectColumn',                        -->
-                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10080),  -->
-                        <!--    'column_alias': 'ds__day'}                         -->
-                        <!-- col2 =                                                -->
-                        <!--   {'class': 'SqlSelectColumn',                        -->
-                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10081),  -->
-                        <!--    'column_alias': 'ds__week'}                        -->
-                        <!-- col3 =                                                -->
-                        <!--   {'class': 'SqlSelectColumn',                        -->
-                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10082),  -->
-                        <!--    'column_alias': 'ds__month'}                       -->
-                        <!-- col4 =                                                -->
-                        <!--   {'class': 'SqlSelectColumn',                        -->
-                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10083),  -->
-                        <!--    'column_alias': 'ds__quarter'}                     -->
-                        <!-- col5 =                                                -->
-                        <!--   {'class': 'SqlSelectColumn',                        -->
-                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10084),  -->
-                        <!--    'column_alias': 'ds__year'}                        -->
-                        <!-- col6 =                                              -->
-                        <!--   {'class': 'SqlSelectColumn',                      -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10096),  -->
-                        <!--    'column_alias': 'ds__extract_year'}              -->
-                        <!-- col7 =                                              -->
-                        <!--   {'class': 'SqlSelectColumn',                      -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10097),  -->
-                        <!--    'column_alias': 'ds__extract_quarter'}           -->
-                        <!-- col8 =                                              -->
-                        <!--   {'class': 'SqlSelectColumn',                      -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10098),  -->
-                        <!--    'column_alias': 'ds__extract_month'}             -->
-                        <!-- col9 =                                              -->
-                        <!--   {'class': 'SqlSelectColumn',                      -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10099),  -->
-                        <!--    'column_alias': 'ds__extract_day'}               -->
-                        <!-- col10 =                                             -->
-                        <!--   {'class': 'SqlSelectColumn',                      -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10100),  -->
-                        <!--    'column_alias': 'ds__extract_dow'}               -->
-                        <!-- col11 =                                             -->
-                        <!--   {'class': 'SqlSelectColumn',                      -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10101),  -->
-                        <!--    'column_alias': 'ds__extract_doy'}               -->
-                        <!-- col12 =                                               -->
-                        <!--   {'class': 'SqlSelectColumn',                        -->
-                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10085),  -->
-                        <!--    'column_alias': 'company__ds__day'}                -->
-                        <!-- col13 =                                               -->
-                        <!--   {'class': 'SqlSelectColumn',                        -->
-                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10086),  -->
-                        <!--    'column_alias': 'company__ds__week'}               -->
-                        <!-- col14 =                                               -->
-                        <!--   {'class': 'SqlSelectColumn',                        -->
-                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10087),  -->
-                        <!--    'column_alias': 'company__ds__month'}              -->
-                        <!-- col15 =                                               -->
-                        <!--   {'class': 'SqlSelectColumn',                        -->
-                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10088),  -->
-                        <!--    'column_alias': 'company__ds__quarter'}            -->
-                        <!-- col16 =                                               -->
-                        <!--   {'class': 'SqlSelectColumn',                        -->
-                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10089),  -->
-                        <!--    'column_alias': 'company__ds__year'}               -->
-                        <!-- col17 =                                             -->
-                        <!--   {'class': 'SqlSelectColumn',                      -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10102),  -->
-                        <!--    'column_alias': 'company__ds__extract_year'}     -->
-                        <!-- col18 =                                             -->
-                        <!--   {'class': 'SqlSelectColumn',                      -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10103),  -->
-                        <!--    'column_alias': 'company__ds__extract_quarter'}  -->
-                        <!-- col19 =                                             -->
-                        <!--   {'class': 'SqlSelectColumn',                      -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10104),  -->
-                        <!--    'column_alias': 'company__ds__extract_month'}    -->
-                        <!-- col20 =                                             -->
-                        <!--   {'class': 'SqlSelectColumn',                      -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10105),  -->
-                        <!--    'column_alias': 'company__ds__extract_day'}      -->
-                        <!-- col21 =                                             -->
-                        <!--   {'class': 'SqlSelectColumn',                      -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10106),  -->
-                        <!--    'column_alias': 'company__ds__extract_dow'}      -->
-                        <!-- col22 =                                             -->
-                        <!--   {'class': 'SqlSelectColumn',                      -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10107),  -->
-                        <!--    'column_alias': 'company__ds__extract_doy'}      -->
-                        <!-- col23 =                                                     -->
-                        <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10071),  -->
-                        <!--    'column_alias': 'user'}                                  -->
-                        <!-- col24 =                                                     -->
-                        <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10072),  -->
-                        <!--    'column_alias': 'company__user'}                         -->
-                        <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10006) -->
-                        <!-- where = None -->
-                        <SqlTableFromClauseNode>
-                            <!-- description = Read from ***************************.fct_revenue -->
-                            <!-- node_id = tfc_10006 -->
-                            <!-- table_id = ***************************.fct_revenue -->
-                        </SqlTableFromClauseNode>
-                    </SqlSelectStatementNode>
-                </SqlSelectStatementNode>
-            </SqlSelectStatementNode>
-        </SqlSelectStatementNode>
-    </SqlSelectStatementNode>
-</SqlQueryPlan>
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_no_window__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_no_window__plan0.xml
deleted file mode 100644
index beaa84dd6d..0000000000
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_no_window__plan0.xml
+++ /dev/null
@@ -1,311 +0,0 @@
-<SqlQueryPlan>
-    <SqlSelectStatementNode>
-        <!-- description = Compute Metrics via Expressions -->
-        <!-- node_id = ss_10 -->
-        <!-- col0 =                                                    -->
-        <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
-        <!--    'column_alias': 'ds__month'}                           -->
-        <!-- col1 =                                                    -->
-        <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
-        <!--    'column_alias': 'revenue_all_time'}                    -->
-        <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
-        <!-- where = None -->
-        <SqlSelectStatementNode>
-            <!-- description = Aggregate Measures -->
-            <!-- node_id = ss_9 -->
-            <!-- col0 =                                                    -->
-            <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
-            <!--    'column_alias': 'ds__month'}                           -->
-            <!-- col1 =                                                                       -->
-            <!--   {'class': 'SqlSelectColumn',                                               -->
-            <!--    'expr': SqlAggregateFunctionExpression(node_id=fnc_0, sql_function=SUM),  -->
-            <!--    'column_alias': 'txn_revenue'}                                            -->
-            <!-- from_source = SqlSelectStatementNode(node_id=ss_8) -->
-            <!-- group_by0 =                                               -->
-            <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
-            <!--    'column_alias': 'ds__month'}                           -->
-            <!-- where = None -->
-            <SqlSelectStatementNode>
-                <!-- description =                     -->
-                <!--   Pass Only Elements:             -->
-                <!--     ['txn_revenue', 'ds__month']  -->
-                <!-- node_id = ss_8 -->
-                <!-- col0 =                                                    -->
-                <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
-                <!--    'column_alias': 'ds__month'}                           -->
-                <!-- col1 =                                                    -->
-                <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
-                <!--    'column_alias': 'txn_revenue'}                         -->
-                <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
-                <!-- where = None -->
-                <SqlSelectStatementNode>
-                    <!-- description = Metric Time Dimension 'ds' -->
-                    <!-- node_id = ss_7 -->
-                    <!-- col0 =                                                    -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_449),  -->
-                    <!--    'column_alias': 'ds__day'}                             -->
-                    <!-- col1 =                                                    -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_450),  -->
-                    <!--    'column_alias': 'ds__week'}                            -->
-                    <!-- col2 =                                                    -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_451),  -->
-                    <!--    'column_alias': 'ds__month'}                           -->
-                    <!-- col3 =                                                    -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_452),  -->
-                    <!--    'column_alias': 'ds__quarter'}                         -->
-                    <!-- col4 =                                                    -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_453),  -->
-                    <!--    'column_alias': 'ds__year'}                            -->
-                    <!-- col5 =                                                    -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_454),  -->
-                    <!--    'column_alias': 'ds__extract_year'}                    -->
-                    <!-- col6 =                                                    -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_455),  -->
-                    <!--    'column_alias': 'ds__extract_quarter'}                 -->
-                    <!-- col7 =                                                    -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),  -->
-                    <!--    'column_alias': 'ds__extract_month'}                   -->
-                    <!-- col8 =                                                    -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),  -->
-                    <!--    'column_alias': 'ds__extract_day'}                     -->
-                    <!-- col9 =                                                    -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_458),  -->
-                    <!--    'column_alias': 'ds__extract_dow'}                     -->
-                    <!-- col10 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_459),  -->
-                    <!--    'column_alias': 'ds__extract_doy'}                     -->
-                    <!-- col11 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_460),  -->
-                    <!--    'column_alias': 'company__ds__day'}                    -->
-                    <!-- col12 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_461),  -->
-                    <!--    'column_alias': 'company__ds__week'}                   -->
-                    <!-- col13 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_462),  -->
-                    <!--    'column_alias': 'company__ds__month'}                  -->
-                    <!-- col14 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_463),  -->
-                    <!--    'column_alias': 'company__ds__quarter'}                -->
-                    <!-- col15 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_464),  -->
-                    <!--    'column_alias': 'company__ds__year'}                   -->
-                    <!-- col16 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_465),  -->
-                    <!--    'column_alias': 'company__ds__extract_year'}           -->
-                    <!-- col17 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_466),  -->
-                    <!--    'column_alias': 'company__ds__extract_quarter'}        -->
-                    <!-- col18 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_467),  -->
-                    <!--    'column_alias': 'company__ds__extract_month'}          -->
-                    <!-- col19 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_468),  -->
-                    <!--    'column_alias': 'company__ds__extract_day'}            -->
-                    <!-- col20 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
-                    <!--    'column_alias': 'company__ds__extract_dow'}            -->
-                    <!-- col21 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_470),  -->
-                    <!--    'column_alias': 'company__ds__extract_doy'}            -->
-                    <!-- col22 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_471),  -->
-                    <!--    'column_alias': 'metric_time__day'}                    -->
-                    <!-- col23 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_472),  -->
-                    <!--    'column_alias': 'metric_time__week'}                   -->
-                    <!-- col24 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_473),  -->
-                    <!--    'column_alias': 'metric_time__month'}                  -->
-                    <!-- col25 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_474),  -->
-                    <!--    'column_alias': 'metric_time__quarter'}                -->
-                    <!-- col26 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_475),  -->
-                    <!--    'column_alias': 'metric_time__year'}                   -->
-                    <!-- col27 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_476),  -->
-                    <!--    'column_alias': 'metric_time__extract_year'}           -->
-                    <!-- col28 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_477),  -->
-                    <!--    'column_alias': 'metric_time__extract_quarter'}        -->
-                    <!-- col29 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_478),  -->
-                    <!--    'column_alias': 'metric_time__extract_month'}          -->
-                    <!-- col30 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_479),  -->
-                    <!--    'column_alias': 'metric_time__extract_day'}            -->
-                    <!-- col31 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_480),  -->
-                    <!--    'column_alias': 'metric_time__extract_dow'}            -->
-                    <!-- col32 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_481),  -->
-                    <!--    'column_alias': 'metric_time__extract_doy'}            -->
-                    <!-- col33 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_482),  -->
-                    <!--    'column_alias': 'user'}                                -->
-                    <!-- col34 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
-                    <!--    'column_alias': 'company__user'}                       -->
-                    <!-- col35 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_448),  -->
-                    <!--    'column_alias': 'txn_revenue'}                         -->
-                    <!-- from_source = SqlSelectStatementNode(node_id=ss_10006) -->
-                    <!-- where = None -->
-                    <SqlSelectStatementNode>
-                        <!-- description = Read Elements From Semantic Model 'revenue' -->
-                        <!-- node_id = ss_10006 -->
-                        <!-- col0 =                                                      -->
-                        <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10068),  -->
-                        <!--    'column_alias': 'txn_revenue'}                           -->
-                        <!-- col1 =                                                -->
-                        <!--   {'class': 'SqlSelectColumn',                        -->
-                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10080),  -->
-                        <!--    'column_alias': 'ds__day'}                         -->
-                        <!-- col2 =                                                -->
-                        <!--   {'class': 'SqlSelectColumn',                        -->
-                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10081),  -->
-                        <!--    'column_alias': 'ds__week'}                        -->
-                        <!-- col3 =                                                -->
-                        <!--   {'class': 'SqlSelectColumn',                        -->
-                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10082),  -->
-                        <!--    'column_alias': 'ds__month'}                       -->
-                        <!-- col4 =                                                -->
-                        <!--   {'class': 'SqlSelectColumn',                        -->
-                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10083),  -->
-                        <!--    'column_alias': 'ds__quarter'}                     -->
-                        <!-- col5 =                                                -->
-                        <!--   {'class': 'SqlSelectColumn',                        -->
-                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10084),  -->
-                        <!--    'column_alias': 'ds__year'}                        -->
-                        <!-- col6 =                                              -->
-                        <!--   {'class': 'SqlSelectColumn',                      -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10096),  -->
-                        <!--    'column_alias': 'ds__extract_year'}              -->
-                        <!-- col7 =                                              -->
-                        <!--   {'class': 'SqlSelectColumn',                      -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10097),  -->
-                        <!--    'column_alias': 'ds__extract_quarter'}           -->
-                        <!-- col8 =                                              -->
-                        <!--   {'class': 'SqlSelectColumn',                      -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10098),  -->
-                        <!--    'column_alias': 'ds__extract_month'}             -->
-                        <!-- col9 =                                              -->
-                        <!--   {'class': 'SqlSelectColumn',                      -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10099),  -->
-                        <!--    'column_alias': 'ds__extract_day'}               -->
-                        <!-- col10 =                                             -->
-                        <!--   {'class': 'SqlSelectColumn',                      -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10100),  -->
-                        <!--    'column_alias': 'ds__extract_dow'}               -->
-                        <!-- col11 =                                             -->
-                        <!--   {'class': 'SqlSelectColumn',                      -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10101),  -->
-                        <!--    'column_alias': 'ds__extract_doy'}               -->
-                        <!-- col12 =                                               -->
-                        <!--   {'class': 'SqlSelectColumn',                        -->
-                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10085),  -->
-                        <!--    'column_alias': 'company__ds__day'}                -->
-                        <!-- col13 =                                               -->
-                        <!--   {'class': 'SqlSelectColumn',                        -->
-                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10086),  -->
-                        <!--    'column_alias': 'company__ds__week'}               -->
-                        <!-- col14 =                                               -->
-                        <!--   {'class': 'SqlSelectColumn',                        -->
-                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10087),  -->
-                        <!--    'column_alias': 'company__ds__month'}              -->
-                        <!-- col15 =                                               -->
-                        <!--   {'class': 'SqlSelectColumn',                        -->
-                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10088),  -->
-                        <!--    'column_alias': 'company__ds__quarter'}            -->
-                        <!-- col16 =                                               -->
-                        <!--   {'class': 'SqlSelectColumn',                        -->
-                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10089),  -->
-                        <!--    'column_alias': 'company__ds__year'}               -->
-                        <!-- col17 =                                             -->
-                        <!--   {'class': 'SqlSelectColumn',                      -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10102),  -->
-                        <!--    'column_alias': 'company__ds__extract_year'}     -->
-                        <!-- col18 =                                             -->
-                        <!--   {'class': 'SqlSelectColumn',                      -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10103),  -->
-                        <!--    'column_alias': 'company__ds__extract_quarter'}  -->
-                        <!-- col19 =                                             -->
-                        <!--   {'class': 'SqlSelectColumn',                      -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10104),  -->
-                        <!--    'column_alias': 'company__ds__extract_month'}    -->
-                        <!-- col20 =                                             -->
-                        <!--   {'class': 'SqlSelectColumn',                      -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10105),  -->
-                        <!--    'column_alias': 'company__ds__extract_day'}      -->
-                        <!-- col21 =                                             -->
-                        <!--   {'class': 'SqlSelectColumn',                      -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10106),  -->
-                        <!--    'column_alias': 'company__ds__extract_dow'}      -->
-                        <!-- col22 =                                             -->
-                        <!--   {'class': 'SqlSelectColumn',                      -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10107),  -->
-                        <!--    'column_alias': 'company__ds__extract_doy'}      -->
-                        <!-- col23 =                                                     -->
-                        <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10071),  -->
-                        <!--    'column_alias': 'user'}                                  -->
-                        <!-- col24 =                                                     -->
-                        <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10072),  -->
-                        <!--    'column_alias': 'company__user'}                         -->
-                        <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10006) -->
-                        <!-- where = None -->
-                        <SqlTableFromClauseNode>
-                            <!-- description = Read from ***************************.fct_revenue -->
-                            <!-- node_id = tfc_10006 -->
-                            <!-- table_id = ***************************.fct_revenue -->
-                        </SqlTableFromClauseNode>
-                    </SqlSelectStatementNode>
-                </SqlSelectStatementNode>
-            </SqlSelectStatementNode>
-        </SqlSelectStatementNode>
-    </SqlSelectStatementNode>
-</SqlQueryPlan>
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_no_window_with_time_constraint__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_no_window_with_time_constraint__plan0.xml
deleted file mode 100644
index 326f716361..0000000000
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_no_window_with_time_constraint__plan0.xml
+++ /dev/null
@@ -1,462 +0,0 @@
-<SqlQueryPlan>
-    <SqlSelectStatementNode>
-        <!-- description = Compute Metrics via Expressions -->
-        <!-- node_id = ss_13 -->
-        <!-- col0 =                                                    -->
-        <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_598),  -->
-        <!--    'column_alias': 'ds__month'}                           -->
-        <!-- col1 =                                                    -->
-        <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_599),  -->
-        <!--    'column_alias': 'revenue_all_time'}                    -->
-        <!-- from_source = SqlSelectStatementNode(node_id=ss_12) -->
-        <!-- where = None -->
-        <SqlSelectStatementNode>
-            <!-- description = Aggregate Measures -->
-            <!-- node_id = ss_12 -->
-            <!-- col0 =                                                    -->
-            <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
-            <!--    'column_alias': 'ds__month'}                           -->
-            <!-- col1 =                                                                       -->
-            <!--   {'class': 'SqlSelectColumn',                                               -->
-            <!--    'expr': SqlAggregateFunctionExpression(node_id=fnc_0, sql_function=SUM),  -->
-            <!--    'column_alias': 'txn_revenue'}                                            -->
-            <!-- from_source = SqlSelectStatementNode(node_id=ss_11) -->
-            <!-- group_by0 =                                               -->
-            <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
-            <!--    'column_alias': 'ds__month'}                           -->
-            <!-- where = None -->
-            <SqlSelectStatementNode>
-                <!-- description =                     -->
-                <!--   Pass Only Elements:             -->
-                <!--     ['txn_revenue', 'ds__month']  -->
-                <!-- node_id = ss_11 -->
-                <!-- col0 =                                                    -->
-                <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_595),  -->
-                <!--    'column_alias': 'ds__month'}                           -->
-                <!-- col1 =                                                    -->
-                <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_594),  -->
-                <!--    'column_alias': 'txn_revenue'}                         -->
-                <!-- from_source = SqlSelectStatementNode(node_id=ss_10) -->
-                <!-- where = None -->
-                <SqlSelectStatementNode>
-                    <!-- description =                                                         -->
-                    <!--   Constrain Time Range to [2000-01-01T00:00:00, 2020-01-01T00:00:00]  -->
-                    <!-- node_id = ss_10 -->
-                    <!-- col0 =                                                    -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
-                    <!--    'column_alias': 'ds__day'}                             -->
-                    <!-- col1 =                                                    -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_560),  -->
-                    <!--    'column_alias': 'ds__week'}                            -->
-                    <!-- col2 =                                                    -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_561),  -->
-                    <!--    'column_alias': 'ds__month'}                           -->
-                    <!-- col3 =                                                    -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
-                    <!--    'column_alias': 'ds__quarter'}                         -->
-                    <!-- col4 =                                                    -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
-                    <!--    'column_alias': 'ds__year'}                            -->
-                    <!-- col5 =                                                    -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
-                    <!--    'column_alias': 'ds__extract_year'}                    -->
-                    <!-- col6 =                                                    -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
-                    <!--    'column_alias': 'ds__extract_quarter'}                 -->
-                    <!-- col7 =                                                    -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_566),  -->
-                    <!--    'column_alias': 'ds__extract_month'}                   -->
-                    <!-- col8 =                                                    -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
-                    <!--    'column_alias': 'ds__extract_day'}                     -->
-                    <!-- col9 =                                                    -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
-                    <!--    'column_alias': 'ds__extract_dow'}                     -->
-                    <!-- col10 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
-                    <!--    'column_alias': 'ds__extract_doy'}                     -->
-                    <!-- col11 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
-                    <!--    'column_alias': 'company__ds__day'}                    -->
-                    <!-- col12 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_571),  -->
-                    <!--    'column_alias': 'company__ds__week'}                   -->
-                    <!-- col13 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_572),  -->
-                    <!--    'column_alias': 'company__ds__month'}                  -->
-                    <!-- col14 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_573),  -->
-                    <!--    'column_alias': 'company__ds__quarter'}                -->
-                    <!-- col15 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_574),  -->
-                    <!--    'column_alias': 'company__ds__year'}                   -->
-                    <!-- col16 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_575),  -->
-                    <!--    'column_alias': 'company__ds__extract_year'}           -->
-                    <!-- col17 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_576),  -->
-                    <!--    'column_alias': 'company__ds__extract_quarter'}        -->
-                    <!-- col18 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_577),  -->
-                    <!--    'column_alias': 'company__ds__extract_month'}          -->
-                    <!-- col19 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_578),  -->
-                    <!--    'column_alias': 'company__ds__extract_day'}            -->
-                    <!-- col20 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_579),  -->
-                    <!--    'column_alias': 'company__ds__extract_dow'}            -->
-                    <!-- col21 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
-                    <!--    'column_alias': 'company__ds__extract_doy'}            -->
-                    <!-- col22 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
-                    <!--    'column_alias': 'metric_time__day'}                    -->
-                    <!-- col23 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
-                    <!--    'column_alias': 'metric_time__week'}                   -->
-                    <!-- col24 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_583),  -->
-                    <!--    'column_alias': 'metric_time__month'}                  -->
-                    <!-- col25 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_584),  -->
-                    <!--    'column_alias': 'metric_time__quarter'}                -->
-                    <!-- col26 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_585),  -->
-                    <!--    'column_alias': 'metric_time__year'}                   -->
-                    <!-- col27 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_586),  -->
-                    <!--    'column_alias': 'metric_time__extract_year'}           -->
-                    <!-- col28 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_587),  -->
-                    <!--    'column_alias': 'metric_time__extract_quarter'}        -->
-                    <!-- col29 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_588),  -->
-                    <!--    'column_alias': 'metric_time__extract_month'}          -->
-                    <!-- col30 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_589),  -->
-                    <!--    'column_alias': 'metric_time__extract_day'}            -->
-                    <!-- col31 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_590),  -->
-                    <!--    'column_alias': 'metric_time__extract_dow'}            -->
-                    <!-- col32 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),  -->
-                    <!--    'column_alias': 'metric_time__extract_doy'}            -->
-                    <!-- col33 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_592),  -->
-                    <!--    'column_alias': 'user'}                                -->
-                    <!-- col34 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_593),  -->
-                    <!--    'column_alias': 'company__user'}                       -->
-                    <!-- col35 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
-                    <!--    'column_alias': 'txn_revenue'}                         -->
-                    <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
-                    <!-- where = SqlBetweenExpression(node_id=betw_1) -->
-                    <SqlSelectStatementNode>
-                        <!-- description = Metric Time Dimension 'ds' -->
-                        <!-- node_id = ss_9 -->
-                        <!-- col0 =                                                    -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
-                        <!--    'column_alias': 'ds__day'}                             -->
-                        <!-- col1 =                                                    -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
-                        <!--    'column_alias': 'ds__week'}                            -->
-                        <!-- col2 =                                                    -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
-                        <!--    'column_alias': 'ds__month'}                           -->
-                        <!-- col3 =                                                    -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
-                        <!--    'column_alias': 'ds__quarter'}                         -->
-                        <!-- col4 =                                                    -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
-                        <!--    'column_alias': 'ds__year'}                            -->
-                        <!-- col5 =                                                    -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
-                        <!--    'column_alias': 'ds__extract_year'}                    -->
-                        <!-- col6 =                                                    -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
-                        <!--    'column_alias': 'ds__extract_quarter'}                 -->
-                        <!-- col7 =                                                    -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
-                        <!--    'column_alias': 'ds__extract_month'}                   -->
-                        <!-- col8 =                                                    -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
-                        <!--    'column_alias': 'ds__extract_day'}                     -->
-                        <!-- col9 =                                                    -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),  -->
-                        <!--    'column_alias': 'ds__extract_dow'}                     -->
-                        <!-- col10 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
-                        <!--    'column_alias': 'ds__extract_doy'}                     -->
-                        <!-- col11 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
-                        <!--    'column_alias': 'company__ds__day'}                    -->
-                        <!-- col12 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_534),  -->
-                        <!--    'column_alias': 'company__ds__week'}                   -->
-                        <!-- col13 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
-                        <!--    'column_alias': 'company__ds__month'}                  -->
-                        <!-- col14 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
-                        <!--    'column_alias': 'company__ds__quarter'}                -->
-                        <!-- col15 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
-                        <!--    'column_alias': 'company__ds__year'}                   -->
-                        <!-- col16 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
-                        <!--    'column_alias': 'company__ds__extract_year'}           -->
-                        <!-- col17 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
-                        <!--    'column_alias': 'company__ds__extract_quarter'}        -->
-                        <!-- col18 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_540),  -->
-                        <!--    'column_alias': 'company__ds__extract_month'}          -->
-                        <!-- col19 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
-                        <!--    'column_alias': 'company__ds__extract_day'}            -->
-                        <!-- col20 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
-                        <!--    'column_alias': 'company__ds__extract_dow'}            -->
-                        <!-- col21 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),  -->
-                        <!--    'column_alias': 'company__ds__extract_doy'}            -->
-                        <!-- col22 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
-                        <!--    'column_alias': 'metric_time__day'}                    -->
-                        <!-- col23 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
-                        <!--    'column_alias': 'metric_time__week'}                   -->
-                        <!-- col24 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
-                        <!--    'column_alias': 'metric_time__month'}                  -->
-                        <!-- col25 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_547),  -->
-                        <!--    'column_alias': 'metric_time__quarter'}                -->
-                        <!-- col26 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_548),  -->
-                        <!--    'column_alias': 'metric_time__year'}                   -->
-                        <!-- col27 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),  -->
-                        <!--    'column_alias': 'metric_time__extract_year'}           -->
-                        <!-- col28 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),  -->
-                        <!--    'column_alias': 'metric_time__extract_quarter'}        -->
-                        <!-- col29 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),  -->
-                        <!--    'column_alias': 'metric_time__extract_month'}          -->
-                        <!-- col30 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),  -->
-                        <!--    'column_alias': 'metric_time__extract_day'}            -->
-                        <!-- col31 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_553),  -->
-                        <!--    'column_alias': 'metric_time__extract_dow'}            -->
-                        <!-- col32 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_554),  -->
-                        <!--    'column_alias': 'metric_time__extract_doy'}            -->
-                        <!-- col33 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),  -->
-                        <!--    'column_alias': 'user'}                                -->
-                        <!-- col34 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),  -->
-                        <!--    'column_alias': 'company__user'}                       -->
-                        <!-- col35 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
-                        <!--    'column_alias': 'txn_revenue'}                         -->
-                        <!-- from_source = SqlSelectStatementNode(node_id=ss_10006) -->
-                        <!-- where = None -->
-                        <SqlSelectStatementNode>
-                            <!-- description = Read Elements From Semantic Model 'revenue' -->
-                            <!-- node_id = ss_10006 -->
-                            <!-- col0 =                                                      -->
-                            <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10068),  -->
-                            <!--    'column_alias': 'txn_revenue'}                           -->
-                            <!-- col1 =                                                -->
-                            <!--   {'class': 'SqlSelectColumn',                        -->
-                            <!--    'expr': SqlDateTruncExpression(node_id=dt_10080),  -->
-                            <!--    'column_alias': 'ds__day'}                         -->
-                            <!-- col2 =                                                -->
-                            <!--   {'class': 'SqlSelectColumn',                        -->
-                            <!--    'expr': SqlDateTruncExpression(node_id=dt_10081),  -->
-                            <!--    'column_alias': 'ds__week'}                        -->
-                            <!-- col3 =                                                -->
-                            <!--   {'class': 'SqlSelectColumn',                        -->
-                            <!--    'expr': SqlDateTruncExpression(node_id=dt_10082),  -->
-                            <!--    'column_alias': 'ds__month'}                       -->
-                            <!-- col4 =                                                -->
-                            <!--   {'class': 'SqlSelectColumn',                        -->
-                            <!--    'expr': SqlDateTruncExpression(node_id=dt_10083),  -->
-                            <!--    'column_alias': 'ds__quarter'}                     -->
-                            <!-- col5 =                                                -->
-                            <!--   {'class': 'SqlSelectColumn',                        -->
-                            <!--    'expr': SqlDateTruncExpression(node_id=dt_10084),  -->
-                            <!--    'column_alias': 'ds__year'}                        -->
-                            <!-- col6 =                                              -->
-                            <!--   {'class': 'SqlSelectColumn',                      -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10096),  -->
-                            <!--    'column_alias': 'ds__extract_year'}              -->
-                            <!-- col7 =                                              -->
-                            <!--   {'class': 'SqlSelectColumn',                      -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10097),  -->
-                            <!--    'column_alias': 'ds__extract_quarter'}           -->
-                            <!-- col8 =                                              -->
-                            <!--   {'class': 'SqlSelectColumn',                      -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10098),  -->
-                            <!--    'column_alias': 'ds__extract_month'}             -->
-                            <!-- col9 =                                              -->
-                            <!--   {'class': 'SqlSelectColumn',                      -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10099),  -->
-                            <!--    'column_alias': 'ds__extract_day'}               -->
-                            <!-- col10 =                                             -->
-                            <!--   {'class': 'SqlSelectColumn',                      -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10100),  -->
-                            <!--    'column_alias': 'ds__extract_dow'}               -->
-                            <!-- col11 =                                             -->
-                            <!--   {'class': 'SqlSelectColumn',                      -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10101),  -->
-                            <!--    'column_alias': 'ds__extract_doy'}               -->
-                            <!-- col12 =                                               -->
-                            <!--   {'class': 'SqlSelectColumn',                        -->
-                            <!--    'expr': SqlDateTruncExpression(node_id=dt_10085),  -->
-                            <!--    'column_alias': 'company__ds__day'}                -->
-                            <!-- col13 =                                               -->
-                            <!--   {'class': 'SqlSelectColumn',                        -->
-                            <!--    'expr': SqlDateTruncExpression(node_id=dt_10086),  -->
-                            <!--    'column_alias': 'company__ds__week'}               -->
-                            <!-- col14 =                                               -->
-                            <!--   {'class': 'SqlSelectColumn',                        -->
-                            <!--    'expr': SqlDateTruncExpression(node_id=dt_10087),  -->
-                            <!--    'column_alias': 'company__ds__month'}              -->
-                            <!-- col15 =                                               -->
-                            <!--   {'class': 'SqlSelectColumn',                        -->
-                            <!--    'expr': SqlDateTruncExpression(node_id=dt_10088),  -->
-                            <!--    'column_alias': 'company__ds__quarter'}            -->
-                            <!-- col16 =                                               -->
-                            <!--   {'class': 'SqlSelectColumn',                        -->
-                            <!--    'expr': SqlDateTruncExpression(node_id=dt_10089),  -->
-                            <!--    'column_alias': 'company__ds__year'}               -->
-                            <!-- col17 =                                             -->
-                            <!--   {'class': 'SqlSelectColumn',                      -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10102),  -->
-                            <!--    'column_alias': 'company__ds__extract_year'}     -->
-                            <!-- col18 =                                             -->
-                            <!--   {'class': 'SqlSelectColumn',                      -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10103),  -->
-                            <!--    'column_alias': 'company__ds__extract_quarter'}  -->
-                            <!-- col19 =                                             -->
-                            <!--   {'class': 'SqlSelectColumn',                      -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10104),  -->
-                            <!--    'column_alias': 'company__ds__extract_month'}    -->
-                            <!-- col20 =                                             -->
-                            <!--   {'class': 'SqlSelectColumn',                      -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10105),  -->
-                            <!--    'column_alias': 'company__ds__extract_day'}      -->
-                            <!-- col21 =                                             -->
-                            <!--   {'class': 'SqlSelectColumn',                      -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10106),  -->
-                            <!--    'column_alias': 'company__ds__extract_dow'}      -->
-                            <!-- col22 =                                             -->
-                            <!--   {'class': 'SqlSelectColumn',                      -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10107),  -->
-                            <!--    'column_alias': 'company__ds__extract_doy'}      -->
-                            <!-- col23 =                                                     -->
-                            <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10071),  -->
-                            <!--    'column_alias': 'user'}                                  -->
-                            <!-- col24 =                                                     -->
-                            <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10072),  -->
-                            <!--    'column_alias': 'company__user'}                         -->
-                            <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10006) -->
-                            <!-- where = None -->
-                            <SqlTableFromClauseNode>
-                                <!-- description = Read from ***************************.fct_revenue -->
-                                <!-- node_id = tfc_10006 -->
-                                <!-- table_id = ***************************.fct_revenue -->
-                            </SqlTableFromClauseNode>
-                        </SqlSelectStatementNode>
-                    </SqlSelectStatementNode>
-                </SqlSelectStatementNode>
-            </SqlSelectStatementNode>
-        </SqlSelectStatementNode>
-    </SqlSelectStatementNode>
-</SqlQueryPlan>
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_with_time_constraint__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_with_time_constraint__plan0.xml
deleted file mode 100644
index 445b8866af..0000000000
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_with_time_constraint__plan0.xml
+++ /dev/null
@@ -1,462 +0,0 @@
-<SqlQueryPlan>
-    <SqlSelectStatementNode>
-        <!-- description = Compute Metrics via Expressions -->
-        <!-- node_id = ss_13 -->
-        <!-- col0 =                                                    -->
-        <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_598),  -->
-        <!--    'column_alias': 'ds__month'}                           -->
-        <!-- col1 =                                                    -->
-        <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_599),  -->
-        <!--    'column_alias': 'trailing_2_months_revenue'}           -->
-        <!-- from_source = SqlSelectStatementNode(node_id=ss_12) -->
-        <!-- where = None -->
-        <SqlSelectStatementNode>
-            <!-- description = Aggregate Measures -->
-            <!-- node_id = ss_12 -->
-            <!-- col0 =                                                    -->
-            <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
-            <!--    'column_alias': 'ds__month'}                           -->
-            <!-- col1 =                                                                       -->
-            <!--   {'class': 'SqlSelectColumn',                                               -->
-            <!--    'expr': SqlAggregateFunctionExpression(node_id=fnc_0, sql_function=SUM),  -->
-            <!--    'column_alias': 'txn_revenue'}                                            -->
-            <!-- from_source = SqlSelectStatementNode(node_id=ss_11) -->
-            <!-- group_by0 =                                               -->
-            <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
-            <!--    'column_alias': 'ds__month'}                           -->
-            <!-- where = None -->
-            <SqlSelectStatementNode>
-                <!-- description =                     -->
-                <!--   Pass Only Elements:             -->
-                <!--     ['txn_revenue', 'ds__month']  -->
-                <!-- node_id = ss_11 -->
-                <!-- col0 =                                                    -->
-                <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_595),  -->
-                <!--    'column_alias': 'ds__month'}                           -->
-                <!-- col1 =                                                    -->
-                <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_594),  -->
-                <!--    'column_alias': 'txn_revenue'}                         -->
-                <!-- from_source = SqlSelectStatementNode(node_id=ss_10) -->
-                <!-- where = None -->
-                <SqlSelectStatementNode>
-                    <!-- description =                                                         -->
-                    <!--   Constrain Time Range to [2019-12-01T00:00:00, 2020-01-01T00:00:00]  -->
-                    <!-- node_id = ss_10 -->
-                    <!-- col0 =                                                    -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
-                    <!--    'column_alias': 'ds__day'}                             -->
-                    <!-- col1 =                                                    -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_560),  -->
-                    <!--    'column_alias': 'ds__week'}                            -->
-                    <!-- col2 =                                                    -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_561),  -->
-                    <!--    'column_alias': 'ds__month'}                           -->
-                    <!-- col3 =                                                    -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
-                    <!--    'column_alias': 'ds__quarter'}                         -->
-                    <!-- col4 =                                                    -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
-                    <!--    'column_alias': 'ds__year'}                            -->
-                    <!-- col5 =                                                    -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
-                    <!--    'column_alias': 'ds__extract_year'}                    -->
-                    <!-- col6 =                                                    -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
-                    <!--    'column_alias': 'ds__extract_quarter'}                 -->
-                    <!-- col7 =                                                    -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_566),  -->
-                    <!--    'column_alias': 'ds__extract_month'}                   -->
-                    <!-- col8 =                                                    -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
-                    <!--    'column_alias': 'ds__extract_day'}                     -->
-                    <!-- col9 =                                                    -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
-                    <!--    'column_alias': 'ds__extract_dow'}                     -->
-                    <!-- col10 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
-                    <!--    'column_alias': 'ds__extract_doy'}                     -->
-                    <!-- col11 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
-                    <!--    'column_alias': 'company__ds__day'}                    -->
-                    <!-- col12 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_571),  -->
-                    <!--    'column_alias': 'company__ds__week'}                   -->
-                    <!-- col13 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_572),  -->
-                    <!--    'column_alias': 'company__ds__month'}                  -->
-                    <!-- col14 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_573),  -->
-                    <!--    'column_alias': 'company__ds__quarter'}                -->
-                    <!-- col15 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_574),  -->
-                    <!--    'column_alias': 'company__ds__year'}                   -->
-                    <!-- col16 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_575),  -->
-                    <!--    'column_alias': 'company__ds__extract_year'}           -->
-                    <!-- col17 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_576),  -->
-                    <!--    'column_alias': 'company__ds__extract_quarter'}        -->
-                    <!-- col18 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_577),  -->
-                    <!--    'column_alias': 'company__ds__extract_month'}          -->
-                    <!-- col19 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_578),  -->
-                    <!--    'column_alias': 'company__ds__extract_day'}            -->
-                    <!-- col20 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_579),  -->
-                    <!--    'column_alias': 'company__ds__extract_dow'}            -->
-                    <!-- col21 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
-                    <!--    'column_alias': 'company__ds__extract_doy'}            -->
-                    <!-- col22 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
-                    <!--    'column_alias': 'metric_time__day'}                    -->
-                    <!-- col23 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
-                    <!--    'column_alias': 'metric_time__week'}                   -->
-                    <!-- col24 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_583),  -->
-                    <!--    'column_alias': 'metric_time__month'}                  -->
-                    <!-- col25 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_584),  -->
-                    <!--    'column_alias': 'metric_time__quarter'}                -->
-                    <!-- col26 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_585),  -->
-                    <!--    'column_alias': 'metric_time__year'}                   -->
-                    <!-- col27 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_586),  -->
-                    <!--    'column_alias': 'metric_time__extract_year'}           -->
-                    <!-- col28 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_587),  -->
-                    <!--    'column_alias': 'metric_time__extract_quarter'}        -->
-                    <!-- col29 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_588),  -->
-                    <!--    'column_alias': 'metric_time__extract_month'}          -->
-                    <!-- col30 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_589),  -->
-                    <!--    'column_alias': 'metric_time__extract_day'}            -->
-                    <!-- col31 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_590),  -->
-                    <!--    'column_alias': 'metric_time__extract_dow'}            -->
-                    <!-- col32 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),  -->
-                    <!--    'column_alias': 'metric_time__extract_doy'}            -->
-                    <!-- col33 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_592),  -->
-                    <!--    'column_alias': 'user'}                                -->
-                    <!-- col34 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_593),  -->
-                    <!--    'column_alias': 'company__user'}                       -->
-                    <!-- col35 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
-                    <!--    'column_alias': 'txn_revenue'}                         -->
-                    <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
-                    <!-- where = SqlBetweenExpression(node_id=betw_1) -->
-                    <SqlSelectStatementNode>
-                        <!-- description = Metric Time Dimension 'ds' -->
-                        <!-- node_id = ss_9 -->
-                        <!-- col0 =                                                    -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
-                        <!--    'column_alias': 'ds__day'}                             -->
-                        <!-- col1 =                                                    -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
-                        <!--    'column_alias': 'ds__week'}                            -->
-                        <!-- col2 =                                                    -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
-                        <!--    'column_alias': 'ds__month'}                           -->
-                        <!-- col3 =                                                    -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
-                        <!--    'column_alias': 'ds__quarter'}                         -->
-                        <!-- col4 =                                                    -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
-                        <!--    'column_alias': 'ds__year'}                            -->
-                        <!-- col5 =                                                    -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
-                        <!--    'column_alias': 'ds__extract_year'}                    -->
-                        <!-- col6 =                                                    -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
-                        <!--    'column_alias': 'ds__extract_quarter'}                 -->
-                        <!-- col7 =                                                    -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
-                        <!--    'column_alias': 'ds__extract_month'}                   -->
-                        <!-- col8 =                                                    -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
-                        <!--    'column_alias': 'ds__extract_day'}                     -->
-                        <!-- col9 =                                                    -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),  -->
-                        <!--    'column_alias': 'ds__extract_dow'}                     -->
-                        <!-- col10 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
-                        <!--    'column_alias': 'ds__extract_doy'}                     -->
-                        <!-- col11 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
-                        <!--    'column_alias': 'company__ds__day'}                    -->
-                        <!-- col12 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_534),  -->
-                        <!--    'column_alias': 'company__ds__week'}                   -->
-                        <!-- col13 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
-                        <!--    'column_alias': 'company__ds__month'}                  -->
-                        <!-- col14 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
-                        <!--    'column_alias': 'company__ds__quarter'}                -->
-                        <!-- col15 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
-                        <!--    'column_alias': 'company__ds__year'}                   -->
-                        <!-- col16 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
-                        <!--    'column_alias': 'company__ds__extract_year'}           -->
-                        <!-- col17 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
-                        <!--    'column_alias': 'company__ds__extract_quarter'}        -->
-                        <!-- col18 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_540),  -->
-                        <!--    'column_alias': 'company__ds__extract_month'}          -->
-                        <!-- col19 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
-                        <!--    'column_alias': 'company__ds__extract_day'}            -->
-                        <!-- col20 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
-                        <!--    'column_alias': 'company__ds__extract_dow'}            -->
-                        <!-- col21 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),  -->
-                        <!--    'column_alias': 'company__ds__extract_doy'}            -->
-                        <!-- col22 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
-                        <!--    'column_alias': 'metric_time__day'}                    -->
-                        <!-- col23 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
-                        <!--    'column_alias': 'metric_time__week'}                   -->
-                        <!-- col24 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
-                        <!--    'column_alias': 'metric_time__month'}                  -->
-                        <!-- col25 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_547),  -->
-                        <!--    'column_alias': 'metric_time__quarter'}                -->
-                        <!-- col26 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_548),  -->
-                        <!--    'column_alias': 'metric_time__year'}                   -->
-                        <!-- col27 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),  -->
-                        <!--    'column_alias': 'metric_time__extract_year'}           -->
-                        <!-- col28 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),  -->
-                        <!--    'column_alias': 'metric_time__extract_quarter'}        -->
-                        <!-- col29 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),  -->
-                        <!--    'column_alias': 'metric_time__extract_month'}          -->
-                        <!-- col30 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),  -->
-                        <!--    'column_alias': 'metric_time__extract_day'}            -->
-                        <!-- col31 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_553),  -->
-                        <!--    'column_alias': 'metric_time__extract_dow'}            -->
-                        <!-- col32 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_554),  -->
-                        <!--    'column_alias': 'metric_time__extract_doy'}            -->
-                        <!-- col33 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),  -->
-                        <!--    'column_alias': 'user'}                                -->
-                        <!-- col34 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),  -->
-                        <!--    'column_alias': 'company__user'}                       -->
-                        <!-- col35 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
-                        <!--    'column_alias': 'txn_revenue'}                         -->
-                        <!-- from_source = SqlSelectStatementNode(node_id=ss_10006) -->
-                        <!-- where = None -->
-                        <SqlSelectStatementNode>
-                            <!-- description = Read Elements From Semantic Model 'revenue' -->
-                            <!-- node_id = ss_10006 -->
-                            <!-- col0 =                                                      -->
-                            <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10068),  -->
-                            <!--    'column_alias': 'txn_revenue'}                           -->
-                            <!-- col1 =                                                -->
-                            <!--   {'class': 'SqlSelectColumn',                        -->
-                            <!--    'expr': SqlDateTruncExpression(node_id=dt_10080),  -->
-                            <!--    'column_alias': 'ds__day'}                         -->
-                            <!-- col2 =                                                -->
-                            <!--   {'class': 'SqlSelectColumn',                        -->
-                            <!--    'expr': SqlDateTruncExpression(node_id=dt_10081),  -->
-                            <!--    'column_alias': 'ds__week'}                        -->
-                            <!-- col3 =                                                -->
-                            <!--   {'class': 'SqlSelectColumn',                        -->
-                            <!--    'expr': SqlDateTruncExpression(node_id=dt_10082),  -->
-                            <!--    'column_alias': 'ds__month'}                       -->
-                            <!-- col4 =                                                -->
-                            <!--   {'class': 'SqlSelectColumn',                        -->
-                            <!--    'expr': SqlDateTruncExpression(node_id=dt_10083),  -->
-                            <!--    'column_alias': 'ds__quarter'}                     -->
-                            <!-- col5 =                                                -->
-                            <!--   {'class': 'SqlSelectColumn',                        -->
-                            <!--    'expr': SqlDateTruncExpression(node_id=dt_10084),  -->
-                            <!--    'column_alias': 'ds__year'}                        -->
-                            <!-- col6 =                                              -->
-                            <!--   {'class': 'SqlSelectColumn',                      -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10096),  -->
-                            <!--    'column_alias': 'ds__extract_year'}              -->
-                            <!-- col7 =                                              -->
-                            <!--   {'class': 'SqlSelectColumn',                      -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10097),  -->
-                            <!--    'column_alias': 'ds__extract_quarter'}           -->
-                            <!-- col8 =                                              -->
-                            <!--   {'class': 'SqlSelectColumn',                      -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10098),  -->
-                            <!--    'column_alias': 'ds__extract_month'}             -->
-                            <!-- col9 =                                              -->
-                            <!--   {'class': 'SqlSelectColumn',                      -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10099),  -->
-                            <!--    'column_alias': 'ds__extract_day'}               -->
-                            <!-- col10 =                                             -->
-                            <!--   {'class': 'SqlSelectColumn',                      -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10100),  -->
-                            <!--    'column_alias': 'ds__extract_dow'}               -->
-                            <!-- col11 =                                             -->
-                            <!--   {'class': 'SqlSelectColumn',                      -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10101),  -->
-                            <!--    'column_alias': 'ds__extract_doy'}               -->
-                            <!-- col12 =                                               -->
-                            <!--   {'class': 'SqlSelectColumn',                        -->
-                            <!--    'expr': SqlDateTruncExpression(node_id=dt_10085),  -->
-                            <!--    'column_alias': 'company__ds__day'}                -->
-                            <!-- col13 =                                               -->
-                            <!--   {'class': 'SqlSelectColumn',                        -->
-                            <!--    'expr': SqlDateTruncExpression(node_id=dt_10086),  -->
-                            <!--    'column_alias': 'company__ds__week'}               -->
-                            <!-- col14 =                                               -->
-                            <!--   {'class': 'SqlSelectColumn',                        -->
-                            <!--    'expr': SqlDateTruncExpression(node_id=dt_10087),  -->
-                            <!--    'column_alias': 'company__ds__month'}              -->
-                            <!-- col15 =                                               -->
-                            <!--   {'class': 'SqlSelectColumn',                        -->
-                            <!--    'expr': SqlDateTruncExpression(node_id=dt_10088),  -->
-                            <!--    'column_alias': 'company__ds__quarter'}            -->
-                            <!-- col16 =                                               -->
-                            <!--   {'class': 'SqlSelectColumn',                        -->
-                            <!--    'expr': SqlDateTruncExpression(node_id=dt_10089),  -->
-                            <!--    'column_alias': 'company__ds__year'}               -->
-                            <!-- col17 =                                             -->
-                            <!--   {'class': 'SqlSelectColumn',                      -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10102),  -->
-                            <!--    'column_alias': 'company__ds__extract_year'}     -->
-                            <!-- col18 =                                             -->
-                            <!--   {'class': 'SqlSelectColumn',                      -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10103),  -->
-                            <!--    'column_alias': 'company__ds__extract_quarter'}  -->
-                            <!-- col19 =                                             -->
-                            <!--   {'class': 'SqlSelectColumn',                      -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10104),  -->
-                            <!--    'column_alias': 'company__ds__extract_month'}    -->
-                            <!-- col20 =                                             -->
-                            <!--   {'class': 'SqlSelectColumn',                      -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10105),  -->
-                            <!--    'column_alias': 'company__ds__extract_day'}      -->
-                            <!-- col21 =                                             -->
-                            <!--   {'class': 'SqlSelectColumn',                      -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10106),  -->
-                            <!--    'column_alias': 'company__ds__extract_dow'}      -->
-                            <!-- col22 =                                             -->
-                            <!--   {'class': 'SqlSelectColumn',                      -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10107),  -->
-                            <!--    'column_alias': 'company__ds__extract_doy'}      -->
-                            <!-- col23 =                                                     -->
-                            <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10071),  -->
-                            <!--    'column_alias': 'user'}                                  -->
-                            <!-- col24 =                                                     -->
-                            <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10072),  -->
-                            <!--    'column_alias': 'company__user'}                         -->
-                            <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10006) -->
-                            <!-- where = None -->
-                            <SqlTableFromClauseNode>
-                                <!-- description = Read from ***************************.fct_revenue -->
-                                <!-- node_id = tfc_10006 -->
-                                <!-- table_id = ***************************.fct_revenue -->
-                            </SqlTableFromClauseNode>
-                        </SqlSelectStatementNode>
-                    </SqlSelectStatementNode>
-                </SqlSelectStatementNode>
-            </SqlSelectStatementNode>
-        </SqlSelectStatementNode>
-    </SqlSelectStatementNode>
-</SqlQueryPlan>