diff --git a/src/notifications/schedulers/__tests__/ETANotificationSchedulerTests.test.ts b/src/notifications/schedulers/__tests__/ETANotificationSchedulerTests.test.ts
index e79f4a0..9c3ae89 100644
--- a/src/notifications/schedulers/__tests__/ETANotificationSchedulerTests.test.ts
+++ b/src/notifications/schedulers/__tests__/ETANotificationSchedulerTests.test.ts
@@ -84,7 +84,7 @@ describe("ETANotificationScheduler", () => {
       // Act
       await notificationRepository.addOrUpdateNotification(notificationData1);
       await notificationRepository.addOrUpdateNotification(notificationData2);
-      await shuttleRepository.addOrUpdateEtaFromExternalSource(eta);
+      await etaRepository.addOrUpdateEtaFromExternalSource(eta);
 
       // Assert
       // Wait for the callback to actually be called
@@ -107,7 +107,7 @@ describe("ETANotificationScheduler", () => {
 
       // Act
       await notificationRepository.addOrUpdateNotification(notificationData1);
-      await shuttleRepository.addOrUpdateEtaFromExternalSource(eta);
+      await etaRepository.addOrUpdateEtaFromExternalSource(eta);
 
       // Assert
       await waitForMilliseconds(500);
@@ -141,7 +141,7 @@ describe("ETANotificationScheduler", () => {
 
       // Act
       await notificationRepository.addOrUpdateNotification(notificationData1);
-      await shuttleRepository.addOrUpdateEtaFromExternalSource(eta);
+      await etaRepository.addOrUpdateEtaFromExternalSource(eta);
 
       // Assert
       // The notification should stay scheduled to be retried once
diff --git a/src/resolvers/__tests__/ShuttleResolverTests.test.ts b/src/resolvers/__tests__/ShuttleResolverTests.test.ts
index ab45245..ed827a4 100644
--- a/src/resolvers/__tests__/ShuttleResolverTests.test.ts
+++ b/src/resolvers/__tests__/ShuttleResolverTests.test.ts
@@ -3,8 +3,9 @@ import { generateMockEtas, generateMockRoutes } from "../../../testHelpers/mockD
 import { IShuttle } from "../../entities/ShuttleRepositoryEntities";
 import { setupTestServerContext, setupTestServerHolder } from "../../../testHelpers/apolloTestServerHelpers";
 import { addMockShuttleToRepository } from "../../../testHelpers/repositorySetupHelpers";
-import assert = require("node:assert");
 import { InterchangeSystem } from "../../entities/InterchangeSystem";
+import { ExternalSourceETARepository } from "../../repositories/shuttle/eta/ExternalSourceETARepository";
+import assert from "node:assert";
 
 
 describe("ShuttleResolvers", () => {
@@ -25,7 +26,7 @@ describe("ShuttleResolvers", () => {
     const etas = generateMockEtas();
     await Promise.all(etas.map(async (eta) => {
       eta.shuttleId = shuttleId;
-      await context.systems[0].shuttleRepository.addOrUpdateEtaFromExternalSource(eta);
+      await (context.systems[0].etaRepository as ExternalSourceETARepository).addOrUpdateEtaFromExternalSource(eta);
     }));
     return etas;
   }
@@ -146,9 +147,9 @@ describe("ShuttleResolvers", () => {
       const e1 = { ...generateMockEtas()[0], shuttleId: mockShuttle.id, stopId: "stA", secondsRemaining: 300 };
       const e2 = { ...generateMockEtas()[0], shuttleId: mockShuttle.id, stopId: "stB", secondsRemaining: 30 };
       const e3 = { ...generateMockEtas()[0], shuttleId: mockShuttle.id, stopId: "stC", secondsRemaining: 120 };
-      await context.systems[0].shuttleRepository.addOrUpdateEtaFromExternalSource(e1);
-      await context.systems[0].shuttleRepository.addOrUpdateEtaFromExternalSource(e2);
-      await context.systems[0].shuttleRepository.addOrUpdateEtaFromExternalSource(e3);
+      await (context.systems[0].etaRepository as ExternalSourceETARepository).addOrUpdateEtaFromExternalSource(e1);
+      await (context.systems[0].etaRepository as ExternalSourceETARepository).addOrUpdateEtaFromExternalSource(e2);
+      await (context.systems[0].etaRepository as ExternalSourceETARepository).addOrUpdateEtaFromExternalSource(e3);
 
       const response = await holder.testServer.executeOperation({
         query,
diff --git a/src/resolvers/__tests__/StopResolverTests.test.ts b/src/resolvers/__tests__/StopResolverTests.test.ts
index d214dfb..615a9c1 100644
--- a/src/resolvers/__tests__/StopResolverTests.test.ts
+++ b/src/resolvers/__tests__/StopResolverTests.test.ts
@@ -6,7 +6,8 @@ import {
 import { generateMockEtas, generateMockOrderedStops } from "../../../testHelpers/mockDataGenerators";
 import { IStop } from "../../entities/ShuttleRepositoryEntities";
 import { addMockStopToRepository } from "../../../testHelpers/repositorySetupHelpers";
-import assert = require("node:assert");
+import { ExternalSourceETARepository } from "../../repositories/shuttle/eta/ExternalSourceETARepository";
+import assert from "node:assert";
 
 describe("StopResolvers", () => {
   const holder = setupTestServerHolder();
@@ -106,7 +107,7 @@ describe("StopResolvers", () => {
       mockEtas = mockEtas.filter((eta) => eta.stopId === mockEtas[0].stopId);
       await Promise.all(mockEtas.map(async eta => {
         eta.stopId = mockStop.id;
-        await context.systems[0].shuttleRepository.addOrUpdateEtaFromExternalSource(eta);
+        await (context.systems[0].etaRepository as ExternalSourceETARepository).addOrUpdateEtaFromExternalSource(eta);
       }));
 
       const response = await getResponseForQuery(query);
@@ -128,9 +129,9 @@ describe("StopResolvers", () => {
       const e1 = { ...generateMockEtas()[0], stopId: mockStop.id, shuttleId: "shA", secondsRemaining: 240 };
       const e2 = { ...generateMockEtas()[0], stopId: mockStop.id, shuttleId: "shB", secondsRemaining: 60 };
       const e3 = { ...generateMockEtas()[0], stopId: mockStop.id, shuttleId: "shC", secondsRemaining: 120 };
-      await context.systems[0].shuttleRepository.addOrUpdateEtaFromExternalSource(e1);
-      await context.systems[0].shuttleRepository.addOrUpdateEtaFromExternalSource(e2);
-      await context.systems[0].shuttleRepository.addOrUpdateEtaFromExternalSource(e3);
+      await (context.systems[0].etaRepository as ExternalSourceETARepository).addOrUpdateEtaFromExternalSource(e1);
+      await (context.systems[0].etaRepository as ExternalSourceETARepository).addOrUpdateEtaFromExternalSource(e2);
+      await (context.systems[0].etaRepository as ExternalSourceETARepository).addOrUpdateEtaFromExternalSource(e3);
 
       const response = await getResponseForQuery(query);