diff --git a/jest.config.js b/jest.config.js
index eae6a94..0a5ba27 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -110,7 +110,7 @@ const config = {
   // reporters: undefined,
 
   // Automatically reset mock state before every test
-  // resetMocks: false,
+  resetMocks: true,
 
   // Reset the module registry before running each individual test
   // resetModules: false,
@@ -119,7 +119,7 @@ const config = {
   // resolver: undefined,
 
   // Automatically restore mock state and implementation before every test
-  // restoreMocks: false,
+  restoreMocks: true,
 
   // The root directory that Jest should scan for tests and modules within
   // rootDir: undefined,
diff --git a/test/loaders/TimedApiBasedRepositoryLoaderTests.test.ts b/test/loaders/TimedApiBasedRepositoryLoaderTests.test.ts
index c3dc0c4..e87556f 100644
--- a/test/loaders/TimedApiBasedRepositoryLoaderTests.test.ts
+++ b/test/loaders/TimedApiBasedRepositoryLoaderTests.test.ts
@@ -8,12 +8,9 @@ describe("TimedApiBasedRepositoryLoader", () => {
   let timedLoader: TimedApiBasedRepositoryLoader;
   let spies: any;
 
-  beforeAll(() => {
+  beforeEach(() => {
     jest.useFakeTimers();
     jest.spyOn(global, "setTimeout");
-  });
-
-  beforeEach(() => {
     resetGlobalFetchMockJson();
 
     const mockLoader = new ApiBasedShuttleRepositoryLoader(