diff --git a/metricflow/test/generate_snapshots.py b/metricflow/test/generate_snapshots.py
index 642eebd890..5b74236428 100644
--- a/metricflow/test/generate_snapshots.py
+++ b/metricflow/test/generate_snapshots.py
@@ -138,7 +138,7 @@ def run_tests(test_configuration: MetricFlowTestConfiguration) -> None:  # noqa:
             f"hatch -v run {hatch_env}:pytest -x -vv -n 4 "
             f"--overwrite-snapshots"
             f"{' --use-persistent-source-schema' if use_persistent_source_schema else ''}"
-            f"-m '{SQL_ENGINE_SNAPSHOT_MARKER_NAME}' "
+            f" -m '{SQL_ENGINE_SNAPSHOT_MARKER_NAME}' "
             f"{TEST_DIRECTORY}"
         )
     else:
diff --git a/metricflow/test/snapshots/test_cli.py/str/BigQuery/test_saved_query__cli_output.txt b/metricflow/test/snapshots/test_cli.py/str/BigQuery/test_saved_query__cli_output.txt
index 30e79e45b0..138d8b140e 100644
--- a/metricflow/test/snapshots/test_cli.py/str/BigQuery/test_saved_query__cli_output.txt
+++ b/metricflow/test/snapshots/test_cli.py/str/BigQuery/test_saved_query__cli_output.txt
@@ -1,11 +1,11 @@
 | metric_time__day    |   listing__capacity_latest |   bookings |   instant_bookings |
 |:--------------------|---------------------------:|-----------:|-------------------:|
 | 2019-12-01 00:00:00 |                          5 |          1 |                  0 |
-| 2020-01-01 00:00:00 |                          4 |          2 |                  1 |
-| 2020-01-02 00:00:00 |                          4 |          3 |                  3 |
-| 2020-01-02 00:00:00 |                          5 |          1 |                  0 |
 | 2019-12-18 00:00:00 |                          4 |          4 |                  2 |
-| 2020-01-03 00:00:00 |                          5 |          1 |                  0 |
 | 2019-12-19 00:00:00 |                          4 |          6 |                  6 |
 | 2019-12-19 00:00:00 |                          5 |          2 |                  0 |
 | 2019-12-20 00:00:00 |                          5 |          2 |                  0 |
+| 2020-01-01 00:00:00 |                          4 |          2 |                  1 |
+| 2020-01-02 00:00:00 |                          4 |          3 |                  3 |
+| 2020-01-02 00:00:00 |                          5 |          1 |                  0 |
+| 2020-01-03 00:00:00 |                          5 |          1 |                  0 |
diff --git a/metricflow/test/snapshots/test_cli.py/str/BigQuery/test_saved_query_with_limit__cli_output.txt b/metricflow/test/snapshots/test_cli.py/str/BigQuery/test_saved_query_with_limit__cli_output.txt
index c2123f8ea1..313b03eda8 100644
--- a/metricflow/test/snapshots/test_cli.py/str/BigQuery/test_saved_query_with_limit__cli_output.txt
+++ b/metricflow/test/snapshots/test_cli.py/str/BigQuery/test_saved_query_with_limit__cli_output.txt
@@ -1,5 +1,5 @@
 | metric_time__day    |   listing__capacity_latest |   bookings |   instant_bookings |
 |:--------------------|---------------------------:|-----------:|-------------------:|
 | 2019-12-01 00:00:00 |                          5 |          1 |                  0 |
-| 2020-01-01 00:00:00 |                          4 |          2 |                  1 |
-| 2020-01-02 00:00:00 |                          4 |          3 |                  3 |
+| 2019-12-18 00:00:00 |                          4 |          4 |                  2 |
+| 2019-12-19 00:00:00 |                          4 |          6 |                  6 |
diff --git a/metricflow/test/snapshots/test_cli.py/str/BigQuery/test_saved_query_with_where__cli_output.txt b/metricflow/test/snapshots/test_cli.py/str/BigQuery/test_saved_query_with_where__cli_output.txt
index cce16e9717..fc66131bbc 100644
--- a/metricflow/test/snapshots/test_cli.py/str/BigQuery/test_saved_query_with_where__cli_output.txt
+++ b/metricflow/test/snapshots/test_cli.py/str/BigQuery/test_saved_query_with_where__cli_output.txt
@@ -1,7 +1,7 @@
 | metric_time__day    |   listing__capacity_latest |   bookings |   instant_bookings |
 |:--------------------|---------------------------:|-----------:|-------------------:|
 | 2019-12-01 00:00:00 |                          5 |          1 |                  0 |
