diff --git a/executor_test.go b/executor_test.go
index eba87d87a..974060936 100644
--- a/executor_test.go
+++ b/executor_test.go
@@ -1092,27 +1092,22 @@ func TestExecutor(t *testing.T) {
 			{"R1", "C6"},
 		})
 
-		tr := c.QueryGRPC(t, indexName, "Row(f1=R1, from='2022-01-10', to='2022-01-13')")
-		csvString, err := tableResponseToCSVString(tr)
-		if err != nil {
-			t.Fatalf("converting to CSV: %v", err)
-		}
-		expected := `
+		tests := []struct {
+			query    string
+			expected string
+		}{
+			{
+				query: "Row(f1=R1, from='2022-01-10', to='2022-01-13')",
+				expected: `
 _id
 C1
 C3
 C2
-`[1:]
-		// check that an unqualified query does use the standard view
-		if csvString != expected {
-			t.Fatalf("expected:\n%s\ngot:\n%s\n", expected, csvString)
-		}
-		tr = c.QueryGRPC(t, indexName, "Row(f1=R1)")
-		csvString, err = tableResponseToCSVString(tr)
-		if err != nil {
-			t.Fatalf("converting to CSV: %v", err)
-		}
-		expected = `
+`[1:],
+			},
+			{
+				query: "Row(f1=R1)",
+				expected: `
 _id
 C1
 C3
@@ -1120,9 +1115,24 @@ C2
 C5
 C4
 C6
-`[1:]
-		if csvString != expected {
-			t.Fatalf("expected:\n%s\ngot:\n%s\n", expected, csvString)
+`[1:],
+			},
+			{
+				query:    "Row(f1=R1, to='2022-01-09')",
+				expected: "\n",
+			},
+		}
+
+		for i, tst := range tests {
+			tr := c.QueryGRPC(t, indexName, tst.query)
+			csvString, err := tableResponseToCSVString(tr)
+			if err != nil {
+				t.Fatalf("test: %d, converting to CSV: %v", i, err)
+			}
+			// check that an unqualified query does use the standard view
+			if csvString != tst.expected {
+				t.Fatalf("%d expected:\n'%s'\ngot:\n'%s'\n", i, tst.expected, csvString)
+			}
 		}
 	})
 }
diff --git a/field_internal_test.go b/field_internal_test.go
index 04c996129..1d775e702 100644
--- a/field_internal_test.go
+++ b/field_internal_test.go
@@ -940,6 +940,7 @@ func TestFieldViewsByTimeRange(t *testing.T) {
 		{"2021-01-01T00:00", "2022-01-01T00:00", []string{"standard_2021"}},
 		{"2021-01-01T00:00", "2022-01-02T00:00", []string{"standard_2021", "standard_20220101"}},
 		{"", "2022-01-02T00:00", []string{"standard_2021", "standard_20220101"}},
+		{"", "2020-01-02T00:00", []string{}},
 		{"2021-12-01T00:00", "", []string{"standard_202112", "standard_2022"}},
 		{"2021-12-30T00:00", "2022-02-01T00:00", []string{"standard_20211230", "standard_20211231", "standard_202201"}},
 	}