diff --git a/test/edge_test/EdgeFactory_test.py b/test/edge_test/EdgeFactory_test.py
index 7f92b7ecc2abf0a3b07d92525157bcb4875dff97..52a4f662f5fbb21aa483ffe34b8819e2d55cb6ce 100644
--- a/test/edge_test/EdgeFactory_test.py
+++ b/test/edge_test/EdgeFactory_test.py
@@ -34,7 +34,11 @@ def test_get_timeseries():
         "variation",
         "Expect timeseries stats data_type to be equal to variation",
     )
-    # timeseries requested with location code as type
+
+
+def test_get_timeseries_by_location():
+    """test.edge_test.EdgeFactory_test.test_get_timeseries_by_location()"""
+    edge_factory = EdgeFactory(host="TODO", port="TODO")
     timeseries = edge_factory.get_timeseries(
         UTCDateTime(2015, 3, 1, 0, 0, 0),
         UTCDateTime(2015, 3, 1, 1, 0, 0),
@@ -44,19 +48,48 @@ def test_get_timeseries():
         "minute",
     )
     assert_equal(
-        timeseries.select(channel="H")[0].stats.station,
+        timeseries.select(channel="H")[0].stats.data_type,
+        "R0",
+        "Expect timeseries stats data_type to be equal to R0",
+    )
+    timeseries = edge_factory.get_timeseries(
+        UTCDateTime(2015, 3, 1, 0, 0, 0),
+        UTCDateTime(2015, 3, 1, 1, 0, 0),
         "BOU",
-        "Expect timeseries to have stats",
+        ("H"),
+        "A0",
+        "minute",
     )
     assert_equal(
-        timeseries.select(channel="H")[0].stats.channel,
-        "H",
-        "Expect timeseries stats channel to be equal to H",
+        timeseries.select(channel="H")[0].stats.data_type,
+        "A0",
+        "Expect timeseries stats data_type to be equal to A0",
+    )
+    timeseries = edge_factory.get_timeseries(
+        UTCDateTime(2015, 3, 1, 0, 0, 0),
+        UTCDateTime(2015, 3, 1, 1, 0, 0),
+        "BOU",
+        ("X"),
+        "Q0",
+        "minute",
     )
     assert_equal(
-        timeseries.select(channel="H")[0].stats.data_type,
-        "variation",
-        "Expect timeseries stats data_type to be equal to variation",
+        timeseries.select(channel="X")[0].stats.data_type,
+        "Q0",
+        "Expect timeseries stats data_type to be equal to Q0",
+    )
+    timeseries = edge_factory.get_timeseries(
+        UTCDateTime(2015, 3, 1, 0, 0, 0),
+        UTCDateTime(2015, 3, 1, 1, 0, 0),
+        "BOU",
+        ("X"),
+        "D0",
+        "minute",
+    )
+    assert_equal(
+        timeseries.select(channel="X")[0].stats.data_type,
+        "D0",
+        "Expect timeseries stats data_type to be equal to D0",
     )
 
 
diff --git a/test/edge_test/MiniSeedFactory_test.py b/test/edge_test/MiniSeedFactory_test.py
index ed3901904e0883498b12196070cfef3122ab3308..00a96a5098e2a8685d754c1abac7a4ea85744b13 100644
--- a/test/edge_test/MiniSeedFactory_test.py
+++ b/test/edge_test/MiniSeedFactory_test.py
@@ -116,7 +116,13 @@ def test_get_timeseries(MockMiniSeedClient):
         "variation",
         "Expect timeseries stats data_type to be equal to variation",
     )
-    # timeseries requested with location code as type
+
+
+def test_get_timeseries_by_location(MockMiniSeedClient):
+    """test.edge_test.MiniSeedFactory_test.test_get_timeseries_by_location()"""
+    miniseed_factory = MiniSeedFactory()
+    miniseed_factory.client = MockMiniSeedClient()
+
     timeseries = miniseed_factory.get_timeseries(
         UTCDateTime(2015, 3, 1, 0, 0, 0),
         UTCDateTime(2015, 3, 1, 1, 0, 0),
@@ -126,19 +132,48 @@ def test_get_timeseries(MockMiniSeedClient):
         "minute",
     )
     assert_equal(
-        timeseries.select(channel="H")[0].stats.station,
+        timeseries.select(channel="H")[0].stats.data_type,
+        "R0",
+        "Expect timeseries stats data_type to be equal to R0",
+    )
+    timeseries = miniseed_factory.get_timeseries(
+        UTCDateTime(2015, 3, 1, 0, 0, 0),
+        UTCDateTime(2015, 3, 1, 1, 0, 0),
         "BOU",
-        "Expect timeseries to have stats",
+        ("H"),
+        "A0",
+        "minute",
     )
     assert_equal(
-        timeseries.select(channel="H")[0].stats.channel,
-        "H",
-        "Expect timeseries stats channel to be equal to H",
+        timeseries.select(channel="H")[0].stats.data_type,
+        "A0",
+        "Expect timeseries stats data_type to be equal to A0",
+    )
+    timeseries = miniseed_factory.get_timeseries(
+        UTCDateTime(2015, 3, 1, 0, 0, 0),
+        UTCDateTime(2015, 3, 1, 1, 0, 0),
+        "BOU",
+        ("X"),
+        "Q0",
+        "minute",
     )
     assert_equal(
-        timeseries.select(channel="H")[0].stats.data_type,
-        "variation",
-        "Expect timeseries stats data_type to be equal to variation",
+        timeseries.select(channel="X")[0].stats.data_type,
+        "Q0",
+        "Expect timeseries stats data_type to be equal to Q0",
+    )
+    timeseries = miniseed_factory.get_timeseries(
+        UTCDateTime(2015, 3, 1, 0, 0, 0),
+        UTCDateTime(2015, 3, 1, 1, 0, 0),
+        "BOU",
+        ("X"),
+        "D0",
+        "minute",
+    )
+    assert_equal(
+        timeseries.select(channel="X")[0].stats.data_type,
+        "D0",
+        "Expect timeseries stats data_type to be equal to D0",
     )