-| 2020-01-02 00:00:00 |                          5 |          1 |                  0 |
-| 2020-01-03 00:00:00 |                          5 |          1 |                  0 |
 | 2019-12-19 00:00:00 |                          5 |          2 |                  0 |
 | 2019-12-20 00:00:00 |                          5 |          2 |                  0 |
+| 2020-01-02 00:00:00 |                          5 |          1 |                  0 |
+| 2020-01-03 00:00:00 |                          5 |          1 |                  0 |
diff --git a/metricflow/test/snapshots/test_cli.py/str/Databricks/test_saved_query__cli_output.txt b/metricflow/test/snapshots/test_cli.py/str/Databricks/test_saved_query__cli_output.txt
index 058e8f0608..d1e31bc2b6 100644
--- a/metricflow/test/snapshots/test_cli.py/str/Databricks/test_saved_query__cli_output.txt
+++ b/metricflow/test/snapshots/test_cli.py/str/Databricks/test_saved_query__cli_output.txt
@@ -1,11 +1,11 @@
 | metric_time__day          |   listing__capacity_latest |   bookings |   instant_bookings |
 |:--------------------------|---------------------------:|-----------:|-------------------:|
-| 2020-01-02 00:00:00+00:00 |                          5 |          1 |                  0 |
-| 2019-12-19 00:00:00+00:00 |                          4 |          6 |                  6 |
 | 2019-12-01 00:00:00+00:00 |                          5 |          1 |                  0 |
-| 2019-12-20 00:00:00+00:00 |                          5 |          2 |                  0 |
-| 2019-12-19 00:00:00+00:00 |                          5 |          2 |                  0 |
 | 2019-12-18 00:00:00+00:00 |                          4 |          4 |                  2 |
+| 2019-12-19 00:00:00+00:00 |                          4 |          6 |                  6 |
+| 2019-12-19 00:00:00+00:00 |                          5 |          2 |                  0 |
+| 2019-12-20 00:00:00+00:00 |                          5 |          2 |                  0 |
+| 2020-01-01 00:00:00+00:00 |                          4 |          2 |                  1 |
 | 2020-01-02 00:00:00+00:00 |                          4 |          3 |                  3 |
+| 2020-01-02 00:00:00+00:00 |                          5 |          1 |                  0 |
 | 2020-01-03 00:00:00+00:00 |                          5 |          1 |                  0 |
-| 2020-01-01 00:00:00+00:00 |                          4 |          2 |                  1 |
diff --git a/metricflow/test/snapshots/test_cli.py/str/Databricks/test_saved_query_with_limit__cli_output.txt b/metricflow/test/snapshots/test_cli.py/str/Databricks/test_saved_query_with_limit__cli_output.txt
index 53ccdfa167..7d7b0f5f46 100644
--- a/metricflow/test/snapshots/test_cli.py/str/Databricks/test_saved_query_with_limit__cli_output.txt
+++ b/metricflow/test/snapshots/test_cli.py/str/Databricks/test_saved_query_with_limit__cli_output.txt
@@ -1,5 +1,5 @@
 | metric_time__day          |   listing__capacity_latest |   bookings |   instant_bookings |
 |:--------------------------|---------------------------:|-----------:|-------------------:|
-| 2020-01-02 00:00:00+00:00 |                          5 |          1 |                  0 |
-| 2019-12-19 00:00:00+00:00 |                          4 |          6 |                  6 |
 | 2019-12-01 00:00:00+00:00 |                          5 |          1 |                  0 |
+| 2019-12-18 00:00:00+00:00 |                          4 |          4 |                  2 |
+| 2019-12-19 00:00:00+00:00 |                          4 |          6 |                  6 |
diff --git a/metricflow/test/snapshots/test_cli.py/str/Databricks/test_saved_query_with_where__cli_output.txt b/metricflow/test/snapshots/test_cli.py/str/Databricks/test_saved_query_with_where__cli_output.txt
index 06daf91ce8..1f575ac83d 100644
--- a/metricflow/test/snapshots/test_cli.py/str/Databricks/test_saved_query_with_where__cli_output.txt
+++ b/metricflow/test/snapshots/test_cli.py/str/Databricks/test_saved_query_with_where__cli_output.txt
@@ -1,7 +1,7 @@
 | metric_time__day          |   listing__capacity_latest |   bookings |   instant_bookings |
 |:--------------------------|---------------------------:|-----------:|-------------------:|
-| 2020-01-02 00:00:00+00:00 |                          5 |          1 |                  0 |
 | 2019-12-01 00:00:00+00:00 |                          5 |          1 |                  0 |
