diff --git a/public/locales/en/translation.json b/public/locales/en/translation.json
index 98ac6e39d1..373dda5f8f 100644
--- a/public/locales/en/translation.json
+++ b/public/locales/en/translation.json
@@ -121,7 +121,8 @@
     "banners": {
       "title": "Banners",
       "loginBanner": "Login Banner",
-      "announcementBanner": "Announcement Banner"
+      "announcementBanner": "Announcement Banner",
+      "bannerCloseButton": "Close banner"
     }
   },
   "userSettings": {
diff --git a/src/components/AnnouncementBanner/AnnouncementBanner.tsx b/src/components/AnnouncementBanner/index.tsx
similarity index 80%
rename from src/components/AnnouncementBanner/AnnouncementBanner.tsx
rename to src/components/AnnouncementBanner/index.tsx
index 769199275c..495ddc2c9f 100644
--- a/src/components/AnnouncementBanner/AnnouncementBanner.tsx
+++ b/src/components/AnnouncementBanner/index.tsx
@@ -8,6 +8,7 @@ import {
   useEffect,
   useState,
 } from "react";
+import { useTranslation } from "react-i18next";
 
 import { BannerType } from "api/models";
 import { getBannerText } from "backend";
@@ -18,10 +19,20 @@ import { type StoreState } from "rootRedux/types";
 import { Path } from "types/path";
 import theme, { themeColors } from "types/theme";
 
+enum AnnouncementBannerId {
+  ButtonClose = "announcement-banner-close-button",
+}
+
+export enum AnnouncementBannerTextId {
+  ButtonClose = "siteSettings.banners.bannerCloseButton",
+}
+
 export default function AnnouncementBanner(): ReactElement {
   const [banner, setBanner] = useState<string>("");
   const [margins, setMargins] = useState<CSSProperties>({});
 
+  const { t } = useTranslation();
+
   // Adjust the margins depending on whether there is an AppBar.
   const loc = useAppSelector(
     (state: StoreState) => state.analyticsState.currentPage
@@ -48,7 +59,12 @@ export default function AnnouncementBanner(): ReactElement {
 
   return banner ? (
     <Toolbar style={{ ...margins, backgroundColor: themeColors.warning }}>
-      <IconButton onClick={closeBanner} size="large">
+      <IconButton
+        aria-label={t(AnnouncementBannerTextId.ButtonClose)}
+        id={AnnouncementBannerId.ButtonClose}
+        onClick={closeBanner}
+        size="large"
+      >
         <Cancel />
       </IconButton>
       <Box sx={{ width: theme.spacing(2) }} />
diff --git a/src/components/AnnouncementBanner/tests/index.test.tsx b/src/components/AnnouncementBanner/tests/index.test.tsx
new file mode 100644
index 0000000000..dab689f225
--- /dev/null
+++ b/src/components/AnnouncementBanner/tests/index.test.tsx
@@ -0,0 +1,73 @@
+import { render, screen } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import { act } from "react";
+import { Provider } from "react-redux";
+import createMockStore from "redux-mock-store";
+
+import AnnouncementBanner, {
+  AnnouncementBannerTextId,
+} from "components/AnnouncementBanner";
+import { defaultState } from "rootRedux/types";
+
+jest.mock("backend", () => ({
+  getBannerText: () => mockGetBannerText(),
+}));
+
+const mockBannerText = "I'm a banner!";
+const mockGetBannerText = jest.fn();
+const mockStore = createMockStore()(defaultState);
+
+const renderAnnouncementBanner = async (bannerText?: string): Promise<void> => {
+  mockGetBannerText.mockResolvedValue(bannerText ?? "");
+  await act(async () => {
+    render(
+      <Provider store={mockStore}>
+        <AnnouncementBanner />
+      </Provider>
+    );
+  });
+};
+
+beforeEach(() => {
+  jest.clearAllMocks();
+});
+
+describe("AnnouncementBanner", () => {
+  it("doesn't load if no banner text", async () => {
+    await renderAnnouncementBanner();
+
+    // Confirm no banner by the absence of its close button
+    expect(
+      screen.queryByLabelText(AnnouncementBannerTextId.ButtonClose)
+    ).toBeNull();
+  });
+
+  it("loads banner with text", async () => {
+    await renderAnnouncementBanner(mockBannerText);
+
+    // Confirm open banner by the presence of its close button and text
+    expect(
+      screen.queryByLabelText(AnnouncementBannerTextId.ButtonClose)
+    ).not.toBeNull();
+    expect(screen.queryByText(mockBannerText)).not.toBeNull();
+  });
+
+  it("closes when button is clicked", async () => {
+    // Setup
+    const agent = userEvent.setup();
+    await renderAnnouncementBanner(mockBannerText);
+    expect(screen.queryByText(mockBannerText)).not.toBeNull();
+
+    // Click close button
+    const closeButton = screen.getByLabelText(
+      AnnouncementBannerTextId.ButtonClose
+    );
+    await agent.click(closeButton);
+
+    // Confirm closed
+    expect(
+      screen.queryByLabelText(AnnouncementBannerTextId.ButtonClose)
+    ).toBeNull();
+    expect(screen.queryByText(mockBannerText)).toBeNull();
+  });
+});
diff --git a/src/components/App/DefaultState.ts b/src/components/App/DefaultState.ts
deleted file mode 100644
index e872be5aed..0000000000
--- a/src/components/App/DefaultState.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { defaultState as loginState } from "components/Login/Redux/LoginReduxTypes";
-import { defaultState as currentProjectState } from "components/Project/ProjectReduxTypes";
-import { defaultState as exportProjectState } from "components/ProjectExport/Redux/ExportProjectReduxTypes";
-import { defaultState as pronunciationsState } from "components/Pronunciations/Redux/PronunciationsReduxTypes";
-import { defaultState as treeViewState } from "components/TreeView/Redux/TreeViewReduxTypes";
-import { defaultState as characterInventoryState } from "goals/CharacterInventory/Redux/CharacterInventoryReduxTypes";
-import { defaultState as mergeDuplicateGoal } from "goals/MergeDuplicates/Redux/MergeDupsReduxTypes";
-import { defaultState as goalsState } from "goals/Redux/GoalReduxTypes";
-import { defaultState as analyticsState } from "types/Redux/analyticsReduxTypes";
-
-export const defaultState = {
-  //login and signup
-  loginState: { ...loginState },
-
-  //project
-  currentProjectState: { ...currentProjectState },
-  exportProjectState: { ...exportProjectState },
-
-  //data entry and review entries goal
-  treeViewState: { ...treeViewState },
-  pronunciationsState: { ...pronunciationsState },
-
-  //goal timeline and current goal
-  goalsState: { ...goalsState },
-
-  //merge duplicates goal and review deferred duplicates goal
-  mergeDuplicateGoal: { ...mergeDuplicateGoal },
-
-  //character inventory goal
-  characterInventoryState: { ...characterInventoryState },
-
-  //analytics state
-  analyticsState: { ...analyticsState },
-};
diff --git a/src/components/App/component.tsx b/src/components/App/index.tsx
similarity index 86%
rename from src/components/App/component.tsx
rename to src/components/App/index.tsx
index 12c2152216..d66ae6d3d1 100644
--- a/src/components/App/component.tsx
+++ b/src/components/App/index.tsx
@@ -1,7 +1,7 @@
 import { ReactElement, Suspense } from "react";
 import { RouterProvider } from "react-router-dom";
 
-import AnnouncementBanner from "components/AnnouncementBanner/AnnouncementBanner";
+import AnnouncementBanner from "components/AnnouncementBanner";
 import UpperRightToastContainer from "components/Toast/UpperRightToastContainer";
 import router from "router/browserRouter";
 
diff --git a/src/components/App/App.test.tsx b/src/components/App/tests/index.test.tsx
similarity index 72%
rename from src/components/App/App.test.tsx
rename to src/components/App/tests/index.test.tsx
index 52b24c6cca..de656201c8 100644
--- a/src/components/App/App.test.tsx
+++ b/src/components/App/tests/index.test.tsx
@@ -1,16 +1,15 @@
+import { render } from "@testing-library/react";
 import "jest-canvas-mock";
+import { act } from "react";
 import { Provider } from "react-redux";
-import { act, create } from "react-test-renderer";
 import configureMockStore from "redux-mock-store";
 import thunk from "redux-thunk";
 
-import { defaultState } from "components/App/DefaultState";
-import App from "components/App/component";
+import App from "components/App";
+import { defaultState } from "rootRedux/types";
 
 jest.mock("react-router-dom");
 
-jest.mock("components/AnnouncementBanner/AnnouncementBanner", () => "div");
-
 const createMockStore = configureMockStore([thunk]);
 const mockStore = createMockStore(defaultState);
 
@@ -22,7 +21,7 @@ global.analytics = { track: jest.fn() } as any;
 describe("App", () => {
   it("renders without crashing", async () => {
     await act(async () => {
-      create(
+      render(
         <Provider store={mockStore}>
           <App />
         </Provider>
diff --git a/src/components/AppBar/tests/AppBarComponent.test.tsx b/src/components/AppBar/tests/AppBarComponent.test.tsx
index 6c100b69e6..a3c78dee6e 100644
--- a/src/components/AppBar/tests/AppBarComponent.test.tsx
+++ b/src/components/AppBar/tests/AppBarComponent.test.tsx
@@ -3,8 +3,8 @@ import { MemoryRouter } from "react-router-dom";
 import { act, create } from "react-test-renderer";
 import configureMockStore from "redux-mock-store";
 
-import { defaultState } from "components/App/DefaultState";
 import AppBar from "components/AppBar/AppBarComponent";
+import { defaultState } from "rootRedux/types";
 
 jest.mock("backend", () => ({
   isSiteAdmin: () => mockIsSiteAdmin(),
diff --git a/src/components/DataEntry/DataEntryTable/tests/RecentEntry.test.tsx b/src/components/DataEntry/DataEntryTable/tests/RecentEntry.test.tsx
index 1732ba67b3..c125693b58 100644
--- a/src/components/DataEntry/DataEntryTable/tests/RecentEntry.test.tsx
+++ b/src/components/DataEntry/DataEntryTable/tests/RecentEntry.test.tsx
@@ -9,7 +9,6 @@ import {
 import configureMockStore from "redux-mock-store";
 
 import { Word } from "api/models";
-import { defaultState } from "components/App/DefaultState";
 import { NoteButton } from "components/Buttons";
 import {
   DeleteEntry,
@@ -21,6 +20,7 @@ import { EditTextDialog } from "components/Dialogs";
 import AudioPlayer from "components/Pronunciations/AudioPlayer";
 import AudioRecorder from "components/Pronunciations/AudioRecorder";
 import PronunciationsBackend from "components/Pronunciations/PronunciationsBackend";
+import { defaultState } from "rootRedux/types";
 import theme from "types/theme";
 import { newPronunciation, simpleWord } from "types/word";
 import { newWritingSystem } from "types/writingSystem";
diff --git a/src/components/DataEntry/DataEntryTable/tests/index.test.tsx b/src/components/DataEntry/DataEntryTable/tests/index.test.tsx
index d3ef2c6e59..030ffb887e 100644
--- a/src/components/DataEntry/DataEntryTable/tests/index.test.tsx
+++ b/src/components/DataEntry/DataEntryTable/tests/index.test.tsx
@@ -9,7 +9,6 @@ import {
 import configureMockStore from "redux-mock-store";
 
 import { Gloss, SemanticDomain, Sense, Word } from "api/models";
-import { defaultState } from "components/App/DefaultState";
 import DataEntryTable, {
   WordAccess,
   addSemanticDomainToSense,
@@ -20,6 +19,7 @@ import DataEntryTable, {
   updateEntryGloss,
 } from "components/DataEntry/DataEntryTable";
 import NewEntry from "components/DataEntry/DataEntryTable/NewEntry";
+import { defaultState } from "rootRedux/types";
 import { newProject } from "types/project";
 import {
   newSemanticDomain,
diff --git a/src/components/Project/tests/ProjectActions.test.tsx b/src/components/Project/tests/ProjectActions.test.tsx
index 0890475e08..b321627221 100644
--- a/src/components/Project/tests/ProjectActions.test.tsx
+++ b/src/components/Project/tests/ProjectActions.test.tsx
@@ -1,7 +1,4 @@
-import { type PreloadedState } from "redux";
-
 import { type Project, type Speaker } from "api/models";
-import { defaultState } from "components/App/DefaultState";
 import {
   asyncRefreshProjectUsers,
   asyncSetNewCurrentProject,
@@ -9,7 +6,8 @@ import {
   clearCurrentProject,
 } from "components/Project/ProjectActions";
 import { defaultState as currentProjectState } from "components/Project/ProjectReduxTypes";
-import { type RootState, setupStore } from "rootRedux/store";
+import { setupStore } from "rootRedux/store";
+import { persistedDefaultState } from "rootRedux/testTypes";
 import { newProject } from "types/project";
 import { newUser } from "types/user";
 
@@ -26,12 +24,6 @@ const mockGetAllSemDomNames = jest.fn();
 const mockUpdateProject = jest.fn();
 const mockProjId = "project-id";
 
-// Preloaded values for store when testing
-const persistedDefaultState: PreloadedState<RootState> = {
-  ...defaultState,
-  _persist: { version: 1, rehydrated: false },
-};
-
 beforeEach(() => {
   jest.resetAllMocks();
 });
diff --git a/src/components/ProjectExport/Redux/tests/ExportProjectActions.test.tsx b/src/components/ProjectExport/Redux/tests/ExportProjectActions.test.tsx
index 0e03482671..d664a23f6d 100644
--- a/src/components/ProjectExport/Redux/tests/ExportProjectActions.test.tsx
+++ b/src/components/ProjectExport/Redux/tests/ExportProjectActions.test.tsx
@@ -1,13 +1,11 @@
-import { PreloadedState } from "redux";
-
-import { defaultState } from "components/App/DefaultState";
 import {
   asyncDownloadExport,
   asyncExportProject,
   asyncResetExport,
 } from "components/ProjectExport/Redux/ExportProjectActions";
 import { ExportStatus } from "components/ProjectExport/Redux/ExportProjectReduxTypes";
-import { RootState, setupStore } from "rootRedux/store";
+import { setupStore } from "rootRedux/store";
+import { persistedDefaultState } from "rootRedux/testTypes";
 
 jest.mock("backend", () => ({
   deleteLift: jest.fn,
@@ -20,12 +18,6 @@ const mockDownloadList = jest.fn();
 const mockExportLift = jest.fn();
 const mockProjId = "project-id";
 
-// Preloaded values for store when testing
-const persistedDefaultState: PreloadedState<RootState> = {
-  ...defaultState,
-  _persist: { version: 1, rehydrated: false },
-};
-
 describe("ExportProjectActions", () => {
   describe("asyncDownloadExport", () => {
     it("correctly affects state on success", async () => {
diff --git a/src/components/Pronunciations/tests/AudioPlayer.test.tsx b/src/components/Pronunciations/tests/AudioPlayer.test.tsx
index acd768ebe3..d25bdb6d71 100644
--- a/src/components/Pronunciations/tests/AudioPlayer.test.tsx
+++ b/src/components/Pronunciations/tests/AudioPlayer.test.tsx
@@ -3,14 +3,13 @@ import { Provider } from "react-redux";
 import { type ReactTestRenderer, act, create } from "react-test-renderer";
 import configureMockStore from "redux-mock-store";
 
-import { defaultState } from "components/App/DefaultState";
 import AudioPlayer, {
   longPressDelay,
   playButtonId,
   playMenuId,
 } from "components/Pronunciations/AudioPlayer";
 import { PronunciationsStatus } from "components/Pronunciations/Redux/PronunciationsReduxTypes";
-import { type StoreState } from "rootRedux/types";
+import { type StoreState, defaultState } from "rootRedux/types";
 import { newPronunciation } from "types/word";
 
 // Mock out Menu to avoid issues with setting its anchor.
diff --git a/src/components/Pronunciations/tests/AudioRecorder.test.tsx b/src/components/Pronunciations/tests/AudioRecorder.test.tsx
index b9653d69fd..92b0394012 100644
--- a/src/components/Pronunciations/tests/AudioRecorder.test.tsx
+++ b/src/components/Pronunciations/tests/AudioRecorder.test.tsx
@@ -3,11 +3,10 @@ import { Provider } from "react-redux";
 import { ReactTestRenderer, act, create } from "react-test-renderer";
 import configureMockStore from "redux-mock-store";
 
-import { defaultState } from "components/App/DefaultState";
 import AudioRecorder from "components/Pronunciations/AudioRecorder";
 import { recordIconId } from "components/Pronunciations/RecorderIcon";
 import { PronunciationsStatus } from "components/Pronunciations/Redux/PronunciationsReduxTypes";
-import { type StoreState } from "rootRedux/types";
+import { type StoreState, defaultState } from "rootRedux/types";
 import theme, { themeColors } from "types/theme";
 
 let testRenderer: ReactTestRenderer;
diff --git a/src/components/Pronunciations/tests/PronunciationsBackend.test.tsx b/src/components/Pronunciations/tests/PronunciationsBackend.test.tsx
index 5b9460e2b2..e4e7d4ec0b 100644
--- a/src/components/Pronunciations/tests/PronunciationsBackend.test.tsx
+++ b/src/components/Pronunciations/tests/PronunciationsBackend.test.tsx
@@ -3,10 +3,10 @@ import { Provider } from "react-redux";
 import { ReactTestRenderer, act, create } from "react-test-renderer";
 import configureMockStore from "redux-mock-store";
 
-import { defaultState } from "components/App/DefaultState";
 import AudioPlayer from "components/Pronunciations/AudioPlayer";
 import AudioRecorder from "components/Pronunciations/AudioRecorder";
 import PronunciationsBackend from "components/Pronunciations/PronunciationsBackend";
+import { defaultState } from "rootRedux/types";
 import theme from "types/theme";
 import { newPronunciation } from "types/word";
 
diff --git a/src/components/Pronunciations/tests/PronunciationsFrontend.test.tsx b/src/components/Pronunciations/tests/PronunciationsFrontend.test.tsx
index e559277b85..97f04046ac 100644
--- a/src/components/Pronunciations/tests/PronunciationsFrontend.test.tsx
+++ b/src/components/Pronunciations/tests/PronunciationsFrontend.test.tsx
@@ -3,10 +3,10 @@ import { Provider } from "react-redux";
 import renderer from "react-test-renderer";
 import configureMockStore from "redux-mock-store";
 
-import { defaultState } from "components/App/DefaultState";
 import AudioPlayer from "components/Pronunciations/AudioPlayer";
 import AudioRecorder from "components/Pronunciations/AudioRecorder";
 import PronunciationsFrontend from "components/Pronunciations/PronunciationsFrontend";
+import { defaultState } from "rootRedux/types";
 import theme from "types/theme";
 import { newPronunciation } from "types/word";
 
diff --git a/src/components/Pronunciations/tests/RecorderIcon.test.tsx b/src/components/Pronunciations/tests/RecorderIcon.test.tsx
index 91d308c8ce..6fda104dac 100644
--- a/src/components/Pronunciations/tests/RecorderIcon.test.tsx
+++ b/src/components/Pronunciations/tests/RecorderIcon.test.tsx
@@ -8,12 +8,11 @@ import {
 } from "react-test-renderer";
 import configureMockStore from "redux-mock-store";
 
-import { defaultState } from "components/App/DefaultState";
 import RecorderIcon, {
   recordButtonId,
 } from "components/Pronunciations/RecorderIcon";
 import { PronunciationsStatus } from "components/Pronunciations/Redux/PronunciationsReduxTypes";
-import { type StoreState } from "rootRedux/types";
+import { type StoreState, defaultState } from "rootRedux/types";
 import theme from "types/theme";
 
 let testRenderer: ReactTestRenderer;
diff --git a/src/components/TreeView/Redux/tests/TreeViewActions.test.tsx b/src/components/TreeView/Redux/tests/TreeViewActions.test.tsx
index 63b2149978..051fa8b414 100644
--- a/src/components/TreeView/Redux/tests/TreeViewActions.test.tsx
+++ b/src/components/TreeView/Redux/tests/TreeViewActions.test.tsx
@@ -1,12 +1,10 @@
-import { PreloadedState } from "redux";
-
-import { defaultState } from "components/App/DefaultState";
 import {
   initTreeDomain,
   setDomainLanguage,
   traverseTree,
 } from "components/TreeView/Redux/TreeViewActions";
-import { RootState, setupStore } from "rootRedux/store";
+import { setupStore } from "rootRedux/store";
+import { persistedDefaultState } from "rootRedux/testTypes";
 import {
   newSemanticDomain,
   newSemanticDomainTreeNode,
@@ -27,12 +25,6 @@ global.analytics = { identify: jest.fn(), track: jest.fn() } as any;
 const mockId = "1.2.3";
 const mockLang = "lang";
 
-// Preloaded values for store when testing
-const persistedDefaultState: PreloadedState<RootState> = {
-  ...defaultState,
-  _persist: { version: 1, rehydrated: false },
-};
-
 describe("TreeViewActions", () => {
   describe("setDomainLanguage", () => {
     it("correctly affects state", async () => {
diff --git a/src/goals/CharacterInventory/Redux/tests/CharacterInventoryActions.test.tsx b/src/goals/CharacterInventory/Redux/tests/CharacterInventoryActions.test.tsx
index 9e59de3ea9..2baebb20a9 100644
--- a/src/goals/CharacterInventory/Redux/tests/CharacterInventoryActions.test.tsx
+++ b/src/goals/CharacterInventory/Redux/tests/CharacterInventoryActions.test.tsx
@@ -1,7 +1,6 @@
 import { type Action, type PreloadedState } from "redux";
 
 import { type Project, type Word } from "api/models";
-import { defaultState } from "components/App/DefaultState";
 import {
   type CharInvChanges,
   type CharacterChange,
@@ -23,6 +22,7 @@ import {
   type CharacterSetEntry,
 } from "goals/CharacterInventory/Redux/CharacterInventoryReduxTypes";
 import { type RootState, setupStore } from "rootRedux/store";
+import { persistedDefaultState } from "rootRedux/testTypes";
 import { newProject } from "types/project";
 import { newWord } from "types/word";
 
@@ -56,12 +56,6 @@ const setMockFunctions = (): void => {
   mockUpdateWord.mockImplementation((w: Word) => ({ ...w, id: bumpId(w.id) }));
 };
 
-// Preloaded values for store when testing
-const persistedDefaultState: PreloadedState<RootState> = {
-  ...defaultState,
-  _persist: { version: 1, rehydrated: false },
-};
-
 beforeEach(() => {
   jest.resetAllMocks();
   setMockFunctions();
diff --git a/src/goals/MergeDuplicates/MergeDupsStep/MergeDragDrop/tests/index.test.tsx b/src/goals/MergeDuplicates/MergeDupsStep/MergeDragDrop/tests/index.test.tsx
index 723156a92e..dc72809bb9 100644
--- a/src/goals/MergeDuplicates/MergeDupsStep/MergeDragDrop/tests/index.test.tsx
+++ b/src/goals/MergeDuplicates/MergeDupsStep/MergeDragDrop/tests/index.test.tsx
@@ -4,7 +4,6 @@ import { type ReactTestRenderer, act, create } from "react-test-renderer";
 import configureMockStore from "redux-mock-store";
 
 import { GramCatGroup, type Sense } from "api/models";
-import { defaultState } from "components/App/DefaultState";
 import MergeDragDrop from "goals/MergeDuplicates/MergeDupsStep/MergeDragDrop";
 import DragSense from "goals/MergeDuplicates/MergeDupsStep/MergeDragDrop/DragSense";
 import DropWord from "goals/MergeDuplicates/MergeDupsStep/MergeDragDrop/DropWord";
@@ -17,6 +16,7 @@ import {
   type MergeTreeState,
   defaultState as mergeState,
 } from "goals/MergeDuplicates/Redux/MergeDupsReduxTypes";
+import { defaultState } from "rootRedux/types";
 import { newSemanticDomain } from "types/semanticDomain";
 import {
   newDefinition,
diff --git a/src/goals/MergeDuplicates/Redux/tests/MergeDupsActions.test.tsx b/src/goals/MergeDuplicates/Redux/tests/MergeDupsActions.test.tsx
index 73c5cab2a1..25d0c2ee19 100644
--- a/src/goals/MergeDuplicates/Redux/tests/MergeDupsActions.test.tsx
+++ b/src/goals/MergeDuplicates/Redux/tests/MergeDupsActions.test.tsx
@@ -5,7 +5,6 @@ import {
   Status,
   type Word,
 } from "api/models";
-import { defaultState } from "components/App/DefaultState";
 import {
   type MergeData,
   type MergeTree,
@@ -26,6 +25,7 @@ import {
 } from "goals/MergeDuplicates/Redux/MergeDupsReduxTypes";
 import { goalDataMock } from "goals/MergeDuplicates/Redux/tests/MergeDupsDataMock";
 import { setupStore } from "rootRedux/store";
+import { persistedDefaultState } from "rootRedux/testTypes";
 import { GoalType } from "types/goals";
 import { multiSenseWord, newFlag, newWord } from "types/word";
 
@@ -63,7 +63,7 @@ mockGoal.data = goalDataMock;
 mockGoal.steps = [{ words: [] }, { words: [] }];
 
 const preloadedState = {
-  ...defaultState,
+  ...persistedDefaultState,
   goalsState: {
     allGoalTypes: [],
     currentGoal: new MergeDups(),
@@ -76,7 +76,6 @@ const preloadedState = {
     tree: {} as MergeTree,
     mergeWords: [],
   },
-  _persist: { version: 1, rehydrated: false },
 };
 
 const vernA = "AAA";
diff --git a/src/goals/MergeDuplicates/Redux/tests/MergeDupsDataMock.ts b/src/goals/MergeDuplicates/Redux/tests/MergeDupsDataMock.ts
index e4ccc153e6..1f66b63766 100644
--- a/src/goals/MergeDuplicates/Redux/tests/MergeDupsDataMock.ts
+++ b/src/goals/MergeDuplicates/Redux/tests/MergeDupsDataMock.ts
@@ -1,7 +1,6 @@
 import { type PreloadedState } from "@reduxjs/toolkit";
 
 import { type Definition, type SemanticDomain, type Word } from "api/models";
-import { defaultState } from "components/App/DefaultState";
 import {
   convertSenseToMergeTreeSense,
   convertWordToMergeTreeWord,
@@ -11,6 +10,7 @@ import {
 import { type MergeDupsData } from "goals/MergeDuplicates/MergeDupsTypes";
 import { defaultState as mergeState } from "goals/MergeDuplicates/Redux/MergeDupsReduxTypes";
 import { type RootState } from "rootRedux/store";
+import { persistedDefaultState } from "rootRedux/testTypes";
 import { newSense, newWord, simpleWord } from "types/word";
 
 const wordsArrayMock = (): Word[] => [
@@ -84,12 +84,6 @@ const wordFoo2 = {
   senses: [senseBar, senseBaz],
 };
 
-// Preloaded values for store when testing the MergeDups Goal
-const persistedDefaultState: PreloadedState<RootState> = {
-  ...defaultState,
-  _persist: { version: 1, rehydrated: false },
-};
-
 export type ExpectedScenarioResult = {
   // wordId for the parent word
   parent: string;
diff --git a/src/goals/ReviewEntries/ReviewEntriesTable/Cells/EditCell/tests/EditSenseDialog.test.tsx b/src/goals/ReviewEntries/ReviewEntriesTable/Cells/EditCell/tests/EditSenseDialog.test.tsx
index 9ecfdbca90..a780be6d65 100644
--- a/src/goals/ReviewEntries/ReviewEntriesTable/Cells/EditCell/tests/EditSenseDialog.test.tsx
+++ b/src/goals/ReviewEntries/ReviewEntriesTable/Cells/EditCell/tests/EditSenseDialog.test.tsx
@@ -4,11 +4,10 @@ import { type ReactTestRenderer, act, create } from "react-test-renderer";
 import configureMockStore from "redux-mock-store";
 
 import { Project, type Sense } from "api/models";
-import { defaultState } from "components/App/DefaultState";
 import EditSenseDialog, {
   EditSenseDialogId,
 } from "goals/ReviewEntries/ReviewEntriesTable/Cells/EditCell/EditSenseDialog";
-import { type StoreState } from "rootRedux/types";
+import { type StoreState, defaultState } from "rootRedux/types";
 import { newSense } from "types/word";
 
 // Container uses Portal, not supported in react-test-renderer
diff --git a/src/index.tsx b/src/index.tsx
index ce9efbbfb2..9cee0e29b3 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -5,7 +5,7 @@ import { Provider } from "react-redux";
 import { PersistGate } from "redux-persist/integration/react";
 
 import "i18n";
-import App from "components/App/component";
+import App from "components/App";
 import { persistor, store } from "rootRedux/store";
 import theme from "types/theme";
 
diff --git a/src/rootRedux/testTypes.ts b/src/rootRedux/testTypes.ts
new file mode 100644
index 0000000000..9eecc4494f
--- /dev/null
+++ b/src/rootRedux/testTypes.ts
@@ -0,0 +1,10 @@
+import { type PreloadedState } from "redux";
+
+import { type RootState } from "rootRedux/store";
+import { defaultState } from "rootRedux/types";
+
+/** Preloaded values for store when testing */
+export const persistedDefaultState: PreloadedState<RootState> = {
+  ...defaultState,
+  _persist: { rehydrated: false, version: -1 },
+};
diff --git a/src/utilities/testingLibraryUtilities.tsx b/src/utilities/testingLibraryUtilities.tsx
index 6ccb5eac9b..ce384e48ef 100644
--- a/src/utilities/testingLibraryUtilities.tsx
+++ b/src/utilities/testingLibraryUtilities.tsx
@@ -4,13 +4,13 @@ import { type PropsWithChildren, type ReactElement } from "react";
 import { Provider } from "react-redux";
 import { PersistGate } from "redux-persist/integration/react";
 
-import { defaultState } from "components/App/DefaultState";
 import {
   type AppStore,
   type RootState,
   persistor,
   setupStore,
 } from "rootRedux/store";
+import { persistedDefaultState } from "rootRedux/testTypes";
 
 /** This extends the default options for `render` from `@testing-library/react`,
  * allowing the user to specify other things such as `initialState`, `store`. */
@@ -26,10 +26,7 @@ interface ExtendedRenderOptions extends Omit<RenderOptions, "queries"> {
 export function renderWithProviders(
   ui: ReactElement,
   {
-    preloadedState = {
-      ...defaultState,
-      _persist: { version: 0, rehydrated: false },
-    },
+    preloadedState = persistedDefaultState,
     // Automatically create a store instance if no store was passed in
     store = setupStore(preloadedState),
     ...renderOptions