diff --git a/test/repositories/ApiBasedRepositoryTests.test.ts b/test/repositories/ApiBasedRepositoryTests.test.ts
index 9d5704b..699c17d 100644
--- a/test/repositories/ApiBasedRepositoryTests.test.ts
+++ b/test/repositories/ApiBasedRepositoryTests.test.ts
@@ -33,116 +33,118 @@ beforeEach(() => {
 
 // Snapshots taken from the Passio GO! API
 const genericEtaDataByStopId = {
-  "177666": [
-    {
-      "OOS": 0,
-      "busName": "08",
-      "distance": 1,
-      "speed": 10.028535400123669,
-      "routeBlockId": "142270",
-      "actualRouteBlockId": "142270",
-      "arrived": null,
-      "eta": "10 min ",
-      "color": "#000000",
-      "bg": "#ffea3f",
-      "order": 0,
-      "dwell": null,
-      "stopsAmount": 2,
-      "secondsSpent": 587,
-      "etaR": "10",
-      "error": null,
-      "outdated": 0,
-      "routeId": "53966",
-      "serviceTime": "",
-      "scheduleTimes": [],
-      "goShowSchedule": 0,
-      "looping": "1",
-      "routeGroupId": "6703",
-      "busId": 5577,
-      "tripId": 751430,
-      "deviceId": 402840,
-      "created": "2025-01-07 15:00:09",
-      "routePointPosition": 6,
-      "routeStopPosition": 1,
-      "stopRoutePointPosition": 217,
-      "timezoneOffset": -10800,
-      "busLatLng": [
-        33.7933406,
-        -117.8539321
-      ],
-      "busProjectionLatlng": {
-        "lat": 33.79331052666975,
-        "lng": -117.85392945849208
-      },
-      "busProjectionError": 3,
-      "stopId": "177666",
-      "theStop": {
-        "name": "Chapman Court",
-        "position": 3,
-        "userId": "263",
-        "routeStopId": "1348785",
+  "ETAs": {
+    "177666": [
+      {
+        "OOS": 0,
+        "busName": "08",
+        "distance": 1,
+        "speed": 10.028535400123669,
+        "routeBlockId": "142270",
+        "actualRouteBlockId": "142270",
+        "arrived": null,
+        "eta": "10 min ",
+        "color": "#000000",
+        "bg": "#ffea3f",
+        "order": 0,
+        "dwell": null,
+        "stopsAmount": 2,
+        "secondsSpent": 587,
+        "etaR": "10",
+        "error": null,
+        "outdated": 0,
+        "routeId": "53966",
+        "serviceTime": "",
+        "scheduleTimes": [],
+        "goShowSchedule": 0,
+        "looping": "1",
+        "routeGroupId": "6703",
         "busId": 5577,
-        "routeName": "Red Route",
-        "shortName": null,
-        "routeId": "53966",
-        "stopId": "177666"
-      }
-    },
-    {
-      "OOS": 0,
-      "busName": "07",
-      "distance": 1,
-      "speed": 12.160256921380398,
-      "routeBlockId": "142270",
-      "actualRouteBlockId": "142270",
-      "arrived": null,
-      "eta": "11 min ",
-      "color": "#000000",
-      "bg": "#ffea3f",
-      "order": 0,
-      "dwell": null,
-      "stopsAmount": 2,
-      "secondsSpent": 635,
-      "etaR": "11",
-      "error": null,
-      "outdated": 0,
-      "routeId": "53966",
-      "serviceTime": "",
-      "scheduleTimes": [],
-      "goShowSchedule": 0,
-      "looping": "1",
-      "routeGroupId": "6703",
-      "busId": 5576,
-      "tripId": 751430,
-      "deviceId": 441065,
-      "created": "2025-01-07 15:00:10",
-      "routePointPosition": 448,
-      "routeStopPosition": 4,
-      "stopRoutePointPosition": 217,
-      "timezoneOffset": -10800,
-      "busLatLng": [
-        33.7933284,
-        -117.855132
-      ],
-      "busProjectionLatlng": {
-        "lat": 33.79332033922653,
-        "lng": -117.85513217762522
+        "tripId": 751430,
+        "deviceId": 402840,
+        "created": "2025-01-07 15:00:09",
+        "routePointPosition": 6,
+        "routeStopPosition": 1,
+        "stopRoutePointPosition": 217,
+        "timezoneOffset": -10800,
+        "busLatLng": [
+          33.7933406,
+          -117.8539321
+        ],
+        "busProjectionLatlng": {
+          "lat": 33.79331052666975,
+          "lng": -117.85392945849208
+        },
+        "busProjectionError": 3,
+        "stopId": "177666",
+        "theStop": {
+          "name": "Chapman Court",
+          "position": 3,
+          "userId": "263",
+          "routeStopId": "1348785",
+          "busId": 5577,
+          "routeName": "Red Route",
+          "shortName": null,
+          "routeId": "53966",
+          "stopId": "177666"
+        }
       },
-      "busProjectionError": 1,
-      "stopId": "177666",
-      "theStop": {
-        "name": "Chapman Court",
-        "position": 3,
-        "userId": "263",
-        "routeStopId": "1348785",
-        "busId": 5576,
-        "routeName": "Red Route",
-        "shortName": null,
+      {
+        "OOS": 0,
+        "busName": "07",
+        "distance": 1,
+        "speed": 12.160256921380398,
+        "routeBlockId": "142270",
+        "actualRouteBlockId": "142270",
+        "arrived": null,
+        "eta": "11 min ",
+        "color": "#000000",
+        "bg": "#ffea3f",
+        "order": 0,
+        "dwell": null,
+        "stopsAmount": 2,
+        "secondsSpent": 635,
+        "etaR": "11",
+        "error": null,
+        "outdated": 0,
         "routeId": "53966",
-        "stopId": "177666"
-      }
-    },
-  ]
+        "serviceTime": "",
+        "scheduleTimes": [],
+        "goShowSchedule": 0,
+        "looping": "1",
+        "routeGroupId": "6703",
+        "busId": 5576,
+        "tripId": 751430,
+        "deviceId": 441065,
+        "created": "2025-01-07 15:00:10",
+        "routePointPosition": 448,
+        "routeStopPosition": 4,
+        "stopRoutePointPosition": 217,
+        "timezoneOffset": -10800,
+        "busLatLng": [
+          33.7933284,
+          -117.855132
+        ],
+        "busProjectionLatlng": {
+          "lat": 33.79332033922653,
+          "lng": -117.85513217762522
+        },
+        "busProjectionError": 1,
+        "stopId": "177666",
+        "theStop": {
+          "name": "Chapman Court",
+          "position": 3,
+          "userId": "263",
+          "routeStopId": "1348785",
+          "busId": 5576,
+          "routeName": "Red Route",
+          "shortName": null,
+          "routeId": "53966",
+          "stopId": "177666"
+        }
+      },
+    ]
+  },
 }
 const genericShuttleDataBySystemId = {
   "alertCRC": "23c1b91c",
@@ -302,9 +304,6 @@ describe("getEtaForShuttleAndStopId", () => {
 
 describe("getEtasForShuttleId", () => {
   test("getEtasForShuttleId returns correct ETA data", async () => {
-    // Because I'm testing updateEtasForSystemIfTTL separately,
-    // stub it out here
-
     updateGlobalFetchMockJson(genericEtaDataByStopId);
 
     const initialCache: ApiBasedRepositoryCache = {