-| 2019-12-20 00:00:00+00:00 |                          5 |          2 |                  0 |
 | 2019-12-19 00:00:00+00:00 |                          5 |          2 |                  0 |
+| 2019-12-20 00:00:00+00:00 |                          5 |          2 |                  0 |
+| 2020-01-02 00:00:00+00:00 |                          5 |          1 |                  0 |
 | 2020-01-03 00:00:00+00:00 |                          5 |          1 |                  0 |
diff --git a/metricflow/test/snapshots/test_cli.py/str/Postgres/test_saved_query__cli_output.txt b/metricflow/test/snapshots/test_cli.py/str/Postgres/test_saved_query__cli_output.txt
index 5746951b2c..138d8b140e 100644
--- a/metricflow/test/snapshots/test_cli.py/str/Postgres/test_saved_query__cli_output.txt
+++ b/metricflow/test/snapshots/test_cli.py/str/Postgres/test_saved_query__cli_output.txt
@@ -1,11 +1,11 @@
 | metric_time__day    |   listing__capacity_latest |   bookings |   instant_bookings |
 |:--------------------|---------------------------:|-----------:|-------------------:|
-| 2019-12-19 00:00:00 |                          4 |          6 |                  6 |
+| 2019-12-01 00:00:00 |                          5 |          1 |                  0 |
 | 2019-12-18 00:00:00 |                          4 |          4 |                  2 |
+| 2019-12-19 00:00:00 |                          4 |          6 |                  6 |
 | 2019-12-19 00:00:00 |                          5 |          2 |                  0 |
-| 2020-01-02 00:00:00 |                          4 |          3 |                  3 |
-| 2019-12-01 00:00:00 |                          5 |          1 |                  0 |
 | 2019-12-20 00:00:00 |                          5 |          2 |                  0 |
-| 2020-01-02 00:00:00 |                          5 |          1 |                  0 |
 | 2020-01-01 00:00:00 |                          4 |          2 |                  1 |
+| 2020-01-02 00:00:00 |                          4 |          3 |                  3 |
+| 2020-01-02 00:00:00 |                          5 |          1 |                  0 |
 | 2020-01-03 00:00:00 |                          5 |          1 |                  0 |
diff --git a/metricflow/test/snapshots/test_cli.py/str/Postgres/test_saved_query_with_limit__cli_output.txt b/metricflow/test/snapshots/test_cli.py/str/Postgres/test_saved_query_with_limit__cli_output.txt
index 099fe41d85..313b03eda8 100644
--- a/metricflow/test/snapshots/test_cli.py/str/Postgres/test_saved_query_with_limit__cli_output.txt
+++ b/metricflow/test/snapshots/test_cli.py/str/Postgres/test_saved_query_with_limit__cli_output.txt
@@ -1,5 +1,5 @@
 | metric_time__day    |   listing__capacity_latest |   bookings |   instant_bookings |
 |:--------------------|---------------------------:|-----------:|-------------------:|
-| 2019-12-19 00:00:00 |                          4 |          6 |                  6 |
+| 2019-12-01 00:00:00 |                          5 |          1 |                  0 |
 | 2019-12-18 00:00:00 |                          4 |          4 |                  2 |
-| 2019-12-19 00:00:00 |                          5 |          2 |                  0 |
+| 2019-12-19 00:00:00 |                          4 |          6 |                  6 |
diff --git a/metricflow/test/snapshots/test_cli.py/str/Postgres/test_saved_query_with_where__cli_output.txt b/metricflow/test/snapshots/test_cli.py/str/Postgres/test_saved_query_with_where__cli_output.txt
index 7ae58549f0..fc66131bbc 100644
--- a/metricflow/test/snapshots/test_cli.py/str/Postgres/test_saved_query_with_where__cli_output.txt
+++ b/metricflow/test/snapshots/test_cli.py/str/Postgres/test_saved_query_with_where__cli_output.txt
@@ -1,7 +1,7 @@
 | metric_time__day    |   listing__capacity_latest |   bookings |   instant_bookings |
 |:--------------------|---------------------------:|-----------:|-------------------:|
-| 2019-12-19 00:00:00 |                          5 |          2 |                  0 |
 | 2019-12-01 00:00:00 |                          5 |          1 |                  0 |
+| 2019-12-19 00:00:00 |                          5 |          2 |                  0 |
 | 2019-12-20 00:00:00 |                          5 |          2 |                  0 |
 | 2020-01-02 00:00:00 |                          5 |          1 |                  0 |
 | 2020-01-03 00:00:00 |                          5 |          1 |                  0 |
diff --git a/metricflow/test/snapshots/test_cli.py/str/Redshift/test_saved_query__cli_output.txt b/metricflow/test/snapshots/test_cli.py/str/Redshift/test_saved_query__cli_output.txt
index beccedd97c..138d8b140e 100644
--- a/metricflow/test/snapshots/test_cli.py/str/Redshift/test_saved_query__cli_output.txt
+++ b/metricflow/test/snapshots/test_cli.py/str/Redshift/test_saved_query__cli_output.txt
@@ -1,11 +1,11 @@
 | metric_time__day    |   listing__capacity_latest |   bookings |   instant_bookings |
 |:--------------------|---------------------------:|-----------:|-------------------:|
-| 2019-12-19 00:00:00 |                          5 |          2 |                  0 |
+| 2019-12-01 00:00:00 |                          5 |          1 |                  0 |
+| 2019-12-18 00:00:00 |                          4 |          4 |                  2 |
 | 2019-12-19 00:00:00 |                          4 |          6 |                  6 |
-| 2020-01-03 00:00:00 |                          5 |          1 |                  0 |
-| 2020-01-02 00:00:00 |                          5 |          1 |                  0 |
+| 2019-12-19 00:00:00 |                          5 |          2 |                  0 |
 | 2019-12-20 00:00:00 |                          5 |          2 |                  0 |
-| 2019-12-01 00:00:00 |                          5 |          1 |                  0 |
-| 2020-01-02 00:00:00 |                          4 |          3 |                  3 |
 | 2020-01-01 00:00:00 |                          4 |          2 |                  1 |
-| 2019-12-18 00:00:00 |                          4 |          4 |                  2 |
+| 2020-01-02 00:00:00 |                          4 |          3 |                  3 |
+| 2020-01-02 00:00:00 |                          5 |          1 |                  0 |
+| 2020-01-03 00:00:00 |                          5 |          1 |                  0 |
diff --git a/metricflow/test/snapshots/test_cli.py/str/Redshift/test_saved_query_with_limit__cli_output.txt b/metricflow/test/snapshots/test_cli.py/str/Redshift/test_saved_query_with_limit__cli_output.txt
index f5456036e3..313b03eda8 100644
--- a/metricflow/test/snapshots/test_cli.py/str/Redshift/test_saved_query_with_limit__cli_output.txt
+++ b/metricflow/test/snapshots/test_cli.py/str/Redshift/test_saved_query_with_limit__cli_output.txt
@@ -1,5 +1,5 @@
 | metric_time__day    |   listing__capacity_latest |   bookings |   instant_bookings |
 |:--------------------|---------------------------:|-----------:|-------------------:|
-| 2020-01-03 00:00:00 |                          5 |          1 |                  0 |
-| 2020-01-02 00:00:00 |                          5 |          1 |                  0 |
-| 2019-12-20 00:00:00 |                          5 |          2 |                  0 |
+| 2019-12-01 00:00:00 |                          5 |          1 |                  0 |
+| 2019-12-18 00:00:00 |                          4 |          4 |                  2 |
+| 2019-12-19 00:00:00 |                          4 |          6 |                  6 |
diff --git a/metricflow/test/snapshots/test_cli.py/str/Redshift/test_saved_query_with_where__cli_output.txt b/metricflow/test/snapshots/test_cli.py/str/Redshift/test_saved_query_with_where__cli_output.txt
index 44f958aec2..fc66131bbc 100644
--- a/metricflow/test/snapshots/test_cli.py/str/Redshift/test_saved_query_with_where__cli_output.txt
+++ b/metricflow/test/snapshots/test_cli.py/str/Redshift/test_saved_query_with_where__cli_output.txt
@@ -1,7 +1,7 @@
 | metric_time__day    |   listing__capacity_latest |   bookings |   instant_bookings |
 |:--------------------|---------------------------:|-----------:|-------------------:|
+| 2019-12-01 00:00:00 |                          5 |          1 |                  0 |
 | 2019-12-19 00:00:00 |                          5 |          2 |                  0 |
-| 2020-01-03 00:00:00 |                          5 |          1 |                  0 |
-| 2020-01-02 00:00:00 |                          5 |          1 |                  0 |
 | 2019-12-20 00:00:00 |                          5 |          2 |                  0 |
-| 2019-12-01 00:00:00 |                          5 |          1 |                  0 |
+| 2020-01-02 00:00:00 |                          5 |          1 |                  0 |
+| 2020-01-03 00:00:00 |                          5 |          1 |                  0 |