From 7047a9abc3659cfbfcd4ea6b4cc9f88adc5ab713 Mon Sep 17 00:00:00 2001
From: Pedro Pupo Sa da Costa <pedro@hublo.com>
Date: Wed, 2 Aug 2023 19:31:16 +0200
Subject: [PATCH] fix: fix test pages

---
 README.md                                     |    2 +-
 apps/next-app/pages/_app.page.tsx             |    2 -
 .../[testId]/components/exam-navigation.tsx   |   59 -
 .../pages/tests/[testId]/exam.page.tsx        |  166 +-
 .../pages/tests/[testId]/review.page.tsx      |  125 +-
 .../pages/tests/[testId]/study.page.tsx       |  210 +-
 apps/next-app/pages/tests/index.page.tsx      |   12 +-
 apps/next-app/pages/tests/new.page.tsx        |    9 +-
 libs/core/redux/.eslintrc.json                |    5 -
 libs/core/redux/project.json                  |   32 -
 libs/core/redux/src/__mocks__/question.ts     | 1795 -----------------
 libs/core/redux/src/actions/test-actions.ts   |   26 -
 .../src/actions/user-preferences-actions.ts   |    9 -
 libs/core/redux/src/hooks/use-test-hotkeys.ts |   43 -
 libs/core/redux/src/index.ts                  |   16 -
 .../redux/src/provider/redux-provider.tsx     |   29 -
 .../src/reducers/test-progress-reducer.ts     |  109 -
 libs/core/redux/src/store/store.ts            |   52 -
 libs/core/redux/tsconfig.json                 |   14 -
 libs/core/redux/tsconfig.lib.json             |    7 -
 libs/core/redux/tsconfig.test.json            |    8 -
 libs/core/redux/vite.config.ts                |   25 -
 .../components/src/drawer/drawer.stories.tsx  |    4 +-
 .../components/src/header/header.stories.tsx  |    4 +-
 libs/react/components/src/index.ts            |    2 +-
 .../src/question-navigation/index.ts          |    1 +
 .../question-navigation.stories.tsx}          |   14 +-
 .../question-navigation.tsx}                  |    8 +-
 .../src/test-question-navigation/index.ts     |    1 -
 libs/react/containers/src/index.ts            |   16 +-
 .../question-preview-list/index.ts            |    0
 .../question-preview-list.tsx                 |    0
 .../{ => questions}/question-review/index.ts  |    0
 .../question-review.stories.tsx               |    0
 .../question-review/question-review.tsx       |    0
 .../question-search-demo/index.ts             |    0
 .../question-search-demo.tsx                  |    0
 .../src/{ => tests}/test-maker/index.ts       |    0
 .../test-maker/test-maker.stories.tsx         |    3 +-
 .../src/{ => tests}/test-maker/test-maker.tsx |    4 +-
 .../src/tests/test-question-exam/index.ts     |    1 +
 .../test-question-exam.stories.tsx            |    0
 .../test-question-exam/test-question-exam.tsx |   66 +
 .../tests/test-question-navigation/index.ts   |    1 +
 .../test-question-navigation.tsx              |   55 +
 .../src/tests/test-question-study/index.ts    |    1 +
 .../test-question-study.tsx                   |   78 +
 .../containers/src/tests/test-review/index.ts |    1 +
 .../src/tests/test-review/test-review.tsx     |  107 +
 .../src/tests/tests-overview/index.ts         |    1 +
 .../tests/tests-overview}/tests-overview.tsx  |    6 +-
 .../tests/use-test-progress-hotkeys/index.ts  |    1 +
 .../use-test-progress-hotkeys.ts              |   43 +
 .../src/tests/use-test-progress-time/index.ts |    1 +
 .../use-test-progress-time.tsx                |   38 +
 .../src/tests/use-test-progress/index.ts      |    1 +
 .../use-test-progress/use-test-progress.ts    |  139 ++
 .../src/use-form-history/use-form-history.tsx |    2 +-
 .../src/use-user-voyage-flag/index.ts         |    1 +
 .../use-user-voyage-flag.ts                   |    2 +-
 libs/react/containers/tsconfig.json           |    8 +-
 .../mock/src}/__mocks__/subjects.mock.ts      |    0
 libs/trpc/mock/src/__mocks__/test.mock.ts     | 1683 ++++++++++++++++
 libs/trpc/mock/src/index.ts                   |    2 +
 package.json                                  |    4 -
 pnpm-lock.yaml                                |  111 +-
 tsconfig.base.json                            |    1 -
 67 files changed, 2333 insertions(+), 2833 deletions(-)
 delete mode 100644 apps/next-app/pages/tests/[testId]/components/exam-navigation.tsx
 delete mode 100644 libs/core/redux/.eslintrc.json
 delete mode 100644 libs/core/redux/project.json
 delete mode 100644 libs/core/redux/src/__mocks__/question.ts
 delete mode 100644 libs/core/redux/src/actions/test-actions.ts
 delete mode 100644 libs/core/redux/src/actions/user-preferences-actions.ts
 delete mode 100644 libs/core/redux/src/hooks/use-test-hotkeys.ts
 delete mode 100644 libs/core/redux/src/index.ts
 delete mode 100644 libs/core/redux/src/provider/redux-provider.tsx
 delete mode 100644 libs/core/redux/src/reducers/test-progress-reducer.ts
 delete mode 100644 libs/core/redux/src/store/store.ts
 delete mode 100644 libs/core/redux/tsconfig.json
 delete mode 100644 libs/core/redux/tsconfig.lib.json
 delete mode 100644 libs/core/redux/tsconfig.test.json
 delete mode 100644 libs/core/redux/vite.config.ts
 create mode 100644 libs/react/components/src/question-navigation/index.ts
 rename libs/react/components/src/{test-question-navigation/test-question-navigation.stories.tsx => question-navigation/question-navigation.stories.tsx} (68%)
 rename libs/react/components/src/{test-question-navigation/test-question-navigation.tsx => question-navigation/question-navigation.tsx} (97%)
 delete mode 100644 libs/react/components/src/test-question-navigation/index.ts
 rename libs/react/containers/src/{ => questions}/question-preview-list/index.ts (100%)
 rename libs/react/containers/src/{ => questions}/question-preview-list/question-preview-list.tsx (100%)
 rename libs/react/containers/src/{ => questions}/question-review/index.ts (100%)
 rename libs/react/containers/src/{ => questions}/question-review/question-review.stories.tsx (100%)
 rename libs/react/containers/src/{ => questions}/question-review/question-review.tsx (100%)
 rename libs/react/containers/src/{ => questions}/question-search-demo/index.ts (100%)
 rename libs/react/containers/src/{ => questions}/question-search-demo/question-search-demo.tsx (100%)
 rename libs/react/containers/src/{ => tests}/test-maker/index.ts (100%)
 rename libs/react/containers/src/{ => tests}/test-maker/test-maker.stories.tsx (95%)
 rename libs/react/containers/src/{ => tests}/test-maker/test-maker.tsx (98%)
 create mode 100644 libs/react/containers/src/tests/test-question-exam/index.ts
 create mode 100644 libs/react/containers/src/tests/test-question-exam/test-question-exam.stories.tsx
 create mode 100644 libs/react/containers/src/tests/test-question-exam/test-question-exam.tsx
 create mode 100644 libs/react/containers/src/tests/test-question-navigation/index.ts
 create mode 100644 libs/react/containers/src/tests/test-question-navigation/test-question-navigation.tsx
 create mode 100644 libs/react/containers/src/tests/test-question-study/index.ts
 create mode 100644 libs/react/containers/src/tests/test-question-study/test-question-study.tsx
 create mode 100644 libs/react/containers/src/tests/test-review/index.ts
 create mode 100644 libs/react/containers/src/tests/test-review/test-review.tsx
 create mode 100644 libs/react/containers/src/tests/tests-overview/index.ts
 rename {apps/next-app/pages/tests/components => libs/react/containers/src/tests/tests-overview}/tests-overview.tsx (94%)
 create mode 100644 libs/react/containers/src/tests/use-test-progress-hotkeys/index.ts
 create mode 100644 libs/react/containers/src/tests/use-test-progress-hotkeys/use-test-progress-hotkeys.ts
 create mode 100644 libs/react/containers/src/tests/use-test-progress-time/index.ts
 create mode 100644 libs/react/containers/src/tests/use-test-progress-time/use-test-progress-time.tsx
 create mode 100644 libs/react/containers/src/tests/use-test-progress/index.ts
 create mode 100644 libs/react/containers/src/tests/use-test-progress/use-test-progress.ts
 create mode 100644 libs/react/containers/src/use-user-voyage-flag/index.ts
 rename libs/{react/containers/src/test-maker => trpc/mock/src}/__mocks__/subjects.mock.ts (100%)
 create mode 100644 libs/trpc/mock/src/__mocks__/test.mock.ts

diff --git a/README.md b/README.md
index be6cde00d..c5a42fd75 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ Built with
 [`Storybook`](https://storybook.js.org/),
 [`Prisma`](https://www.prisma.io/),
 [`Trpc`](https://trpc.io/),
-[`Redux`](https://redux.js.org/),
+[`Zustand`](https://github.com/pmndrs/zustand),
 and [`MDX`](https://mdxjs.com/).
 
 Managed with
diff --git a/apps/next-app/pages/_app.page.tsx b/apps/next-app/pages/_app.page.tsx
index e53a1c7ff..38408daeb 100644
--- a/apps/next-app/pages/_app.page.tsx
+++ b/apps/next-app/pages/_app.page.tsx
@@ -2,7 +2,6 @@ import React, { StrictMode } from "react";
 import { default as Head } from "next/head";
 import { CssBaseline, CssVarsProvider } from "@mui/joy";
 import { ReactQueryDevtools } from "@tanstack/react-query-devtools";
-import { getEnvVariableOrThrow } from "@chair-flight/base/env";
 import { AnalyticsProvider } from "@chair-flight/react/analytics";
 import { Toaster } from "@chair-flight/react/components";
 import { AppTransition, theme } from "@chair-flight/react/containers";
@@ -13,7 +12,6 @@ import "@fontsource/public-sans";
 
 if (typeof document === "undefined") {
   React.useLayoutEffect = React.useEffect;
-  console.log(getEnvVariableOrThrow("ENV_FILE_NAME"));
 }
 
 const App: FunctionComponent<AppProps> = ({ Component, pageProps }) => {
diff --git a/apps/next-app/pages/tests/[testId]/components/exam-navigation.tsx b/apps/next-app/pages/tests/[testId]/components/exam-navigation.tsx
deleted file mode 100644
index c318b5a4b..000000000
--- a/apps/next-app/pages/tests/[testId]/components/exam-navigation.tsx
+++ /dev/null
@@ -1,59 +0,0 @@
-import { useRouter } from "next/router";
-import { Button } from "@mui/joy";
-import {
-  actions,
-  useAppDispatch,
-  useAppSelector,
-} from "@chair-flight/core/redux";
-import {
-  TestQuestionNavigation,
-  useHeaderContext,
-} from "@chair-flight/react/components";
-import type { FunctionComponent } from "react";
-
-export type ExamNavigationProps = {
-  testId: string;
-};
-
-export const ExamNavigation: FunctionComponent<ExamNavigationProps> = ({
-  testId,
-}) => {
-  const dispatch = useAppDispatch();
-  const router = useRouter();
-  const test = useAppSelector((state) => state.testProgress.tests[testId]);
-  const currentQuestion = test.questions[test.currentQuestionIndex];
-  const { closeDrawer } = useHeaderContext();
-
-  return (
-    <>
-      <TestQuestionNavigation
-        data-cy="test-question-navigation"
-        sx={{ width: "100%" }}
-        status="in-progress"
-        currentId={currentQuestion.questionId}
-        questions={test.questions.map((q) => ({
-          id: q.questionId,
-          selectedOption: q.selectedOptionId,
-        }))}
-        onQuestionClicked={(questionId) => {
-          dispatch(
-            actions.navigateToTestQuestion({
-              testId: test.id,
-              questionId,
-            }),
-          );
-          closeDrawer();
-        }}
-      />
-      <Button
-        fullWidth
-        sx={{ mt: 2 }}
-        children="Finish"
-        onClick={() => {
-          dispatch(actions.finishTest({ testId: test.id }));
-          router.replace(`/tests/${test.id}/review`);
-        }}
-      />
-    </>
-  );
-};
diff --git a/apps/next-app/pages/tests/[testId]/exam.page.tsx b/apps/next-app/pages/tests/[testId]/exam.page.tsx
index 2200568d6..a45e7c7e1 100644
--- a/apps/next-app/pages/tests/[testId]/exam.page.tsx
+++ b/apps/next-app/pages/tests/[testId]/exam.page.tsx
@@ -1,163 +1,50 @@
-import { useEffect } from "react";
-import { useRouter } from "next/router";
-import { Box, Sheet } from "@mui/joy";
+import { NoSsr } from "@mui/base";
+import { Sheet } from "@mui/joy";
+import { Header, AppLayout, Skeleton } from "@chair-flight/react/components";
 import {
-  useAppDispatch,
-  useAppSelector,
-  actions,
-  ReduxProvider,
+  AppHead,
+  TestQuestionExam,
+  TestQuestionNavigation,
   useTestHotkeys,
-} from "@chair-flight/core/redux";
-import {
-  Header,
-  AppLayout,
-  QuestionBoxExam,
-  QuestionMultipleChoice,
-  Skeleton,
-} from "@chair-flight/react/components";
-import { AppHead } from "@chair-flight/react/containers";
-import { ExamNavigation } from "./components/exam-navigation";
+  useTestProgressTime,
+} from "@chair-flight/react/containers";
 import type { GetServerSideProps, NextPage } from "next";
-import type { FunctionComponent } from "react";
 
 type ExamPageProps = {
   testId: string;
 };
 
-const ExamPageSkeleton: FunctionComponent = () => (
-  <>
-    <Header removeLogo removeGithubLink />
-    <AppLayout.Main>
-      <AppLayout.MainGrid sx={{ maxWidth: 3000, margin: "auto" }}>
-        <AppLayout.MainGridFixedColumn
-          xs={12}
-          md={8}
-          lg={9}
-          sx={{ justifyContent: "center" }}
-        >
-          <Skeleton height={"500px"} />
-        </AppLayout.MainGridFixedColumn>
-        <AppLayout.MainGridFixedColumn
-          xs={0}
-          md={4}
-          lg={3}
-          sx={{ justifyContent: "center" }}
-        >
-          <Skeleton height={"350px"} />
-        </AppLayout.MainGridFixedColumn>
-      </AppLayout.MainGrid>
-    </AppLayout.Main>
-  </>
-);
-
-const ExamPageClient: FunctionComponent<ExamPageProps> = ({ testId }) => {
-  const router = useRouter();
-  const dispatch = useAppDispatch();
-  const test = useAppSelector((state) => state.testProgress.tests[testId]);
-  const currentQuestion = test.questions[test.currentQuestionIndex];
-
+export const ExamPage: NextPage<ExamPageProps> = ({ testId }) => {
   useTestHotkeys({ testId });
-
-  useEffect(() => {
-    if (test.status === "finished") {
-      router.push(`/tests/${test.id}/review`);
-    }
-    if (test.status === "created") {
-      dispatch(actions.startTest({ testId: test.id }));
-    }
-  }, [router, test, dispatch]);
-
-  useEffect(() => {
-    let lastTime = Date.now();
-    const interval = setInterval(() => {
-      const currentTime = Date.now();
-      const timeSpentInMs = currentTime - lastTime;
-      lastTime = currentTime;
-      dispatch(
-        actions.tickTestTime({
-          testId: test.id,
-          timeSpentInMs,
-        }),
-      );
-    }, 1000);
-    return () => clearInterval(interval);
-  }, [dispatch, test.id]);
-
-  if (test.status === "finished") {
-    return <ExamPageSkeleton />;
-  }
+  useTestProgressTime({ testId });
 
   return (
     <>
-      <Header removeLogo removeGithubLink>
-        <Box
-          sx={{ display: { xs: "flex", md: "none" }, flexDirection: "column" }}
-        >
-          <ExamNavigation testId={testId} />
-        </Box>
-      </Header>
+      <AppHead />
+      <Header removeLogo removeGithubLink />
       <AppLayout.Main>
         <AppLayout.MainGrid sx={{ maxWidth: 3000, margin: "auto" }}>
           <AppLayout.MainGridFixedColumn
             xs={12}
             md={8}
             lg={9}
-            sx={{ justifyContent: "flex-start" }}
+            sx={{ justifyContent: "center" }}
           >
-            <QuestionBoxExam
-              sx={{ width: "100%", maxHeight: "100%" }}
-              title={`Question ${test.currentQuestionIndex + 1} / ${
-                test.questions.length
-              }`}
-              timeSpentInMs={test.timeSpentInMs}
-              timeTotalInMs={test.durationInMs}
-              questionIndex={test.currentQuestionIndex}
-              totalQuestions={test.questions.length}
-              onNavigationClick={(p) => {
-                const question = test.questions[p];
-                if (!question) return;
-                dispatch(
-                  actions.navigateToTestQuestion({
-                    testId: test.id,
-                    questionId: question.questionId,
-                  }),
-                );
-              }}
-              question={
-                <QuestionMultipleChoice
-                  data-cy="question"
-                  question={currentQuestion.question}
-                  status="in-progress"
-                  selectedOptionId={currentQuestion.selectedOptionId}
-                  onOptionClicked={(optionId) =>
-                    dispatch(
-                      actions.answerTestQuestion({
-                        optionId,
-                        testId: test.id,
-                        questionId: currentQuestion.questionId,
-                      }),
-                    )
-                  }
-                  options={currentQuestion.options.map((opt) => ({
-                    optionId: opt.id,
-                    text: opt.text,
-                  }))}
-                />
-              }
-            />
+            <NoSsr fallback={<Skeleton height={"500px"} />}>
+              <TestQuestionExam testId={testId} />
+            </NoSsr>
           </AppLayout.MainGridFixedColumn>
           <AppLayout.MainGridFixedColumn
             xs={0}
             md={4}
             lg={3}
-            sx={{
-              justifyContent: "flex-start",
-              display: { xs: "none", md: "flex" },
-            }}
+            sx={{ justifyContent: "center" }}
           >
-            <Sheet variant="outlined" sx={{ p: 2 }}>
-              <ExamNavigation testId={testId} />
-            </Sheet>
+            <NoSsr fallback={<Skeleton height={"350px"} />}>
+              <Sheet variant="outlined" sx={{ p: 2 }}>
+                <TestQuestionNavigation testId={testId} />
+              </Sheet>
+            </NoSsr>
           </AppLayout.MainGridFixedColumn>
         </AppLayout.MainGrid>
       </AppLayout.Main>
@@ -165,15 +52,6 @@ const ExamPageClient: FunctionComponent<ExamPageProps> = ({ testId }) => {
   );
 };
 
-export const ExamPage: NextPage<ExamPageProps> = (props) => (
-  <>
-    <AppHead />
-    <ReduxProvider loading={<ExamPageSkeleton />}>
-      <ExamPageClient {...props} />
-    </ReduxProvider>
-  </>
-);
-
 export const getServerSideProps: GetServerSideProps<ExamPageProps> = async (
   ctx,
 ) => {
diff --git a/apps/next-app/pages/tests/[testId]/review.page.tsx b/apps/next-app/pages/tests/[testId]/review.page.tsx
index c1effaa22..582deff26 100644
--- a/apps/next-app/pages/tests/[testId]/review.page.tsx
+++ b/apps/next-app/pages/tests/[testId]/review.page.tsx
@@ -1,122 +1,17 @@
-import { Box, CircularProgress, Typography } from "@mui/joy";
-import { DateTime } from "luxon";
-import { ReduxProvider, useAppSelector } from "@chair-flight/core/redux";
+import { NoSsr } from "@mui/base";
+import { Skeleton } from "@mui/joy";
+import { Header, AppLayout } from "@chair-flight/react/components";
 import {
-  Header,
-  AppLayout,
-  TestQuestionResult,
-} from "@chair-flight/react/components";
-import { AppHead, AppHeaderMenu } from "@chair-flight/react/containers";
+  AppHead,
+  AppHeaderMenu,
+  TestReview,
+} from "@chair-flight/react/containers";
 import type { GetServerSideProps, NextPage } from "next";
-import type { FunctionComponent } from "react";
 
 export type ReviewPageProps = {
   testId: string;
 };
 
-export type QuestionReviewProps = {
-  testId: string;
-  questionIndex: number;
-};
-
-const QuestionReview: FunctionComponent<QuestionReviewProps> = ({ testId }) => {
-  const test = useAppSelector((state) => state.testProgress.tests[testId]);
-  const totalQuestions = test.questions.length;
-  const correctQuestions = test.questions.reduce(
-    (acc, q) => acc + (q.correctOptionId === q.selectedOptionId ? 1 : 0),
-    0,
-  );
-  const grade = Math.round((correctQuestions / totalQuestions) * 100);
-  const mainColor = grade >= 75 ? "success" : "danger";
-  const startTimeInEnglish =
-    test.startedAtEpochMs &&
-    DateTime.fromMillis(test.startedAtEpochMs).toFormat("DDD");
-  const timeSpent =
-    test.startedAtEpochMs &&
-    DateTime.fromMillis(test.startedAtEpochMs).toFormat("HH:mm:ss");
-
-  return (
-    <>
-      <Box
-        sx={{
-          height: "200px",
-          width: "100%",
-          bgcolor: `${mainColor}.softBg`,
-        }}
-      >
-        <Box
-          sx={{
-            maxWidth: 1300,
-            height: "100%",
-            p: 2,
-            mx: "auto",
-            display: "flex",
-            justifyContent: "space-between",
-          }}
-        >
-          <Box
-            sx={{
-              display: "flex",
-              height: "100%",
-              flexDirection: "column",
-              justifyContent: "flex-end",
-            }}
-          >
-            <Typography level="h4" component="h1">
-              Test results
-            </Typography>
-            <Typography level="body1" fontWeight={900}>
-              {[
-                test.id,
-                startTimeInEnglish,
-                timeSpent && `Time Spent: ${timeSpent}`,
-                `${correctQuestions}/${totalQuestions}`,
-              ]
-                .filter(Boolean)
-                .join(" | ")}
-            </Typography>
-          </Box>
-          <CircularProgress
-            determinate
-            value={grade}
-            children={`${grade}%`}
-            variant="outlined"
-            color={mainColor}
-            size="lg"
-            sx={{
-              "--CircularProgress-size": "120px",
-              "--CircularProgress-progressThickness": "12px",
-              "--CircularProgress-linecap": "butt",
-              m: 2,
-            }}
-          />
-        </Box>
-      </Box>
-      <Box component={"ul"} sx={{ maxWidth: 1300, px: 2, mx: "auto" }}>
-        {test.questions.map((question, i, arr) => (
-          <TestQuestionResult
-            key={question.questionId}
-            questionTemplateId={question.templateId}
-            questionVariantId={question.variantId}
-            sx={{ my: 1 }}
-            title={`${i + 1}/${arr.length}`}
-            question={question.question}
-            correct={question.selectedOptionId === question.correctOptionId}
-            correctOption={
-              question.options.find((o) => o.id === question.correctOptionId)
-                ?.text
-            }
-            selectedOption={
-              question.options.find((o) => o.id === question.selectedOptionId)
-                ?.text
-            }
-          />
-        ))}
-      </Box>
-    </>
-  );
-};
-
 export const ReviewPage: NextPage<ReviewPageProps> = ({ testId }) => {
   return (
     <>
@@ -125,9 +20,9 @@ export const ReviewPage: NextPage<ReviewPageProps> = ({ testId }) => {
         <AppHeaderMenu />
       </Header>
       <AppLayout.Main sx={{ p: { xs: 0, md: 0 } }}>
-        <ReduxProvider loading={"Loading..."}>
-          <QuestionReview testId={testId} questionIndex={0} />
-        </ReduxProvider>
+        <NoSsr fallback={<Skeleton height={"500px"} />}>
+          <TestReview testId={testId} />
+        </NoSsr>
       </AppLayout.Main>
     </>
   );
diff --git a/apps/next-app/pages/tests/[testId]/study.page.tsx b/apps/next-app/pages/tests/[testId]/study.page.tsx
index d9ad04d1a..a40e2e0f7 100644
--- a/apps/next-app/pages/tests/[testId]/study.page.tsx
+++ b/apps/next-app/pages/tests/[testId]/study.page.tsx
@@ -1,164 +1,31 @@
-import { useEffect } from "react";
-import { useRouter } from "next/router";
-import { Box, Button, Sheet, useTheme } from "@mui/joy";
+import { NoSsr } from "@mui/base";
+import { Box, Sheet } from "@mui/joy";
+import { Header, AppLayout, Skeleton } from "@chair-flight/react/components";
 import {
-  useAppDispatch,
-  useAppSelector,
-  actions,
-  ReduxProvider,
-  useTestHotkeys,
-} from "@chair-flight/core/redux";
-import {
-  Header,
-  AppLayout,
-  QuestionMultipleChoice,
-  Skeleton,
+  AppHead,
   TestQuestionNavigation,
-  QuestionBoxReview,
-  useMediaQuery,
-  QuestionBoxExam,
-} from "@chair-flight/react/components";
-import { AppHead } from "@chair-flight/react/containers";
+  TestQuestionStudy,
+  useTestHotkeys,
+  useTestProgressTime,
+} from "@chair-flight/react/containers";
 import type { GetServerSideProps, NextPage } from "next";
-import type { FunctionComponent } from "react";
 
 type StudyPageProps = {
   testId: string;
 };
 
-const StudyPageSkeleton: FunctionComponent = () => (
-  <>
-    <Header removeLogo removeGithubLink />
-    <AppLayout.Main>
-      <AppLayout.MainGrid sx={{ maxWidth: 3000, margin: "auto" }}>
-        <AppLayout.MainGridFixedColumn
-          xs={12}
-          md={8}
-          lg={9}
-          sx={{ justifyContent: "center" }}
-        >
-          <Skeleton height={"500px"} />
-        </AppLayout.MainGridFixedColumn>
-        <AppLayout.MainGridFixedColumn
-          xs={0}
-          md={4}
-          lg={3}
-          sx={{ justifyContent: "center" }}
-        >
-          <Skeleton height={"350px"} />
-        </AppLayout.MainGridFixedColumn>
-      </AppLayout.MainGrid>
-    </AppLayout.Main>
-  </>
-);
-
-const StudyPageClient: FunctionComponent<StudyPageProps> = ({ testId }) => {
-  const router = useRouter();
-  const theme = useTheme();
-  const dispatch = useAppDispatch();
-  const test = useAppSelector((state) => state.testProgress.tests[testId]);
-  const isSmallScreen = useMediaQuery(theme.breakpoints.down("sm"));
-  const currentQuestion = test.questions[test.currentQuestionIndex];
-
+export const StudyPage: NextPage<StudyPageProps> = ({ testId }) => {
   useTestHotkeys({ testId });
-
-  useEffect(() => {
-    if (test.status === "finished") {
-      router.push(`/tests/${test.id}/review`);
-    }
-    if (test.status === "created") {
-      dispatch(actions.startTest({ testId: test.id }));
-    }
-  }, [router, test, dispatch]);
-
-  useEffect(() => {
-    let lastTime = Date.now();
-    const interval = setInterval(() => {
-      const currentTime = Date.now();
-      const timeSpentInMs = currentTime - lastTime;
-      lastTime = currentTime;
-      dispatch(
-        actions.tickTestTime({
-          testId: test.id,
-          timeSpentInMs,
-        }),
-      );
-    }, 1000);
-    return () => clearInterval(interval);
-  }, [dispatch, test.id]);
-
-  const navigation = (
-    <>
-      <TestQuestionNavigation
-        sx={{ width: "100%" }}
-        status="in-progress-with-results"
-        pageSize={80}
-        currentId={currentQuestion.questionId}
-        questions={test.questions.map((q) => ({
-          id: q.questionId,
-          selectedOption: q.selectedOptionId,
-          correctOption: q.correctOptionId,
-        }))}
-        onQuestionClicked={(questionId) =>
-          dispatch(
-            actions.navigateToTestQuestion({
-              testId: test.id,
-              questionId,
-            }),
-          )
-        }
-      />
-      <Button
-        fullWidth
-        sx={{ mt: 2 }}
-        children="Finish"
-        onClick={() => {
-          dispatch(actions.finishTest({ testId: test.id }));
-          router.push(`/tests/${test.id}/review`);
-        }}
-      />
-    </>
-  );
-
-  const questionMultipleChoice = (
-    <QuestionMultipleChoice
-      data-cy="question"
-      question={currentQuestion.question}
-      disabled={currentQuestion.selectedOptionId !== undefined}
-      status={currentQuestion.selectedOptionId ? "show-result" : "in-progress"}
-      selectedOptionId={currentQuestion.selectedOptionId}
-      correctOptionId={currentQuestion.correctOptionId}
-      onOptionClicked={(optionId) =>
-        dispatch(
-          actions.answerTestQuestion({
-            optionId,
-            testId: test.id,
-            questionId: currentQuestion.questionId,
-          }),
-        )
-      }
-      options={currentQuestion.options.map((opt) => ({
-        optionId: opt.id,
-        text: opt.text,
-      }))}
-    />
-  );
-
-  const title = `Question ${test.currentQuestionIndex + 1} / ${
-    test.questions.length
-  }`;
-
-  if (test.status === "finished") {
-    return <StudyPageSkeleton />;
-  }
+  useTestProgressTime({ testId });
 
   return (
     <>
+      <AppHead />
       <Header>
-        <Box
-          sx={{ display: { xs: "flex", md: "none" }, flexDirection: "column" }}
-        >
-          {navigation}
+        <Box display={{ xs: "flex", md: "none" }} flexDirection={"column"}>
+          <NoSsr>
+            <TestQuestionNavigation testId={testId} />
+          </NoSsr>
         </Box>
       </Header>
       <AppLayout.Main>
@@ -169,33 +36,9 @@ const StudyPageClient: FunctionComponent<StudyPageProps> = ({ testId }) => {
             lg={9}
             sx={{ justifyContent: "flex-start" }}
           >
-            {isSmallScreen ? (
-              <QuestionBoxExam
-                sx={{ width: "100%", maxHeight: "100%" }}
-                title={title}
-                timeSpentInMs={test.timeSpentInMs}
-                timeTotalInMs={test.durationInMs}
-                questionIndex={test.currentQuestionIndex}
-                totalQuestions={test.questions.length}
-                onNavigationClick={(p) => {
-                  const question = test.questions[p];
-                  if (!question) return;
-                  dispatch(
-                    actions.navigateToTestQuestion({
-                      testId: test.id,
-                      questionId: question.questionId,
-                    }),
-                  );
-                }}
-                question={questionMultipleChoice}
-              />
-            ) : (
-              <QuestionBoxReview
-                sx={{ width: "100%", maxHeight: "100%" }}
-                title={title}
-                question={questionMultipleChoice}
-              />
-            )}
+            <NoSsr fallback={<Skeleton height={"500px"} />}>
+              <TestQuestionStudy testId={testId} />
+            </NoSsr>
           </AppLayout.MainGridFixedColumn>
           <AppLayout.MainGridFixedColumn
             xs={0}
@@ -206,9 +49,11 @@ const StudyPageClient: FunctionComponent<StudyPageProps> = ({ testId }) => {
               display: { xs: "none", md: "flex" },
             }}
           >
-            <Sheet variant="outlined" sx={{ p: 2 }}>
-              {navigation}
-            </Sheet>
+            <NoSsr fallback={<Skeleton height={"350px"} />}>
+              <Sheet variant="outlined" sx={{ p: 2 }}>
+                <TestQuestionNavigation testId={testId} />
+              </Sheet>
+            </NoSsr>
           </AppLayout.MainGridFixedColumn>
         </AppLayout.MainGrid>
       </AppLayout.Main>
@@ -216,15 +61,6 @@ const StudyPageClient: FunctionComponent<StudyPageProps> = ({ testId }) => {
   );
 };
 
-export const StudyPage: NextPage<StudyPageProps> = (props) => (
-  <>
-    <AppHead />
-    <ReduxProvider loading={<StudyPageSkeleton />}>
-      <StudyPageClient {...props} />
-    </ReduxProvider>
-  </>
-);
-
 export const getServerSideProps: GetServerSideProps<StudyPageProps> = async (
   ctx,
 ) => {
diff --git a/apps/next-app/pages/tests/index.page.tsx b/apps/next-app/pages/tests/index.page.tsx
index a56ba67ac..5fd974be5 100644
--- a/apps/next-app/pages/tests/index.page.tsx
+++ b/apps/next-app/pages/tests/index.page.tsx
@@ -1,11 +1,11 @@
-import { ReduxProvider } from "@chair-flight/core/redux";
+import { NoSsr } from "@mui/base";
 import { AppLayout, Header } from "@chair-flight/react/components";
 import {
   AlphaWarning,
   AppHead,
   AppHeaderMenu,
+  TestsOverview,
 } from "@chair-flight/react/containers";
-import { PreviewTests } from "./components/tests-overview";
 import type { GetStaticProps, NextPage } from "next";
 
 const TestPage: NextPage = () => (
@@ -15,10 +15,10 @@ const TestPage: NextPage = () => (
       <AppHeaderMenu />
     </Header>
     <AppLayout.Main sx={{ maxWidth: (t) => t.breakpoints.values.lg }}>
-      <ReduxProvider loading={"loading..."}>
-        <AlphaWarning />
-        <PreviewTests />
-      </ReduxProvider>
+      <AlphaWarning />
+      <NoSsr fallback="Loading tests...">
+        <TestsOverview />
+      </NoSsr>
     </AppLayout.Main>
   </>
 );
diff --git a/apps/next-app/pages/tests/new.page.tsx b/apps/next-app/pages/tests/new.page.tsx
index 2ccf6d1da..58722c7fa 100644
--- a/apps/next-app/pages/tests/new.page.tsx
+++ b/apps/next-app/pages/tests/new.page.tsx
@@ -7,12 +7,14 @@ import {
   AppHead,
   AppHeaderMenu,
   TestMaker,
+  useTestProgress,
 } from "@chair-flight/react/containers";
 import { ssrHandler } from "@chair-flight/trpc/server";
 import type { NextPage } from "next";
 
 const NewTestPage: NextPage = () => {
   const router = useRouter();
+  const addTest = useTestProgress((s) => s.addTest);
   return (
     <>
       <AppHead />
@@ -39,9 +41,10 @@ const NewTestPage: NextPage = () => {
         </AppLayout.Header>
         <Box sx={{ flex: 1, height: 100, pb: 2 }}>
           <TestMaker
-            onSuccessfulTestCreation={(test) =>
-              router.push(`/tests/${test.id}/${test.mode}`)
-            }
+            onSuccessfulTestCreation={(test) => {
+              addTest({ test });
+              router.push(`/tests/${test.id}/${test.mode}`);
+            }}
           />
         </Box>
         <AlphaWarning />
diff --git a/libs/core/redux/.eslintrc.json b/libs/core/redux/.eslintrc.json
deleted file mode 100644
index 8ba3202ba..000000000
--- a/libs/core/redux/.eslintrc.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "extends": ["../../../.eslintrc.json"],
-  "ignorePatterns": ["!**/*"],
-  "overrides": []
-}
diff --git a/libs/core/redux/project.json b/libs/core/redux/project.json
deleted file mode 100644
index 8712260d0..000000000
--- a/libs/core/redux/project.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "name": "core-redux",
-  "$schema": "../../../node_modules/nx/schemas/project-schema.json",
-  "sourceRoot": "libs/core/redux/src",
-  "projectType": "library",
-  "targets": {
-    "lint": {
-      "executor": "@nrwl/linter:eslint",
-      "outputs": ["{options.outputFile}"],
-      "options": {
-        "lintFilePatterns": ["libs/core/redux/**/*.ts"]
-      }
-    },
-    "test": {
-      "executor": "@nrwl/vite:test",
-      "outputs": ["coverage/libs/core/redux"],
-      "options": {
-        "reportsDirectory": "../../../coverage/libs/core/redux"
-      }
-    },
-    "tsc": {
-      "executor": "nx:run-commands",
-      "options": {
-        "commands": [
-          "tsc -p libs/core/redux/tsconfig.lib.json --noEmit",
-          "tsc -p libs/core/redux/tsconfig.test.json --noEmit"
-        ]
-      }
-    }
-  },
-  "tags": []
-}
diff --git a/libs/core/redux/src/__mocks__/question.ts b/libs/core/redux/src/__mocks__/question.ts
deleted file mode 100644
index 3d8e831cb..000000000
--- a/libs/core/redux/src/__mocks__/question.ts
+++ /dev/null
@@ -1,1795 +0,0 @@
-import type { QuestionTemplate } from "@chair-flight/base/types";
-
-export const question: QuestionTemplate = {
-  id: "QJ2M6EU2G5",
-  srcLocation: "/",
-  explanation: "",
-  learningObjectives: ["033.01.01.02.04"],
-  variants: {
-    Wuyr5cGQ: {
-      id: "Wuyr5cGQ",
-      type: "simple",
-      question:
-        "Given:\n\n- Distance from departure to destination: 360 NM\n\n- Safe Endurance: 4.5 h\n\n- True Track: 345°\n\n- W/V: 260/30\n\n- TAS: 140 kt\n\nWhat is the distance of the PSR from the departure point?",
-      options: [
-        {
-          id: "A9BCX3SP0K",
-          text: "307 NM",
-          correct: true,
-          why: "",
-        },
-        {
-          id: "AQ3R65GBTS",
-          text: "52 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "A4YP1TI300",
-          text: "185 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "ASWE7VEX76",
-          text: "154 NM",
-          correct: false,
-          why: "",
-        },
-      ],
-      annexes: [],
-      externalIds: ["AVEXAM-99038"],
-      explanation: "",
-    },
-    tbS6e8ro: {
-      id: "tbS6e8ro",
-      type: "simple",
-      question:
-        "Given:\n\n- Distance from departure to destination: 190 NM\n\n- Safe Endurance: 2.4 h\n\n- True Track: 120°\n\n- W/V: 030/40\n\n- TAS: 130 kt\n\nWhat is the distance of the PSR from the departure point?",
-      options: [
-        {
-          id: "ANXV2IKDLK",
-          text: "149 NM",
-          correct: true,
-          why: "",
-        },
-        {
-          id: "AGGOR6IODR",
-          text: "95 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "ABB1PYJ9MO",
-          text: "73 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "ANFWC19ZLG",
-          text: "44 NM",
-          correct: false,
-          why: "",
-        },
-      ],
-      annexes: [],
-      externalIds: ["AVEXAM-43966"],
-      explanation: "",
-    },
-    rtmtkBm8: {
-      id: "rtmtkBm8",
-      type: "simple",
-      question:
-        "Given:\n\n- Distance from departure\n\t\t\tto destination: 150 NM\n\n- Safe Endurance: 2.4 h\n\n- True Track: 250°\n\n- W/V: 280/15\n\n- TAS: 120 kt\n\nWhat is the distance of the PSR from the departure point?",
-      options: [
-        {
-          id: "AY0NXTSTK4",
-          text: "142 NM",
-          correct: true,
-          why: "",
-        },
-        {
-          id: "AVXY736CTL",
-          text: "83 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "AKNTIV4OER",
-          text: "98 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "A9FXQQN8WA",
-          text: "71 NM",
-          correct: false,
-          why: "",
-        },
-      ],
-      annexes: [],
-      externalIds: ["AVEXAM-24414"],
-      explanation: "",
-    },
-    "8V1s4cbM": {
-      id: "8V1s4cbM",
-      type: "simple",
-      question:
-        "Given:\n\n- Distance from departure to destination: 210 NM\n\n- Safe Endurance: 2.5 hrs\n\n- True Track: 035°\n\n- W/V: 250/20\n\n- TAS: 105 kt\n\nWhat is the distance of the PSR from the departure point?",
-      options: [
-        {
-          id: "A7OYEQ5NSF",
-          text: "127 NM",
-          correct: true,
-          why: "",
-        },
-        {
-          id: "AXYUG4DMN2",
-          text: "172 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "A8679KIFZA",
-          text: "88 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "A3RRSJMUU4",
-          text: "64 NM",
-          correct: false,
-          why: "",
-        },
-      ],
-      annexes: [],
-      externalIds: ["AVEXAM-37948"],
-      explanation: "",
-    },
-    G8GNBiUb: {
-      id: "G8GNBiUb",
-      type: "simple",
-      question:
-        "Given:\n\n- Distance from departure to destination: 550 NM\n\n- Safe Endurance: 3.6 hrs\n\n- True Track: 200°\n\n- W/V: 220/15\n\n- TAS: 130 kt\n\nWhat is the distance of the PSR from the departure point?",
-      options: [
-        {
-          id: "AKXKOY9H2I",
-          text: "231 NM",
-          correct: true,
-          why: "",
-        },
-        {
-          id: "ADC2S0EC2Y",
-          text: "319 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "AGLAPDJCRL",
-          text: "116 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "AWYPLERJLP",
-          text: "305 NM",
-          correct: false,
-          why: "",
-        },
-      ],
-      annexes: [],
-      externalIds: ["AVEXAM-70345"],
-      explanation: "",
-    },
-    zA9yYJ4V: {
-      id: "zA9yYJ4V",
-      type: "simple",
-      question:
-        "Given:\n\n- Distance from departure to destination: 210 NM\n\n- Safe Endurance: 3.5 hrs\n\n- True Track: 310°\n\n- W/V: 270/30\n\n- TAS: 120 kts\n\nWhat is the distance of the PSR from the departure point?",
-      options: [
-        {
-          id: "AZOPC83UWC",
-          text: "200 NM",
-          correct: true,
-          why: "",
-        },
-        {
-          id: "AE237ISMN9",
-          text: "100 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "AEVDMXLC5P",
-          text: "10 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "APIQVIHECN",
-          text: "125 NM",
-          correct: false,
-          why: "",
-        },
-      ],
-      annexes: [],
-      externalIds: ["AVEXAM-85645"],
-      explanation: "",
-    },
-    g971zOnL: {
-      id: "g971zOnL",
-      type: "simple",
-      question:
-        "Given:\n\n- Distance from departure to destination: 180 NM\n\n- Safe Endurance: 2.8 h\n\n- True Track: 065°\n\n- W/V: 245/25\n\n- TAS: 100 kt\n\nWhat is the distance of the PSR from the departure point?",
-      options: [
-        {
-          id: "AL5CKTTVDW",
-          text: "131 NM",
-          correct: true,
-          why: "",
-        },
-        {
-          id: "AIRW5QMOF0",
-          text: "49 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "AS09P31VGY",
-          text: "68 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "A5J5M69S42",
-          text: "66 NM",
-          correct: false,
-          why: "",
-        },
-      ],
-      annexes: [],
-      externalIds: ["AVEXAM-98442"],
-      explanation: "",
-    },
-    xiorsFSh: {
-      id: "xiorsFSh",
-      type: "simple",
-      question:
-        "Given:\n\n- Distance from departure to destination: 410 NM\n\n- Safe Endurance: 3.6 hrs\n\n- True Track: 055°\n\n- W/V: 180/35\n\n- TAS: 120 kt\n\nWhat is the distance of the PSR from the departure point?",
-      options: [
-        {
-          id: "ANFVPMY31Z",
-          text: "203 NM",
-          correct: true,
-          why: "",
-        },
-        {
-          id: "A1U3E4HVVF",
-          text: "169 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "AO8H8Z2AVS",
-          text: "217 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "A0U7XEBVWO",
-          text: "102 NM",
-          correct: false,
-          why: "",
-        },
-      ],
-      annexes: [],
-      externalIds: ["AVEXAM-86666"],
-      explanation: "",
-    },
-    qvhFWO0H: {
-      id: "qvhFWO0H",
-      type: "simple",
-      question:
-        "Given:\n\n- Distance from departure to destination: 330 NM\n\n- Safe Endurance: 5 hrs\n\n- True Track: 170°\n\n- W/V: 140/25\n\n- TAS: 125 kts\n\nWhat is the distance of the PSR from the departure point?",
-      options: [
-        {
-          id: "APVW3NHWDU",
-          text: "303 NM",
-          correct: true,
-          why: "",
-        },
-        {
-          id: "A9PFB91J07",
-          text: "30 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "A79EQ5SMG6",
-          text: "150 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "AHOLMEQW56",
-          text: "194 NM",
-          correct: false,
-          why: "",
-        },
-      ],
-      annexes: [],
-      externalIds: ["AVEXAM-21656"],
-      explanation: "",
-    },
-    hhevxZSk: {
-      id: "hhevxZSk",
-      type: "simple",
-      question:
-        "Given:\n\n- Distance from departure to destination: 260 NM\n\n- Safe Endurance: 4.1 hrs\n\n- True Track: 150°\n\n- W/V: 100/30\n\n- TAS: 110 kts\n\nWhat is the distance of the PSR from the departure point?",
-      options: [
-        {
-          id: "A60QFAW0S8",
-          text: "213 NM",
-          correct: true,
-          why: "",
-        },
-        {
-          id: "AN9LHG2SEV",
-          text: "154 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "AZBY5MVHH0",
-          text: "107 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "AX0NWDLWQ3",
-          text: "47 NM",
-          correct: false,
-          why: "",
-        },
-      ],
-      annexes: [],
-      externalIds: ["AVEXAM-99986"],
-      explanation: "",
-    },
-    "8AS4Is4t": {
-      id: "8AS4Is4t",
-      type: "simple",
-      question:
-        "Given:\n\n- Distance from departure to destination: 480 NM\n\n- Safe Endurance: 5 hrs\n\n- True Track: 315°\n\n- W/V: 100/20\n\n- TAS: 115 kts\n\nWhat is the distance of the PSR from the departure point?",
-      options: [
-        {
-          id: "A8LR81BKMK",
-          text: "280 NM",
-          correct: true,
-          why: "",
-        },
-        {
-          id: "AUJ3E1BCHC",
-          text: "141 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "AZEYE455C3",
-          text: "199 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "AOKGV4C4GC",
-          text: "205 NM",
-          correct: false,
-          why: "",
-        },
-      ],
-      annexes: [],
-      externalIds: ["AVEXAM-25001"],
-      explanation: "",
-    },
-    Kwe6iryW: {
-      id: "Kwe6iryW",
-      type: "simple",
-      question:
-        "Given:\n\n- Distance from departure to destination: 320 NM\n\n- Safe Endurance: 4.3 hrs\n\n- True Track: 120°\n\n- W/V: 180/40\n\n- TAS: 130 kts\n\nWhat is the distance of the PSR from the departure point?",
-      options: [
-        {
-          id: "A8Q3X19YQA",
-          text: "262 NM",
-          correct: true,
-          why: "",
-        },
-        {
-          id: "AZEM9J08E7",
-          text: "185 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "AOY9FL70X8",
-          text: "59 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "AMQHA12P50",
-          text: "131NM",
-          correct: false,
-          why: "",
-        },
-      ],
-      annexes: [],
-      externalIds: ["AVEXAM-39313"],
-      explanation: "",
-    },
-    qqmrlLw8: {
-      id: "qqmrlLw8",
-      type: "simple",
-      question:
-        "Given:\n\n- Distance from departure to destination: 4&nbsp;630 NM\n\n- Safe Endurance: 12.4 hrs\n\n- True Track: 240°\n\n- W/V: 060/80\n\n- TAS: 530 kts\n\nWhat is the distance of the PSR from the departure point?",
-      options: [
-        {
-          id: "AGMVQ62S43",
-          text: "3&nbsp;211 NM",
-          correct: true,
-          why: "",
-        },
-        {
-          id: "A7ZWS58C1Z",
-          text: "1&nbsp;966 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "AEN02K9Y51",
-          text: "1&nbsp;419 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "AAMJVUB5PW",
-          text: "6&nbsp;106 NM",
-          correct: false,
-          why: "",
-        },
-      ],
-      annexes: [],
-      externalIds: ["AVEXAM-46234"],
-      explanation: "",
-    },
-    ZIXseFhB: {
-      id: "ZIXseFhB",
-      type: "simple",
-      question:
-        "Given:\n\n- Distance from departure to destination: 6&nbsp;340 NM\n\n- Safe Endurance: 15 hrs\n\n- True Track: 090°\n\n- W/V: 270/100\n\n- TAS: 520 kt\n\nWhat is the distance of the PSR from the departure point?",
-      options: [
-        {
-          id: "AGOM8SPOU5",
-          text: "3&nbsp;756 NM",
-          correct: true,
-          why: "",
-        },
-        {
-          id: "ASV86CQYYU",
-          text: "2&nbsp;560 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "AXJCNWXZ72",
-          text: "2&nbsp;584 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "A9DJBIHJNZ",
-          text: "1&nbsp;878 NM",
-          correct: false,
-          why: "",
-        },
-      ],
-      annexes: [],
-      externalIds: ["AVEXAM-80823"],
-      explanation: "",
-    },
-    k94aJ7nu: {
-      id: "k94aJ7nu",
-      type: "simple",
-      question:
-        "Given:\n\n- Distance from departure to destination: 3&nbsp;750 NM\n\n- Safe Endurance: 9.5 hrs\n\n- True Track: 360°\n\n- W/V: 360/50\n\n- TAS: 480 kt\n\nWhat is the distance of the PSR from the departure point?",
-      options: [
-        {
-          id: "AGHAIGNZYN",
-          text: "2&nbsp;255 NM",
-          correct: true,
-          why: "",
-        },
-        {
-          id: "A8WLC8UH78",
-          text: "1&nbsp;128 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "AP27MTMNM5",
-          text: "2&nbsp;070 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "A6M9226BBF",
-          text: "1&nbsp;495 NM",
-          correct: false,
-          why: "",
-        },
-      ],
-      annexes: [],
-      externalIds: ["AVEXAM-11605"],
-      explanation: "",
-    },
-    GVtPzvWe: {
-      id: "GVtPzvWe",
-      type: "simple",
-      question:
-        'Given:\n<table border="0" cellpadding="0" cellspacing="5" style="letter-spacing:0.7px">\n\t<tbody>\n\t\t<tr>\tDistance from departure to destination:</td>\n\t\t\t<td style="text-align:right">180 NM\n\n- Safe Endurance:</td>\n\t\t\t<td style="text-align:right">2.8 hrs\n\n- True Track:</td>\n\t\t\t<td style="text-align:right">065°\n\n- W/V:</td>\n\t\t\t<td style="text-align:right">245/25\n\n- TAS:</td>\n\t\t\t<td style="text-align:right">100 kts\n\nWhat is the distance of the PSR from the departure point?',
-      options: [
-        {
-          id: "AAVZ4U5JBY",
-          text: "131 NM",
-          correct: true,
-          why: "",
-        },
-        {
-          id: "AGVPH2I0NF",
-          text: "66 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "AEQZOYU4FM",
-          text: "68 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "ALPQWFJ9KH",
-          text: "49 NM",
-          correct: false,
-          why: "",
-        },
-      ],
-      annexes: [],
-      externalIds: ["ATPLQ-337878"],
-      explanation: "",
-    },
-    cvN5OVPF: {
-      id: "cvN5OVPF",
-      type: "simple",
-      question:
-        'Given:\n<table border="0" cellpadding="0" cellspacing="5" style="letter-spacing:0.7px">\n\t<tbody>\n\t\t<tr>\tDistance from departure to destination:</td>\n\t\t\t<td style="text-align:right">410 NM\n\n- Safe Endurance:</td>\n\t\t\t<td style="text-align:right">3.6 hrs\n\n- True Track:</td>\n\t\t\t<td style="text-align:right">055°\n\n- W/V:</td>\n\t\t\t<td style="text-align:right">180/35\n\n- TAS:</td>\n\t\t\t<td style="text-align:right">120 kts\n\nWhat is the distance of the PSR from the departure point?',
-      options: [
-        {
-          id: "ADABTVG4YQ",
-          text: "203 NM",
-          correct: true,
-          why: "",
-        },
-        {
-          id: "AAHE3JAAST",
-          text: "217 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "AB5O22AW6C",
-          text: "169 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "ASVY0O0YTU",
-          text: "102 NM",
-          correct: false,
-          why: "",
-        },
-      ],
-      annexes: [],
-      externalIds: ["ATPLQ-337093"],
-      explanation: "",
-    },
-    "7cNDqDev": {
-      id: "7cNDqDev",
-      type: "simple",
-      question:
-        'Given:\n<table border="0" cellpadding="0" cellspacing="5" style="letter-spacing:0.7px">\n\t<tbody>\n\t\t<tr>\tDistance from departure to destination:</td>\n\t\t\t<td style="text-align:right">190 NM\n\n- Safe Endurance:</td>\n\t\t\t<td style="text-align:right">2.4 hrs\n\n- True Track:</td>\n\t\t\t<td style="text-align:right">120°\n\n- W/V:</td>\n\t\t\t<td style="text-align:right">030/40\n\n- TAS:</td>\n\t\t\t<td style="text-align:right">130 kts\n\nWhat is the distance of the PSR from the departure point?',
-      options: [
-        {
-          id: "A8SC0K7ZXP",
-          text: "149 NM",
-          correct: true,
-          why: "",
-        },
-        {
-          id: "APG7RYBJ7B",
-          text: "73 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "ALDQ4WR2T2",
-          text: "44 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "A88KF09EH1",
-          text: "95 NM",
-          correct: false,
-          why: "",
-        },
-      ],
-      annexes: [],
-      externalIds: ["ATPLQ-338849"],
-      explanation: "",
-    },
-    cxjtVSsA: {
-      id: "cxjtVSsA",
-      type: "simple",
-      question:
-        'Given:\n<table border="0" cellpadding="0" cellspacing="5" style="letter-spacing:0.7px">\n\t<tbody>\n\t\t<tr>\tDistance from departure to destination:</td>\n\t\t\t<td style="text-align:right">360 NM\n\n- Safe Endurance:</td>\n\t\t\t<td style="text-align:right">4.5 hrs\n\n- True Track:</td>\n\t\t\t<td style="text-align:right">345°\n\n- W/V:</td>\n\t\t\t<td style="text-align:right">260/30\n\n- TAS:</td>\n\t\t\t<td style="text-align:right">140 kts\n\nWhat is the distance of the PSR from the departure point?',
-      options: [
-        {
-          id: "AZHEDBI5T2",
-          text: "307 NM",
-          correct: true,
-          why: "",
-        },
-        {
-          id: "AJIYD8NG5E",
-          text: "154 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "AI0AP8W703",
-          text: "52 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "AC7VFHVNE1",
-          text: "185 NM",
-          correct: false,
-          why: "",
-        },
-      ],
-      annexes: [],
-      externalIds: ["ATPLQ-338065"],
-      explanation: "",
-    },
-    Y5kCTR0T: {
-      id: "Y5kCTR0T",
-      type: "simple",
-      question:
-        "Given:\n\n- Distance from departure to destination: 875 NM\n\n- True track: 240°\n\n- W/V: 060/50\n\n- TAS: 500 kt\n\nWhat is the distance and time of the PET from the departure point?",
-      options: [
-        {
-          id: "ABA11LPUAX",
-          text: "Distance: 394 NM; Time: 43 min.",
-          correct: true,
-          why: "",
-        },
-        {
-          id: "A7MCUM907V",
-          text: "Distance: 716 NM; Time: 78 min.",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "AI3ZKBKN75",
-          text: "Distance: 481 NM; Time: 64 min.",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "A4APD8FUFT",
-          text: "Distance: 438 NM; Time: 53 min.",
-          correct: false,
-          why: "",
-        },
-      ],
-      annexes: [],
-      externalIds: ["AVEXAM-44138"],
-      explanation: "",
-    },
-    EACB6du4: {
-      id: "EACB6du4",
-      type: "simple",
-      question:
-        "Given:\n\n- Distance from departure to destination: 338 NM\n\n- True track: 045°\n\n- W/V: 225/35\n\n- TAS: 120 kt\n\nWhat is the distance and time of the PET from the departure point?",
-      options: [
-        {
-          id: "AEB3YGLSJ4",
-          text: "Distance: 120 NM; Time: 46 min.",
-          correct: true,
-          why: "",
-        },
-        {
-          id: "AJ8JMWPL6B",
-          text: "Distance: 185 NM; Time: 72 min.",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "AG6JZ2J7Y1",
-          text: "Distance: 218 NM; Time: 85 min.",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "AXYNT7HYQA",
-          text: "Distance: 169 NM; Time: 85 min.",
-          correct: false,
-          why: "",
-        },
-      ],
-      annexes: [],
-      externalIds: ["AVEXAM-91795"],
-      explanation: "",
-    },
-    gykN6jwM: {
-      id: "gykN6jwM",
-      type: "simple",
-      question:
-        "Given:\n\n- Distance from departure to destination: 270 NM\n\n- True track: 030°\n\n- W/V: 120/35\n\n- TAS: 125 kt\n\nWhat is the distance and time of the PET from the departure point?",
-      options: [
-        {
-          id: "AT23QHAXGM",
-          text: "Distance: 135 NM; Time: 68 min.",
-          correct: true,
-          why: "",
-        },
-        {
-          id: "ACJ06NL7U4",
-          text: "Distance: 141 NM; Time: 65 min.",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "ARZZVIUGNH",
-          text: "Distance: 141 NM; Time: 68 min.",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "AJ4SME276N",
-          text: "Distance: 130 NM; Time: 68 min.",
-          correct: false,
-          why: "",
-        },
-      ],
-      annexes: [],
-      externalIds: ["AVEXAM-75696"],
-      explanation: "",
-    },
-    "6T5sXf29": {
-      id: "6T5sXf29",
-      type: "simple",
-      question:
-        "Given:\n\n- Distance from departure to destination: 350 NM\n\n- True track: 320°\n\n- W/V: 350/30\n\n- TAS: 130 kt\n\nWhat is the distance and time of the PET from the departure point?",
-      options: [
-        {
-          id: "AACSU4F7JT",
-          text: "Distance: 210 NM; Time: 122 min.",
-          correct: true,
-          why: "",
-        },
-        {
-          id: "A5XP2IRLBZ",
-          text: "Distance: 139 NM; Time: 81 min.",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "AE39NSEYKV",
-          text: "Distance: 139 NM; Time: 54 min.",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "A9JMEFZDCR",
-          text: "Distance: 123 NM; Time: 74 min.",
-          correct: false,
-          why: "",
-        },
-      ],
-      annexes: [],
-      externalIds: ["AVEXAM-78440"],
-      explanation: "",
-    },
-    wRuAWr3u: {
-      id: "wRuAWr3u",
-      type: "simple",
-      question:
-        "Given:\n\n- Distance from departure to destination: 2&nbsp;200 NM\n\n- True track: 150°\n\n- W/V: 330/50\n\n- TAS: 460 kt\n\nWhat is the distance and time of the PET from the departure point?",
-      options: [
-        {
-          id: "AMO9A5C7NI",
-          text: "Distance: 980 NM; Time: 115 min.",
-          correct: true,
-          why: "",
-        },
-        {
-          id: "A2FVFINBJ5",
-          text: "Distance: 1&nbsp;120 NM; Time: 179 min.",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "ALR2BJ5D28",
-          text: "Distance: 1&nbsp;100 NM; Time: 179 min.",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "AV3I3ZBD4A",
-          text: "Distance: 980 NM; Time: 144 min.",
-          correct: false,
-          why: "",
-        },
-      ],
-      annexes: [],
-      externalIds: ["AVEXAM-22403"],
-      explanation: "",
-    },
-    ySZQTMJn: {
-      id: "ySZQTMJn",
-      type: "simple",
-      question:
-        "Given:\n\n- Distance from departure to destination: 2&nbsp;800 NM\n\n- True track: 140°\n\n- W/V: 140/100\n\n- TAS: 500 kt\n\nWhat is the distance and time of the PET from the departure point?",
-      options: [
-        {
-          id: "AOTJQWWMFL",
-          text: "Distance: 1&nbsp;680 NM; Time: 252 min.",
-          correct: true,
-          why: "",
-        },
-        {
-          id: "A16LCJLZOP",
-          text: "Distance: 1&nbsp;400 NM; Time: 168 min.",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "AOJTLURMTB",
-          text: "Distance: 1&nbsp;120 NM; Time: 134 min.",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "AN8YHKBAWB",
-          text: "Distance: 1&nbsp;120 NM; Time: 112 min.",
-          correct: false,
-          why: "",
-        },
-      ],
-      annexes: [],
-      externalIds: ["AVEXAM-71780"],
-      explanation: "",
-    },
-    "3VagyHyq": {
-      id: "3VagyHyq",
-      type: "simple",
-      question:
-        "Given:\n\n- Distance from departure to destination: 1&nbsp;100 NM\n\n- True track: 280°\n\n- W/V: 100/80\n\n- TAS: 440 kt\n\nWhat is the distance and time of the PET from the departure point?",
-      options: [
-        {
-          id: "AT97T08NBH",
-          text: "Distance: 450 NM; Time: 52 min.",
-          correct: true,
-          why: "",
-        },
-        {
-          id: "A9SFI2GOHD",
-          text: "Distance: 650 NM; Time: 108 min.",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "ARQSW3YNVC",
-          text: "Distance: 550 NM; Time: 75 min.",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "A8RNNEKHQO",
-          text: "Distance: 650 NM; Time: 75 min.",
-          correct: false,
-          why: "",
-        },
-      ],
-      annexes: [],
-      externalIds: ["AVEXAM-3550"],
-      explanation: "",
-    },
-    QU4bL5U1: {
-      id: "QU4bL5U1",
-      type: "simple",
-      question:
-        "Given:\n\n- Distance from departure to destination: 150 NM\n\n- True track: 142°\n\n- W/V: 200/15\n\n- TAS: 132 kt\n\nWhat is the distance of the PET from the departure point?",
-      options: [
-        {
-          id: "A1J1VSFOIM",
-          text: "79 NM",
-          correct: true,
-          why: "",
-        },
-        {
-          id: "AQL5JFWLLY",
-          text: "134 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "AELMCB82NG",
-          text: "75 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "AMH0RCOFRP",
-          text: "71 NM",
-          correct: false,
-          why: "",
-        },
-      ],
-      annexes: [],
-      externalIds: ["AVEXAM-71981"],
-      explanation: "",
-    },
-    m7zGDJfz: {
-      id: "m7zGDJfz",
-      type: "simple",
-      question:
-        "Given:\n\n- Distance from departure to destination: 150 NM\n\n- True track: 020°\n\n- W/V: 180/30\n\n- TAS: 130 kt\n\nWhat is the distance of the PET from the departure point?",
-      options: [
-        {
-          id: "ALJL4LM3EK",
-          text: "59 NM",
-          correct: true,
-          why: "",
-        },
-        {
-          id: "A6P6DV4T77",
-          text: "91 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "AQLP4L28YK",
-          text: "65 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "A6KDZZ46G1",
-          text: "75 NM",
-          correct: false,
-          why: "",
-        },
-      ],
-      annexes: [],
-      externalIds: ["AVEXAM-29188"],
-      explanation: "",
-    },
-    "76Y2p3Mx": {
-      id: "76Y2p3Mx",
-      type: "simple",
-      question:
-        "Given:\n\n- Distance from departure to destination: 165 NM\n\n- True track: 055°\n\n- W/V: 360/20\n\n- TAS: 105 kt\n\nWhat is the distance of the PET from the departure point?",
-      options: [
-        {
-          id: "A79TJGAE4F",
-          text: "92 NM",
-          correct: true,
-          why: "",
-        },
-        {
-          id: "AF3E7DXV93",
-          text: "132 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "A47Z6DG2DC",
-          text: "73 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "A8FOFWF6EU",
-          text: "83 NM",
-          correct: false,
-          why: "",
-        },
-      ],
-      annexes: [],
-      externalIds: ["AVEXAM-69394"],
-      explanation: "",
-    },
-    "64C6CIUD": {
-      id: "64C6CIUD",
-      type: "simple",
-      question:
-        "Given:\n\n- Distance from departure to destination: 340 NM\n\n- True track: 320°\n\n- W/V: 160/40\n\n- TAS: 110 kt\n\nWhat is the distance of the PET from the departure point?",
-      options: [
-        {
-          id: "A9IR8OLZGW",
-          text: "112 NM",
-          correct: true,
-          why: "",
-        },
-        {
-          id: "AQW3OEMEBQ",
-          text: "121 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "A4AMRQ8GH8",
-          text: "228 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "A15VTXSTRQ",
-          text: "219 NM",
-          correct: false,
-          why: "",
-        },
-      ],
-      annexes: [],
-      externalIds: ["AVEXAM-8839"],
-      explanation: "",
-    },
-    H3pb0WRw: {
-      id: "H3pb0WRw",
-      type: "simple",
-      question:
-        "Given:\n\n- Distance from departure to destination: 95 NM\n\n- True track: 105°\n\n- W/V: 060/15\n\n- TAS: 140 kt\n\nWhat is the distance of the PET from the departure point?",
-      options: [
-        {
-          id: "AFCX8LJRZ4",
-          text: "51 NM",
-          correct: true,
-          why: "",
-        },
-        {
-          id: "A6KPA8516L",
-          text: "47.5 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "A6KP2KZD9A",
-          text: "82 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "AOMCYVLQSW",
-          text: "44 NM",
-          correct: false,
-          why: "",
-        },
-      ],
-      annexes: [],
-      externalIds: ["AVEXAM-71857"],
-      explanation: "",
-    },
-    tAGmkvC1: {
-      id: "tAGmkvC1",
-      type: "simple",
-      question:
-        "Given:\n\n- Distance from departure to destination: 470 NM\n\n- True track: 237°\n\n- W/V: 300/25\n\n- TAS: 125 kt\n\nWhat is the distance of the PET from the departure point?",
-      options: [
-        {
-          id: "AB70QAMYI9",
-          text: "256 NM",
-          correct: true,
-          why: "",
-        },
-        {
-          id: "AVGF5RFJXY",
-          text: "214 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "A42ALRLEQF",
-          text: "205 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "AU1F4ZUO3H",
-          text: "235 NM",
-          correct: false,
-          why: "",
-        },
-      ],
-      annexes: [],
-      externalIds: ["AVEXAM-45239"],
-      explanation: "",
-    },
-    Sli2Ud4J: {
-      id: "Sli2Ud4J",
-      type: "simple",
-      question:
-        "Given:\n\n- Distance from departure to destination: 285 NM\n\n- True track: 348°\n\n- W/V: 280/25\n\n- TAS: 128 kts\n\nWhat is the distance of the PET from the departure point?",
-      options: [
-        {
-          id: "AE9K05HQDA",
-          text: "153 NM",
-          correct: true,
-          why: "",
-        },
-        {
-          id: "APQUL9M330",
-          text: "131 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "A1YRN9KYT4",
-          text: "143 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "ANMS0JCU60",
-          text: "123 NM",
-          correct: false,
-          why: "",
-        },
-      ],
-      annexes: [],
-      externalIds: ["AVEXAM-59776"],
-      explanation: "",
-    },
-    IuLPinEc: {
-      id: "IuLPinEc",
-      type: "simple",
-      question:
-        "Given:\n\n- Distance from departure to destination: 220 NM\n\n- True track: 175°\n\n- W/V: 220/10\n\n- TAS: 135 kts\n\nWhat is the distance of the PET from the departure point?",
-      options: [
-        {
-          id: "ATOMJMEP0Q",
-          text: "116 NM",
-          correct: true,
-          why: "",
-        },
-        {
-          id: "AJVCY9JRBF",
-          text: "110 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "AMWSCBTU2W",
-          text: "103 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "AGRNFRON5V",
-          text: "136 NM",
-          correct: false,
-          why: "",
-        },
-      ],
-      annexes: [],
-      externalIds: ["AVEXAM-81445"],
-      explanation: "",
-    },
-    CogOyrDj: {
-      id: "CogOyrDj",
-      type: "simple",
-      question:
-        "Given:\n\n- Distance from departure to destination: 315 NM\n\n- True track: 343°\n\n- W/V: 015/15\n\n- TAS: 100 kt\n\nWhat is the distance of the PET from the departure point?",
-      options: [
-        {
-          id: "AI1TT12QM6",
-          text: "177 NM",
-          correct: true,
-          why: "",
-        },
-        {
-          id: "A77YHH63D5",
-          text: "148 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "ARONIX7NBI",
-          text: "167 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "AZLEP3EFRX",
-          text: "139 NM",
-          correct: false,
-          why: "",
-        },
-      ],
-      annexes: [],
-      externalIds: ["AVEXAM-48597"],
-      explanation: "",
-    },
-    aSjx33Or: {
-      id: "aSjx33Or",
-      type: "simple",
-      question:
-        "Given:\n\n- Distance from departure to destination: 180 NM\n\n- True track: 310°\n\n- W/V: 010/20\n\n- TAS: 115 kt\n\nWhat is the distance of the PET from the departure point?",
-      options: [
-        {
-          id: "A745Y2O2F6",
-          text: "98 NM",
-          correct: true,
-          why: "",
-        },
-        {
-          id: "A7OPVIJIPH",
-          text: "92 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "A4B4ANZNLS",
-          text: "82 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "AY0JK34KVL",
-          text: "90 NM",
-          correct: false,
-          why: "",
-        },
-      ],
-      annexes: [],
-      externalIds: ["AVEXAM-29640"],
-      explanation: "",
-    },
-    ugzlSmao: {
-      id: "ugzlSmao",
-      type: "simple",
-      question:
-        "Given:\n\n- Distance from departure to destination: 500 NM\n\n- True track: 090°\n\n- Wind: 090/20\n\n- TAS: 150 kt\n\nWhat is the distance and time of the PET from the departure point?",
-      options: [
-        {
-          id: "AI83JVWUPT",
-          text: "Distance: 283 NM; Time: 131 min.",
-          correct: true,
-          why: "",
-        },
-        {
-          id: "ALR6JL9PY8",
-          text: "Distance: 382 NM; Time: 176 min.",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "AGPN1WXQQT",
-          text: "Distance: 250 NM; Time: 88 min.",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "A8MVILCTV9",
-          text: "Distance: 217 NM; Time: 100 min.",
-          correct: false,
-          why: "",
-        },
-      ],
-      annexes: [],
-      externalIds: ["AVEXAM-44076"],
-      explanation: "",
-    },
-    Sl0w03TE: {
-      id: "Sl0w03TE",
-      type: "simple",
-      question:
-        "Given:\n\n- Distance from departure to destination: 1&nbsp;000 NM\n\n- Safe Endurance: 4 hrs\n\n- TAS: 500 kt\n\n- Ground speed out: 550 kt\n\n- Ground speed home: 450 kt\n\nWhat is the distance of the PSR from the departure point?",
-      options: [
-        {
-          id: "AWCJWF34DY",
-          text: "990 NM",
-          correct: true,
-          why: "",
-        },
-        {
-          id: "AI9MI927QZ",
-          text: "450 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "AD63OXPBF6",
-          text: "10 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "ATFIVLQNXD",
-          text: "495 NM",
-          correct: false,
-          why: "",
-        },
-      ],
-      annexes: [],
-      externalIds: ["AVEXAM-66958"],
-      explanation: "",
-    },
-    ra0ukv2X: {
-      id: "ra0ukv2X",
-      type: "simple",
-      question:
-        "Given:\n\n- Distance from departure to destination: 5&nbsp;000 NM\n\n- Safe Endurance: 10 hrs\n\n- TAS: 450 kts\n\n- Ground speed Out: 500 kts\n\n- Ground speed Home: 400 kts\n\nWhat is the distance of the PSR from the departure point?",
-      options: [
-        {
-          id: "AHJPD4DQN7",
-          text: "2&nbsp;222 NM",
-          correct: true,
-          why: "",
-        },
-        {
-          id: "AAMMLSFYN8",
-          text: "2&nbsp;778 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "A0ANXEOM9S",
-          text: "2&nbsp;500 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "ARKIY6TYHI",
-          text: "1&nbsp;111 NM",
-          correct: false,
-          why: "",
-        },
-      ],
-      annexes: [],
-      externalIds: ["AVEXAM-30254"],
-      explanation: "",
-    },
-    suSavYHa: {
-      id: "suSavYHa",
-      type: "simple",
-      question:
-        "Given:\n\n- Distance from departure to destination: 2&nbsp;000 NM\n\n- Safe Endurance: 5 h\n\n- TAS: 500 kt\n\n- Ground speed out: 480 kt\n\n- Ground speed home: 520 kt\n\nWhat is the distance of the PSR from the departure point?",
-      options: [
-        {
-          id: "ACJCB2DKDI",
-          text: "1&nbsp;248 NM",
-          correct: true,
-          why: "",
-        },
-        {
-          id: "A7NRE9PQVK",
-          text: "1&nbsp;040 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "A897FR4L5Y",
-          text: "752 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "AYMWPU7W1A",
-          text: "624 NM",
-          correct: false,
-          why: "",
-        },
-      ],
-      annexes: [],
-      externalIds: ["AVEXAM-84260"],
-      explanation: "",
-    },
-    EgWhwH8U: {
-      id: "EgWhwH8U",
-      type: "simple",
-      question:
-        "Given:\n\n- Distance from departure to destination: 2&nbsp;450 NM\n\n- Safe Endurance: 7.5 hrs\n\n- TAS: 410 kt\n\n- Ground speed out: 360 kt\n\n- Ground speed home: 460 kt\n\nWhat is the time of the PSR from the departure point?",
-      options: [
-        {
-          id: "ACB9LPCD7J",
-          text: "252 min",
-          correct: true,
-          why: "",
-        },
-        {
-          id: "A9JVZQRH9D",
-          text: "198 min",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "AE24OH76HX",
-          text: "111 min",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "AJLOQQ47WI",
-          text: "156 min",
-          correct: false,
-          why: "",
-        },
-      ],
-      annexes: [],
-      externalIds: ["AVEXAM-45276"],
-      explanation: "",
-    },
-    yUcLvvTw: {
-      id: "yUcLvvTw",
-      type: "simple",
-      question:
-        "Given:\n\n- Distance from departure to destination: 3&nbsp;000 NM\n\n- Safe endurance: 8 h\n\n- TAS: 520 kt\n\n- Ground speed out: 600 kt\n\n- Ground speed home: 440 kt\n\nWhat is the time of the PSR from the departure point?",
-      options: [
-        {
-          id: "A01NQS4YVH",
-          text: "203 min",
-          correct: true,
-          why: "",
-        },
-        {
-          id: "AJBVO889W8",
-          text: "277 min",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "AUBYM7WSRO",
-          text: "173 min",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "A4HIIKV0ZQ",
-          text: "117 min",
-          correct: false,
-          why: "",
-        },
-      ],
-      annexes: [],
-      externalIds: ["AVEXAM-40028"],
-      explanation: "",
-    },
-    JSZR6yEP: {
-      id: "JSZR6yEP",
-      type: "simple",
-      question:
-        "Given:\n\n- Distance from departure to destination: 1&nbsp;500 NM\n\n- Safe Endurance: 4.5 hrs\n\n- TAS: 450 kts\n\n- Ground speed out: 480 kts\n\n- Ground speed home: 410 kts\n\nWhat is the time of the PSR from the departure point?",
-      options: [
-        {
-          id: "AIHJKYQ1A2",
-          text: "124 min",
-          correct: true,
-          why: "",
-        },
-        {
-          id: "ACFNN41O2I",
-          text: "63 min",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "AZQGJ91J4N",
-          text: "101 min",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "ADL06XR8JL",
-          text: "66 min",
-          correct: false,
-          why: "",
-        },
-      ],
-      annexes: [],
-      externalIds: ["AVEXAM-65938"],
-      explanation: "",
-    },
-    EKTlFMgD: {
-      id: "EKTlFMgD",
-      type: "simple",
-      question:
-        "Given:\n\n- Distance from departure to destination: 300 NM\n\n- Safe endurance: 4 hrs\n\n- TAS: 110 kts\n\n- Ground speed out: 120 kts\n\n- Ground speed home: 100 kts\n\nWhat is the distance of the PSR from the departure point?",
-      options: [
-        {
-          id: "A7N2ML4CDS",
-          text: "218 NM",
-          correct: true,
-          why: "",
-        },
-        {
-          id: "AXKDX3H521",
-          text: "109 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "ARQ7VB1VTY",
-          text: "136 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "AF6SCDY371",
-          text: "82 NM",
-          correct: false,
-          why: "",
-        },
-      ],
-      annexes: [],
-      externalIds: ["AVEXAM-21992"],
-      explanation: "",
-    },
-    g6DvPK92: {
-      id: "g6DvPK92",
-      type: "simple",
-      question:
-        "Given:\n\n- Distance from departure to destination: 400 NM\n\n- Safe Endurance: 2.5 h\n\n- TAS: 115 kt\n\n- Ground speed Out: 130 kt\n\n- Ground speed Home: 105 kt\n\nWhat is the distance of the PSR from the departure point?",
-      options: [
-        {
-          id: "AQ0RRRHVDN",
-          text: "145 NM",
-          correct: true,
-          why: "",
-        },
-        {
-          id: "ATVZPI1756",
-          text: "73 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "AA47QZM0A6",
-          text: "179 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "A6K6N5ZHUZ",
-          text: "255 NM",
-          correct: false,
-          why: "",
-        },
-      ],
-      annexes: [],
-      externalIds: ["AVEXAM-90113"],
-      explanation: "",
-    },
-    RZqKhd8y: {
-      id: "RZqKhd8y",
-      type: "simple",
-      question:
-        "Given:\n\n- Distance from departure to destination: 500 NM\n\n- Safe Endurance: 4 hrs\n\n- TAS: 140 kt\n\n- Ground speed Out: 150 kt\n\n- Ground speed Home: 130 kt\n\nWhat is the distance and time of the PSR from the departure point?",
-      options: [
-        {
-          id: "AIP1JDUC94",
-          text: "Distance: 279 NM; Time: 111 min.",
-          correct: true,
-          why: "",
-        },
-        {
-          id: "ANIM2MAAF1",
-          text: "Distance: 139 NM; Time: 60 min.",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "AYSR4EY0YL",
-          text: "Distance: 221 NM; Time: 89 min.",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "AR77XCUI3Q",
-          text: "Distance: 232 NM; Time: 107 min.",
-          correct: false,
-          why: "",
-        },
-      ],
-      annexes: [],
-      externalIds: ["AVEXAM-2578"],
-      explanation: "",
-    },
-    gK8FPsZ4: {
-      id: "gK8FPsZ4",
-      type: "simple",
-      question:
-        "Given:\n\n- Distance from departure to destination: 150 NM\n\n- Safe Endurance: 3.2 hrs\n\n- TAS: 90 kt\n\n- Ground speed out: 100 kt\n\n- Ground speed home: 80 kt\n\nWhat is the distance and time of the PSR from the departure point?",
-      options: [
-        {
-          id: "AGETUA3N7I",
-          text: "Distance: 142 NM; Time: 85 min.",
-          correct: true,
-          why: "",
-        },
-        {
-          id: "ALU4U4KQS9",
-          text: "Distance: 67 NM; Time: 50 min.",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "AM1O24ONP2",
-          text: "Distance: 71 NM; Time: 47 min.",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "A68EM5EAQC",
-          text: "Distance: 8 NM; Time: 5 min.",
-          correct: false,
-          why: "",
-        },
-      ],
-      annexes: [],
-      externalIds: ["AVEXAM-57611"],
-      explanation: "",
-    },
-    E7W6Dh16: {
-      id: "E7W6Dh16",
-      type: "simple",
-      question:
-        "Given:\n\n- Distance from departure to destination: 240 NM\n\n- Safe endurance: 3.5 h\n\n- TAS: 125 kt\n\n- Ground speed out: 110 kt\n\n- Ground speed home: 140 kt\n\nWhat is the distance and time of the PSR from the departure point?",
-      options: [
-        {
-          id: "A86C3VV2LS",
-          text: "Distance: 216 NM; Time: 118 min.",
-          correct: true,
-          why: "",
-        },
-        {
-          id: "ACWZ3DS81W",
-          text: "Distance: 24 NM; Time: 13 min.",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "AIGWM1PF4G",
-          text: "Distance: 108 NM; Time: 52 min.",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "AVD7028C8Q",
-          text: "Distance: 134 NM; Time: 58 min.",
-          correct: false,
-          why: "",
-        },
-      ],
-      annexes: [],
-      externalIds: ["AVEXAM-50585"],
-      explanation: "",
-    },
-    g4qX88aZ: {
-      id: "g4qX88aZ",
-      type: "simple",
-      question:
-        "Given:\n\n- Distance from departure to destination: 950 NM\n\n- Safe Endurance: 3.5 hrs\n\n- TAS: 360 kt\n\n- Ground speed Out: 320 kt\n\n- Ground speed Home: 400 kt\n\nWhat is the distance and time of the PSR from the departure point?",
-      options: [
-        {
-          id: "AA7DL54QJY",
-          text: "Distance: 622 NM; Time: 117 min.",
-          correct: true,
-          why: "",
-        },
-        {
-          id: "AVN2465HYD",
-          text: "Distance: 311 NM; Time: 52 min.",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "A7RRTUXJ06",
-          text: "Distance: 528 NM; Time: 79 min.",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "AO9HSUPRKO",
-          text: "Distance: 328 NM; Time: 62 min.",
-          correct: false,
-          why: "",
-        },
-      ],
-      annexes: [],
-      externalIds: ["AVEXAM-30369"],
-      explanation: "",
-    },
-    iNJdivmA: {
-      id: "iNJdivmA",
-      type: "simple",
-      question:
-        "Given:\n\n- Distance from departure to destination: 180 NM\n\n- Safe Endurance: 2 hrs\n\n- TAS: 120 k\n\n- Ground speed out: 135 kt\n\n- Ground speed home: 105 kt\n\nWhat is the distance and time of the PSR from the departure point?",
-      options: [
-        {
-          id: "A8GOR7ZPKI",
-          text: "Distance: 118 NM; Time: 53 min.",
-          correct: true,
-          why: "",
-        },
-        {
-          id: "AXNZY03KAK",
-          text: "Distance: 62 NM; Time: 28 min.",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "A5GR36VXFI",
-          text: "Distance: 59 NM; Time: 30 min.",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "A60S9EASST",
-          text: "Distance: 79 NM; Time: 45 min.",
-          correct: false,
-          why: "",
-        },
-      ],
-      annexes: [],
-      externalIds: ["AVEXAM-61142"],
-      explanation: "",
-    },
-    RCHmoFoV: {
-      id: "RCHmoFoV",
-      type: "simple",
-      question:
-        "Given:\n\n- Distance from departure to destination: 200 NM\n\n- Safe Endurance: 3 h\n\n- TAS: 130 kt\n\n- Ground speed out: 150 kt\n\n- Ground speed home: 110 kt\n\nWhat is the distance PSR from the departure point?",
-      options: [
-        {
-          id: "A0AZ5SPQLR",
-          text: "190 NM",
-          correct: true,
-          why: "",
-        },
-        {
-          id: "AXB7R2TEHD",
-          text: "10 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "AYQQFMLYX5",
-          text: "95 NM",
-          correct: false,
-          why: "",
-        },
-        {
-          id: "AGHZ710C2I",
-          text: "85 NM",
-          correct: false,
-          why: "",
-        },
-      ],
-      annexes: [],
-      externalIds: ["AVEXAM-76789"],
-      explanation: "",
-    },
-  },
-};
diff --git a/libs/core/redux/src/actions/test-actions.ts b/libs/core/redux/src/actions/test-actions.ts
deleted file mode 100644
index efa684352..000000000
--- a/libs/core/redux/src/actions/test-actions.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { createAction } from "@reduxjs/toolkit";
-import type {
-  QuestionId,
-  QuestionOptionId,
-  Test,
-} from "@chair-flight/base/types";
-
-export const addTest = createAction<{ test: Test }>("tests/test-added");
-export const startTest = createAction<{ testId: string }>("tests/started");
-export const finishTest = createAction<{ testId: string }>("tests/finished");
-
-export const answerTestQuestion = createAction<{
-  testId: string;
-  questionId: QuestionId;
-  optionId: QuestionOptionId;
-}>("tests/question-answered");
-
-export const navigateToTestQuestion = createAction<{
-  testId: string;
-  questionId: QuestionId;
-}>("tests/navigate-to-question");
-
-export const tickTestTime = createAction<{
-  testId: string;
-  timeSpentInMs: number;
-}>("tests/tick-time");
diff --git a/libs/core/redux/src/actions/user-preferences-actions.ts b/libs/core/redux/src/actions/user-preferences-actions.ts
deleted file mode 100644
index b8beb4063..000000000
--- a/libs/core/redux/src/actions/user-preferences-actions.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { createAction } from "@reduxjs/toolkit";
-
-export const setExamModeAutoSkip = createAction<{
-  value: boolean;
-}>("user-preferences/exam-mode-auto-skip");
-
-export const setStudyModeAutoSkip = createAction<{
-  value: boolean;
-}>("user-preferences/study-mode-auto-skip");
diff --git a/libs/core/redux/src/hooks/use-test-hotkeys.ts b/libs/core/redux/src/hooks/use-test-hotkeys.ts
deleted file mode 100644
index 4f5e9764e..000000000
--- a/libs/core/redux/src/hooks/use-test-hotkeys.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import { useHotkeys } from "react-hotkeys-hook";
-import * as actions from "../actions/test-actions";
-import { useAppDispatch, useAppSelector } from "../store/store";
-
-export const useTestHotkeys = ({ testId }: { testId: string }) => {
-  const dispatch = useAppDispatch();
-  const test = useAppSelector((state) => state.testProgress.tests[testId]);
-  const currentQuestion = test.questions[test.currentQuestionIndex];
-  const selectOption = (optionIndex: number) => {
-    dispatch(
-      actions.answerTestQuestion({
-        testId: test.id,
-        questionId: currentQuestion.questionId,
-        optionId: currentQuestion.options[optionIndex].id,
-      }),
-    );
-  };
-
-  const navigateToIndex = (questionIndex: number) => {
-    const questionId = test.questions[questionIndex]?.questionId;
-    if (!questionId) return;
-    dispatch(
-      actions.navigateToTestQuestion({
-        testId: test.id,
-        questionId,
-      }),
-    );
-  };
-
-  useHotkeys("left", () => navigateToIndex(test.currentQuestionIndex - 1));
-  useHotkeys("right", () => navigateToIndex(test.currentQuestionIndex + 1));
-  useHotkeys("up", () => navigateToIndex(test.currentQuestionIndex - 1));
-  useHotkeys("down", () => navigateToIndex(test.currentQuestionIndex + 1));
-
-  useHotkeys("a", () => selectOption(0));
-  useHotkeys("b", () => selectOption(1));
-  useHotkeys("c", () => selectOption(2));
-  useHotkeys("d", () => selectOption(3));
-  useHotkeys("1", () => selectOption(0));
-  useHotkeys("2", () => selectOption(1));
-  useHotkeys("3", () => selectOption(2));
-  useHotkeys("4", () => selectOption(3));
-};
diff --git a/libs/core/redux/src/index.ts b/libs/core/redux/src/index.ts
deleted file mode 100644
index 6a99f6558..000000000
--- a/libs/core/redux/src/index.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import * as testActions from "./actions/test-actions";
-import { useTestHotkeys } from "./hooks/use-test-hotkeys";
-import { ReduxProvider } from "./provider/redux-provider";
-import { useAppDispatch, useAppSelector } from "./store/store";
-
-const actions = {
-  ...testActions,
-};
-
-export {
-  actions,
-  ReduxProvider,
-  useAppDispatch,
-  useAppSelector,
-  useTestHotkeys,
-};
diff --git a/libs/core/redux/src/provider/redux-provider.tsx b/libs/core/redux/src/provider/redux-provider.tsx
deleted file mode 100644
index 941c6225e..000000000
--- a/libs/core/redux/src/provider/redux-provider.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import { FunctionComponent, PropsWithChildren, useState } from "react";
-import { Provider } from "react-redux";
-import { NoSsr } from "@mui/base";
-import { PersistGate } from "redux-persist/integration/react";
-import { getStoreAndPersistor } from "../store/store";
-
-export type ReduxProviderProps = PropsWithChildren<{
-  loading: React.ReactNode;
-}>;
-
-const ReduxProviderClientOnly: FunctionComponent<ReduxProviderProps> = ({
-  loading,
-  children,
-}) => {
-  const [{ store, persistor }] = useState(getStoreAndPersistor);
-  return (
-    <Provider store={store}>
-      <PersistGate loading={loading} persistor={persistor}>
-        {children}
-      </PersistGate>
-    </Provider>
-  );
-};
-
-export const ReduxProvider: FunctionComponent<ReduxProviderProps> = (props) => (
-  <NoSsr fallback={props.loading}>
-    <ReduxProviderClientOnly {...props} />
-  </NoSsr>
-);
diff --git a/libs/core/redux/src/reducers/test-progress-reducer.ts b/libs/core/redux/src/reducers/test-progress-reducer.ts
deleted file mode 100644
index 07c39e9e7..000000000
--- a/libs/core/redux/src/reducers/test-progress-reducer.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-import { createReducer } from "@reduxjs/toolkit";
-import { InvalidStoreState } from "@chair-flight/base/errors";
-import {
-  addTest,
-  answerTestQuestion,
-  finishTest,
-  navigateToTestQuestion,
-  startTest,
-  tickTestTime,
-} from "../actions/test-actions";
-import {
-  setExamModeAutoSkip,
-  setStudyModeAutoSkip,
-} from "../actions/user-preferences-actions";
-import type { Test } from "@chair-flight/base/types";
-
-export type TestProgressReducer = {
-  tests: Record<string, Test>;
-  examModeAutoSkip: boolean;
-  studyModeAutoSkip: boolean;
-};
-
-export const testProgressReducer = createReducer<TestProgressReducer>(
-  {
-    tests: {},
-    examModeAutoSkip: false,
-    studyModeAutoSkip: false,
-  },
-  (builder) => {
-    builder
-      .addCase(addTest, (store, action) => {
-        const { test } = action.payload;
-        store.tests[test.id] = test;
-      })
-      .addCase(startTest, (store, action) => {
-        const { testId } = action.payload;
-        const test = store.tests[testId];
-        if (!test) {
-          throw new InvalidStoreState(`Test ${testId} not found`, action);
-        }
-        test.startedAtEpochMs = Date.now();
-        test.status = "started";
-      })
-      .addCase(answerTestQuestion, (store, action) => {
-        const { testId, questionId, optionId } = action.payload;
-        const test = store.tests[testId];
-        const question = test.questions.find(
-          (q) => q.questionId === questionId,
-        );
-        if (!question) {
-          throw new InvalidStoreState(
-            `Question ${questionId} not found in test ${testId}`,
-            action,
-          );
-        }
-        question.selectedOptionId = optionId;
-
-        switch (test.mode) {
-          case "exam":
-            if (store.examModeAutoSkip) {
-              test.currentQuestionIndex = Math.min(
-                test.currentQuestionIndex + 1,
-                test.questions.length - 1,
-              );
-            }
-            return;
-          case "study":
-            if (store.studyModeAutoSkip) {
-              test.currentQuestionIndex = Math.min(
-                test.currentQuestionIndex + 1,
-                test.questions.length - 1,
-              );
-            }
-            return;
-        }
-      })
-      .addCase(navigateToTestQuestion, (store, action) => {
-        const { testId, questionId } = action.payload;
-        const test = store.tests[testId];
-        const questionIndex = test.questions.findIndex(
-          (q) => q.questionId === questionId,
-        );
-        if (questionIndex === -1) {
-          throw new InvalidStoreState(
-            `Question ${questionId} not found in test ${testId}`,
-            action,
-          );
-        }
-        test.currentQuestionIndex = questionIndex;
-      })
-      .addCase(tickTestTime, (store, action) => {
-        const { testId, timeSpentInMs } = action.payload;
-        const test = store.tests[testId];
-        test.timeSpentInMs += timeSpentInMs;
-      })
-      .addCase(finishTest, (store, action) => {
-        const { testId } = action.payload;
-        const test = store.tests[testId];
-        test.status = "finished";
-        test.finishedAtEpochMs = Date.now();
-      })
-      .addCase(setExamModeAutoSkip, (store, action) => {
-        store.examModeAutoSkip = action.payload.value;
-      })
-      .addCase(setStudyModeAutoSkip, (store, action) => {
-        store.studyModeAutoSkip = action.payload.value;
-      });
-  },
-);
diff --git a/libs/core/redux/src/store/store.ts b/libs/core/redux/src/store/store.ts
deleted file mode 100644
index 01412f49b..000000000
--- a/libs/core/redux/src/store/store.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-import { useDispatch, useSelector, useStore } from "react-redux";
-import { combineReducers, configureStore } from "@reduxjs/toolkit";
-import {
-  FLUSH,
-  PAUSE,
-  PERSIST,
-  PURGE,
-  REGISTER,
-  REHYDRATE,
-  persistReducer,
-  persistStore,
-} from "redux-persist";
-import { default as createWebStorage } from "redux-persist/lib/storage/createWebStorage";
-import { testProgressReducer } from "../reducers/test-progress-reducer";
-import type { TypedUseSelectorHook } from "react-redux";
-
-export const getStoreAndPersistor = () => {
-  const combinedReducer = combineReducers({
-    testProgress: testProgressReducer,
-  });
-
-  const storage = createWebStorage("local");
-
-  const persistedReducer = persistReducer(
-    {
-      key: "root",
-      version: 1,
-      storage,
-    },
-    combinedReducer,
-  );
-
-  const store = configureStore({
-    reducer: persistedReducer,
-    middleware: (getDefaultMiddleware) =>
-      getDefaultMiddleware({
-        serializableCheck: {
-          ignoredActions: [FLUSH, REHYDRATE, PAUSE, PERSIST, PURGE, REGISTER],
-        },
-      }),
-  });
-  const persistor = persistStore(store);
-  return { store, persistor };
-};
-
-type Store = ReturnType<typeof getStoreAndPersistor>["store"];
-type RootState = ReturnType<Store["getState"]>;
-type AppDispatch = Store["dispatch"];
-
-export const useAppDispatch: () => AppDispatch = useDispatch;
-export const useAppSelector: TypedUseSelectorHook<RootState> = useSelector;
-export const useAppStore = () => useStore<RootState>();
diff --git a/libs/core/redux/tsconfig.json b/libs/core/redux/tsconfig.json
deleted file mode 100644
index 4cbb8be30..000000000
--- a/libs/core/redux/tsconfig.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "extends": "../../../tsconfig.base.json",
-  "compilerOptions": {
-    "jsx": "preserve"
-  },
-  "references": [
-    {
-      "path": "./tsconfig.lib.json"
-    },
-    {
-      "path": "./tsconfig.test.json"
-    }
-  ]
-}
diff --git a/libs/core/redux/tsconfig.lib.json b/libs/core/redux/tsconfig.lib.json
deleted file mode 100644
index 82f72370c..000000000
--- a/libs/core/redux/tsconfig.lib.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "compilerOptions": {},
-  "composite": true,
-  "include": ["src/**/*.ts"],
-  "exclude": ["src/**/*.spec.ts", "src/**/*.test.ts"]
-}
diff --git a/libs/core/redux/tsconfig.test.json b/libs/core/redux/tsconfig.test.json
deleted file mode 100644
index fc92eb6be..000000000
--- a/libs/core/redux/tsconfig.test.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "composite": true,
-  "include": ["vite.config.ts", "src/**/*.test.*"],
-  "compilerOptions": {
-    "types": ["vitest/globals"]
-  }
-}
diff --git a/libs/core/redux/vite.config.ts b/libs/core/redux/vite.config.ts
deleted file mode 100644
index 8cba7c663..000000000
--- a/libs/core/redux/vite.config.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/// <reference types="vitest" />
-import { defineConfig } from "vite";
-import viteTsConfigPaths from "vite-tsconfig-paths";
-
-export default defineConfig({
-  cacheDir: "../../../node_modules/.vite/core-redux",
-
-  plugins: [
-    viteTsConfigPaths({
-      root: "../../../",
-    }),
-  ],
-
-  test: {
-    globals: true,
-    cache: {
-      dir: "../../../node_modules/.vitest",
-    },
-    coverage: {
-      all: true,
-      provider: "istanbul",
-    },
-    include: ["src/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}"],
-  },
-});
diff --git a/libs/react/components/src/drawer/drawer.stories.tsx b/libs/react/components/src/drawer/drawer.stories.tsx
index c68e88ce3..08801d2dd 100644
--- a/libs/react/components/src/drawer/drawer.stories.tsx
+++ b/libs/react/components/src/drawer/drawer.stories.tsx
@@ -1,7 +1,7 @@
 import { useState } from "react";
 import { Button, Typography } from "@mui/joy";
 import { generateQuestionsForNavigation } from "../__utils__/generate-questions-for-navigation";
-import { TestQuestionNavigation } from "../test-question-navigation/test-question-navigation";
+import { QuestionNavigation } from "../question-navigation/question-navigation";
 import { Drawer } from "./drawer";
 import type { Meta, StoryObj } from "@storybook/react";
 
@@ -32,7 +32,7 @@ export const Playground: Story = {
         "Test question Navigation": (
           <>
             <Typography level="h4">Test Question Navigation</Typography>
-            <TestQuestionNavigation
+            <QuestionNavigation
               questions={generateQuestionsForNavigation(100, 14)}
             />
           </>
diff --git a/libs/react/components/src/header/header.stories.tsx b/libs/react/components/src/header/header.stories.tsx
index 24401dbb9..da1c32798 100644
--- a/libs/react/components/src/header/header.stories.tsx
+++ b/libs/react/components/src/header/header.stories.tsx
@@ -1,7 +1,7 @@
 import { Global, css } from "@emotion/react";
 import { Box, Typography } from "@mui/joy";
 import { generateQuestionsForNavigation } from "../__utils__/generate-questions-for-navigation";
-import { TestQuestionNavigation } from "../test-question-navigation";
+import { QuestionNavigation } from "../question-navigation";
 import { Header, useHeaderContext } from "./header";
 import type { Meta, StoryObj } from "@storybook/react";
 
@@ -18,7 +18,7 @@ const TestNavigationExample = () => {
   }
 
   return (
-    <TestQuestionNavigation
+    <QuestionNavigation
       questions={generateQuestionsForNavigation(40, 27)}
       currentId="13"
       onQuestionClicked={() => closeDrawer()}
diff --git a/libs/react/components/src/index.ts b/libs/react/components/src/index.ts
index 002998bcc..92dff3e30 100644
--- a/libs/react/components/src/index.ts
+++ b/libs/react/components/src/index.ts
@@ -22,7 +22,7 @@ export * from "./question-multiple-choice";
 export * from "./question-variant-preview";
 export * from "./skeleton";
 export * from "./test-preview";
-export * from "./test-question-navigation";
+export * from "./question-navigation";
 export * from "./test-question-result";
 export * from "./theme";
 export * from "./toaster";
diff --git a/libs/react/components/src/question-navigation/index.ts b/libs/react/components/src/question-navigation/index.ts
new file mode 100644
index 000000000..eeed7f34d
--- /dev/null
+++ b/libs/react/components/src/question-navigation/index.ts
@@ -0,0 +1 @@
+export * from "./question-navigation";
diff --git a/libs/react/components/src/test-question-navigation/test-question-navigation.stories.tsx b/libs/react/components/src/question-navigation/question-navigation.stories.tsx
similarity index 68%
rename from libs/react/components/src/test-question-navigation/test-question-navigation.stories.tsx
rename to libs/react/components/src/question-navigation/question-navigation.stories.tsx
index 3682ed699..7f8a56c93 100644
--- a/libs/react/components/src/test-question-navigation/test-question-navigation.stories.tsx
+++ b/libs/react/components/src/question-navigation/question-navigation.stories.tsx
@@ -1,16 +1,16 @@
 import { generateQuestionsForNavigation } from "../__utils__/generate-questions-for-navigation";
-import { TestQuestionNavigation } from "./test-question-navigation";
-import type { TestQuestionNavigationProps } from "./test-question-navigation";
+import { QuestionNavigation } from "./question-navigation";
+import type { QuestionNavigationProps } from "./question-navigation";
 import type { Meta, StoryObj } from "@storybook/react";
 
-type Story = StoryObj<typeof TestQuestionNavigation>;
+type Story = StoryObj<typeof QuestionNavigation>;
 
 export const Playground: Story = {
   args: {
     status: "in-progress",
     loading: false,
     questions:
-      "20 questions" as unknown as TestQuestionNavigationProps["questions"],
+      "20 questions" as unknown as QuestionNavigationProps["questions"],
     currentId: "13",
     sx: {
       width: "230px",
@@ -36,9 +36,9 @@ export const Playground: Story = {
   },
 };
 
-const meta: Meta<typeof TestQuestionNavigation> = {
-  title: "Components/TestQuestionNavigation",
-  component: TestQuestionNavigation,
+const meta: Meta<typeof QuestionNavigation> = {
+  title: "Components/QuestionNavigation",
+  component: QuestionNavigation,
   tags: ["autodocs"],
 };
 
diff --git a/libs/react/components/src/test-question-navigation/test-question-navigation.tsx b/libs/react/components/src/question-navigation/question-navigation.tsx
similarity index 97%
rename from libs/react/components/src/test-question-navigation/test-question-navigation.tsx
rename to libs/react/components/src/question-navigation/question-navigation.tsx
index 7bb6193f3..b6b74a6a5 100644
--- a/libs/react/components/src/test-question-navigation/test-question-navigation.tsx
+++ b/libs/react/components/src/question-navigation/question-navigation.tsx
@@ -85,7 +85,7 @@ const StyledBox = styled(Box)`
   }
 `;
 
-export type TestQuestionNavigationProps = {
+export type QuestionNavigationProps = {
   questions?: Array<{
     id: string;
     correctOption?: string;
@@ -98,9 +98,9 @@ export type TestQuestionNavigationProps = {
   onQuestionClicked?: (id: string, index: number) => void;
 } & Pick<BoxProps, "className" | "sx" | "style" | "component">;
 
-export const TestQuestionNavigation = forwardRef<
+export const QuestionNavigation = forwardRef<
   HTMLDivElement,
-  TestQuestionNavigationProps
+  QuestionNavigationProps
 >(
   (
     {
@@ -255,4 +255,4 @@ export const TestQuestionNavigation = forwardRef<
   },
 );
 
-TestQuestionNavigation.displayName = "TestQuestionNavigation";
+QuestionNavigation.displayName = "TestQuestionNavigation";
diff --git a/libs/react/components/src/test-question-navigation/index.ts b/libs/react/components/src/test-question-navigation/index.ts
deleted file mode 100644
index f7cd6e19e..000000000
--- a/libs/react/components/src/test-question-navigation/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./test-question-navigation";
diff --git a/libs/react/containers/src/index.ts b/libs/react/containers/src/index.ts
index 3b140b465..e69966fd8 100644
--- a/libs/react/containers/src/index.ts
+++ b/libs/react/containers/src/index.ts
@@ -3,10 +3,18 @@ export * from "./app-head";
 export * from "./app-header-menu";
 export * from "./app-transition";
 export * from "./home-page";
-export * from "./question-review";
-export * from "./question-preview-list";
+export * from "./questions/question-review";
+export * from "./questions/question-preview-list";
+export * from "./questions/question-search-demo";
+export * from "./tests/test-question-exam";
+export * from "./tests/test-question-navigation";
+export * from "./tests/test-question-study";
+export * from "./tests/test-maker";
+export * from "./tests/test-review";
+export * from "./tests/tests-overview";
+export * from "./tests/use-test-progress";
+export * from "./tests/use-test-progress-hotkeys";
+export * from "./tests/use-test-progress-time";
 export * from "./theme";
-export * from "./test-maker";
 export * from "./use-persistence";
 export * from "./use-form-history";
-export * from "./question-search-demo";
diff --git a/libs/react/containers/src/question-preview-list/index.ts b/libs/react/containers/src/questions/question-preview-list/index.ts
similarity index 100%
rename from libs/react/containers/src/question-preview-list/index.ts
rename to libs/react/containers/src/questions/question-preview-list/index.ts
diff --git a/libs/react/containers/src/question-preview-list/question-preview-list.tsx b/libs/react/containers/src/questions/question-preview-list/question-preview-list.tsx
similarity index 100%
rename from libs/react/containers/src/question-preview-list/question-preview-list.tsx
rename to libs/react/containers/src/questions/question-preview-list/question-preview-list.tsx
diff --git a/libs/react/containers/src/question-review/index.ts b/libs/react/containers/src/questions/question-review/index.ts
similarity index 100%
rename from libs/react/containers/src/question-review/index.ts
rename to libs/react/containers/src/questions/question-review/index.ts
diff --git a/libs/react/containers/src/question-review/question-review.stories.tsx b/libs/react/containers/src/questions/question-review/question-review.stories.tsx
similarity index 100%
rename from libs/react/containers/src/question-review/question-review.stories.tsx
rename to libs/react/containers/src/questions/question-review/question-review.stories.tsx
diff --git a/libs/react/containers/src/question-review/question-review.tsx b/libs/react/containers/src/questions/question-review/question-review.tsx
similarity index 100%
rename from libs/react/containers/src/question-review/question-review.tsx
rename to libs/react/containers/src/questions/question-review/question-review.tsx
diff --git a/libs/react/containers/src/question-search-demo/index.ts b/libs/react/containers/src/questions/question-search-demo/index.ts
similarity index 100%
rename from libs/react/containers/src/question-search-demo/index.ts
rename to libs/react/containers/src/questions/question-search-demo/index.ts
diff --git a/libs/react/containers/src/question-search-demo/question-search-demo.tsx b/libs/react/containers/src/questions/question-search-demo/question-search-demo.tsx
similarity index 100%
rename from libs/react/containers/src/question-search-demo/question-search-demo.tsx
rename to libs/react/containers/src/questions/question-search-demo/question-search-demo.tsx
diff --git a/libs/react/containers/src/test-maker/index.ts b/libs/react/containers/src/tests/test-maker/index.ts
similarity index 100%
rename from libs/react/containers/src/test-maker/index.ts
rename to libs/react/containers/src/tests/test-maker/index.ts
diff --git a/libs/react/containers/src/test-maker/test-maker.stories.tsx b/libs/react/containers/src/tests/test-maker/test-maker.stories.tsx
similarity index 95%
rename from libs/react/containers/src/test-maker/test-maker.stories.tsx
rename to libs/react/containers/src/tests/test-maker/test-maker.stories.tsx
index dba31743a..011b3c28b 100644
--- a/libs/react/containers/src/test-maker/test-maker.stories.tsx
+++ b/libs/react/containers/src/tests/test-maker/test-maker.stories.tsx
@@ -1,8 +1,7 @@
 import { Suspense } from "react";
 import { Box } from "@mui/joy";
 import { Toaster } from "@chair-flight/react/components";
-import { trpcMsw } from "@chair-flight/trpc/mock";
-import { mockSubjects } from "./__mocks__/subjects.mock";
+import { trpcMsw, mockSubjects } from "@chair-flight/trpc/mock";
 import { TestMaker } from "./test-maker";
 import type { Meta, StoryObj } from "@storybook/react";
 
diff --git a/libs/react/containers/src/test-maker/test-maker.tsx b/libs/react/containers/src/tests/test-maker/test-maker.tsx
similarity index 98%
rename from libs/react/containers/src/test-maker/test-maker.tsx
rename to libs/react/containers/src/tests/test-maker/test-maker.tsx
index f1bad1304..bbd993437 100644
--- a/libs/react/containers/src/test-maker/test-maker.tsx
+++ b/libs/react/containers/src/tests/test-maker/test-maker.tsx
@@ -19,7 +19,7 @@ import {
   toast,
 } from "@chair-flight/react/components";
 import { trpc } from "@chair-flight/trpc/client";
-import { createUsePersistenceHook } from "../use-persistence";
+import { createUsePersistenceHook } from "../../use-persistence";
 import type { Test } from "@chair-flight/base/types";
 import type { NewTestConfiguration } from "@chair-flight/core/app";
 import type { NestedCheckboxSelectProps } from "@chair-flight/react/components";
@@ -28,7 +28,7 @@ const resolver = zodResolver(newTestConfigurationSchema);
 const useSubjects = trpc.tests.getAllSubjects.useSuspenseQuery;
 const useCreateTest = trpc.tests.createTest.useMutation;
 const useTestMakerPersistence =
-  createUsePersistenceHook<NewTestConfiguration>("test-maker");
+  createUsePersistenceHook<NewTestConfiguration>("cf-test-maker");
 
 export type TestMakerProps = {
   onSuccessfulTestCreation: (test: Test) => void;
diff --git a/libs/react/containers/src/tests/test-question-exam/index.ts b/libs/react/containers/src/tests/test-question-exam/index.ts
new file mode 100644
index 000000000..da597ffc2
--- /dev/null
+++ b/libs/react/containers/src/tests/test-question-exam/index.ts
@@ -0,0 +1 @@
+export { TestQuestionExam } from "./test-question-exam";
diff --git a/libs/react/containers/src/tests/test-question-exam/test-question-exam.stories.tsx b/libs/react/containers/src/tests/test-question-exam/test-question-exam.stories.tsx
new file mode 100644
index 000000000..e69de29bb
diff --git a/libs/react/containers/src/tests/test-question-exam/test-question-exam.tsx b/libs/react/containers/src/tests/test-question-exam/test-question-exam.tsx
new file mode 100644
index 000000000..9b1b99ef8
--- /dev/null
+++ b/libs/react/containers/src/tests/test-question-exam/test-question-exam.tsx
@@ -0,0 +1,66 @@
+import {
+  QuestionBoxExam,
+  QuestionMultipleChoice,
+} from "@chair-flight/react/components";
+import { useTestProgress } from "../use-test-progress";
+import type { FunctionComponent } from "react";
+
+type TestQuestionExamProps = {
+  testId: string;
+};
+
+export const TestQuestionExam: FunctionComponent<TestQuestionExamProps> = ({
+  testId,
+}) => {
+  const test = useTestProgress((state) => state.tests[testId]);
+  const navigateToQuestion = useTestProgress((s) => s.navigateToTestQuestion);
+  const answerTestQuestion = useTestProgress((s) => s.answerTestQuestion);
+
+  if (!test) throw new Error(`Test with id ${testId} not found`);
+
+  const title = `Question ${test.currentQuestionIndex + 1} / ${
+    test.questions.length
+  }`;
+  const question = test.questions[test.currentQuestionIndex];
+
+  const questionMultipleChoice = (
+    <QuestionMultipleChoice
+      data-cy="question"
+      question={question.question}
+      status="in-progress"
+      selectedOptionId={question.selectedOptionId}
+      correctOptionId={question.correctOptionId}
+      onOptionClicked={(optionId) =>
+        answerTestQuestion({
+          optionId,
+          testId: test.id,
+          questionId: question.questionId,
+        })
+      }
+      options={question.options.map((opt) => ({
+        optionId: opt.id,
+        text: opt.text,
+      }))}
+    />
+  );
+
+  return (
+    <QuestionBoxExam
+      sx={{ width: "100%", maxHeight: "100%" }}
+      title={title}
+      timeSpentInMs={test.timeSpentInMs}
+      timeTotalInMs={test.durationInMs}
+      questionIndex={test.currentQuestionIndex}
+      totalQuestions={test.questions.length}
+      question={questionMultipleChoice}
+      onNavigationClick={(p) => {
+        const question = test.questions[p];
+        if (!question) return;
+        navigateToQuestion({
+          testId: test.id,
+          questionId: question.questionId,
+        });
+      }}
+    />
+  );
+};
diff --git a/libs/react/containers/src/tests/test-question-navigation/index.ts b/libs/react/containers/src/tests/test-question-navigation/index.ts
new file mode 100644
index 000000000..aac9113e4
--- /dev/null
+++ b/libs/react/containers/src/tests/test-question-navigation/index.ts
@@ -0,0 +1 @@
+export { TestQuestionNavigation } from "./test-question-navigation";
diff --git a/libs/react/containers/src/tests/test-question-navigation/test-question-navigation.tsx b/libs/react/containers/src/tests/test-question-navigation/test-question-navigation.tsx
new file mode 100644
index 000000000..ae983567d
--- /dev/null
+++ b/libs/react/containers/src/tests/test-question-navigation/test-question-navigation.tsx
@@ -0,0 +1,55 @@
+import { useRouter } from "next/router";
+import { Button } from "@mui/joy";
+import {
+  QuestionNavigation,
+  useHeaderContext,
+} from "@chair-flight/react/components";
+import { useTestProgress } from "../use-test-progress";
+import type { FunctionComponent } from "react";
+
+export type TestQuestionNavigationProps = {
+  testId: string;
+};
+
+export const TestQuestionNavigation: FunctionComponent<
+  TestQuestionNavigationProps
+> = ({ testId }) => {
+  const test = useTestProgress((state) => state.tests[testId]);
+  const router = useRouter();
+  const navigateToQuestion = useTestProgress((s) => s.navigateToTestQuestion);
+  const finishTest = useTestProgress((s) => s.finishTest);
+  const { closeDrawer } = useHeaderContext();
+
+  if (!test) throw new Error(`Test with id ${testId} not found`);
+
+  const question = test.questions[test.currentQuestionIndex];
+
+  return (
+    <>
+      <QuestionNavigation
+        sx={{ width: "100%" }}
+        status="in-progress-with-results"
+        pageSize={80}
+        currentId={question.questionId}
+        questions={test.questions.map((q) => ({
+          id: q.questionId,
+          selectedOption: q.selectedOptionId,
+          correctOption: q.correctOptionId,
+        }))}
+        onQuestionClicked={(questionId) => {
+          navigateToQuestion({ testId: test.id, questionId });
+          closeDrawer();
+        }}
+      />
+      <Button
+        fullWidth
+        sx={{ mt: 2 }}
+        children="Finish"
+        onClick={() => {
+          finishTest({ testId: test.id });
+          router.push(`/tests/${test.id}/review`);
+        }}
+      />
+    </>
+  );
+};
diff --git a/libs/react/containers/src/tests/test-question-study/index.ts b/libs/react/containers/src/tests/test-question-study/index.ts
new file mode 100644
index 000000000..6ed026514
--- /dev/null
+++ b/libs/react/containers/src/tests/test-question-study/index.ts
@@ -0,0 +1 @@
+export { TestQuestionStudy } from "./test-question-study";
diff --git a/libs/react/containers/src/tests/test-question-study/test-question-study.tsx b/libs/react/containers/src/tests/test-question-study/test-question-study.tsx
new file mode 100644
index 000000000..2cfb1e882
--- /dev/null
+++ b/libs/react/containers/src/tests/test-question-study/test-question-study.tsx
@@ -0,0 +1,78 @@
+import { useTheme } from "@mui/joy";
+import {
+  QuestionBoxExam,
+  QuestionBoxReview,
+  QuestionMultipleChoice,
+  useMediaQuery,
+} from "@chair-flight/react/components";
+import { useTestProgress } from "../use-test-progress";
+import type { FunctionComponent } from "react";
+
+type TestQuestionStudyProps = {
+  testId: string;
+};
+
+export const TestQuestionStudy: FunctionComponent<TestQuestionStudyProps> = ({
+  testId,
+}) => {
+  const theme = useTheme();
+  const isSmallScreen = useMediaQuery(theme.breakpoints.down("sm"));
+  const test = useTestProgress((state) => state.tests[testId]);
+  const navigateToQuestion = useTestProgress((s) => s.navigateToTestQuestion);
+  const answerTestQuestion = useTestProgress((s) => s.answerTestQuestion);
+
+  if (!test) throw new Error(`Test with id ${testId} not found`);
+
+  const title = `Question ${test.currentQuestionIndex + 1} / ${
+    test.questions.length
+  }`;
+  const question = test.questions[test.currentQuestionIndex];
+
+  const questionMultipleChoice = (
+    <QuestionMultipleChoice
+      data-cy="question"
+      question={question.question}
+      disabled={question.selectedOptionId !== undefined}
+      status={question.selectedOptionId ? "show-result" : "in-progress"}
+      selectedOptionId={question.selectedOptionId}
+      correctOptionId={question.correctOptionId}
+      onOptionClicked={(optionId) =>
+        answerTestQuestion({
+          optionId,
+          testId: test.id,
+          questionId: question.questionId,
+        })
+      }
+      options={question.options.map((opt) => ({
+        optionId: opt.id,
+        text: opt.text,
+      }))}
+    />
+  );
+
+  return isSmallScreen ? (
+    <QuestionBoxExam
+      sx={{ width: "100%", maxHeight: "100%" }}
+      title={title}
+      timeSpentInMs={test.timeSpentInMs}
+      timeTotalInMs={test.durationInMs}
+      questionIndex={test.currentQuestionIndex}
+      totalQuestions={test.questions.length}
+      onNavigationClick={(p) => {
+        const question = test.questions[p];
+        if (!question) return;
+        navigateToQuestion({
+          testId: test.id,
+          questionId: question.questionId,
+        });
+      }}
+      question={questionMultipleChoice}
+    />
+  ) : (
+    <QuestionBoxReview
+      sx={{ width: "100%", maxHeight: "100%" }}
+      title={title}
+      question={questionMultipleChoice}
+    />
+  );
+};
diff --git a/libs/react/containers/src/tests/test-review/index.ts b/libs/react/containers/src/tests/test-review/index.ts
new file mode 100644
index 000000000..0f9d725a3
--- /dev/null
+++ b/libs/react/containers/src/tests/test-review/index.ts
@@ -0,0 +1 @@
+export { TestReview } from "./test-review";
diff --git a/libs/react/containers/src/tests/test-review/test-review.tsx b/libs/react/containers/src/tests/test-review/test-review.tsx
new file mode 100644
index 000000000..75efeb9b2
--- /dev/null
+++ b/libs/react/containers/src/tests/test-review/test-review.tsx
@@ -0,0 +1,107 @@
+import { Box, CircularProgress, Typography } from "@mui/joy";
+import { DateTime } from "luxon";
+import { TestQuestionResult } from "@chair-flight/react/components";
+import { useTestProgress } from "../use-test-progress";
+import type { FunctionComponent } from "react";
+
+export type TestReviewProps = {
+  testId: string;
+};
+
+export const TestReview: FunctionComponent<TestReviewProps> = ({ testId }) => {
+  const test = useTestProgress((s) => s.tests[testId]);
+  const totalQuestions = test.questions.length;
+  const correctQuestions = test.questions.reduce(
+    (acc, q) => acc + (q.correctOptionId === q.selectedOptionId ? 1 : 0),
+    0,
+  );
+  const grade = Math.round((correctQuestions / totalQuestions) * 100);
+  const mainColor = grade >= 75 ? "success" : "danger";
+  const startTimeInEnglish =
+    test.startedAtEpochMs &&
+    DateTime.fromMillis(test.startedAtEpochMs).toFormat("DDD");
+  const timeSpent =
+    test.startedAtEpochMs &&
+    DateTime.fromMillis(test.startedAtEpochMs).toFormat("HH:mm:ss");
+
+  return (
+    <>
+      <Box
+        sx={{
+          height: "200px",
+          width: "100%",
+          bgcolor: `${mainColor}.softBg`,
+        }}
+      >
+        <Box
+          sx={{
+            maxWidth: 1300,
+            height: "100%",
+            p: 2,
+            mx: "auto",
+            display: "flex",
+            justifyContent: "space-between",
+          }}
+        >
+          <Box
+            sx={{
+              display: "flex",
+              height: "100%",
+              flexDirection: "column",
+              justifyContent: "flex-end",
+            }}
+          >
+            <Typography level="h4" component="h1">
+              Test results
+            </Typography>
+            <Typography level="body1" fontWeight={900}>
+              {[
+                test.id,
+                startTimeInEnglish,
+                timeSpent && `Time Spent: ${timeSpent}`,
+                `${correctQuestions}/${totalQuestions}`,
+              ]
+                .filter(Boolean)
+                .join(" | ")}
+            </Typography>
+          </Box>
+          <CircularProgress
+            determinate
+            value={grade}
+            children={`${grade}%`}
+            variant="outlined"
+            color={mainColor}
+            size="lg"
+            sx={{
+              "--CircularProgress-size": "120px",
+              "--CircularProgress-progressThickness": "12px",
+              "--CircularProgress-linecap": "butt",
+              m: 2,
+            }}
+          />
+        </Box>
+      </Box>
+      <Box component={"ul"} sx={{ maxWidth: 1300, px: 2, mx: "auto" }}>
+        {test.questions.map((question, i, arr) => (
+          <TestQuestionResult
+            key={question.questionId}
+            questionTemplateId={question.templateId}
+            questionVariantId={question.variantId}
+            sx={{ my: 1 }}
+            title={`${i + 1}/${arr.length}`}
+            question={question.question}
+            correct={question.selectedOptionId === question.correctOptionId}
+            correctOption={
+              question.options.find((o) => o.id === question.correctOptionId)
+                ?.text
+            }
+            selectedOption={
+              question.options.find((o) => o.id === question.selectedOptionId)
+                ?.text
+            }
+          />
+        ))}
+      </Box>
+    </>
+  );
+};
diff --git a/libs/react/containers/src/tests/tests-overview/index.ts b/libs/react/containers/src/tests/tests-overview/index.ts
new file mode 100644
index 000000000..12221ac02
--- /dev/null
+++ b/libs/react/containers/src/tests/tests-overview/index.ts
@@ -0,0 +1 @@
+export { TestsOverview } from "./tests-overview";
diff --git a/apps/next-app/pages/tests/components/tests-overview.tsx b/libs/react/containers/src/tests/tests-overview/tests-overview.tsx
similarity index 94%
rename from apps/next-app/pages/tests/components/tests-overview.tsx
rename to libs/react/containers/src/tests/tests-overview/tests-overview.tsx
index 02aaf37fa..0276a17ed 100644
--- a/apps/next-app/pages/tests/components/tests-overview.tsx
+++ b/libs/react/containers/src/tests/tests-overview/tests-overview.tsx
@@ -1,11 +1,11 @@
 import React from "react";
 import { Box, Grid, Link, Typography } from "@mui/joy";
-import { useAppSelector } from "@chair-flight/core/redux";
 import { AppLayout, TestPreview, Ups } from "@chair-flight/react/components";
+import { useTestProgress } from "../use-test-progress";
 import type { FunctionComponent } from "react";
 
-export const PreviewTests: FunctionComponent = () => {
-  const tests = useAppSelector((store) => store.testProgress.tests);
+export const TestsOverview: FunctionComponent = () => {
+  const tests = useTestProgress((s) => s.tests);
   const testsAsList = Object.values(tests).sort(
     (a, b) => b.createdAtEpochMs - a.createdAtEpochMs,
   );
diff --git a/libs/react/containers/src/tests/use-test-progress-hotkeys/index.ts b/libs/react/containers/src/tests/use-test-progress-hotkeys/index.ts
new file mode 100644
index 000000000..1d430b558
--- /dev/null
+++ b/libs/react/containers/src/tests/use-test-progress-hotkeys/index.ts
@@ -0,0 +1 @@
+export { useTestHotkeys } from "./use-test-progress-hotkeys";
diff --git a/libs/react/containers/src/tests/use-test-progress-hotkeys/use-test-progress-hotkeys.ts b/libs/react/containers/src/tests/use-test-progress-hotkeys/use-test-progress-hotkeys.ts
new file mode 100644
index 000000000..2696785f2
--- /dev/null
+++ b/libs/react/containers/src/tests/use-test-progress-hotkeys/use-test-progress-hotkeys.ts
@@ -0,0 +1,43 @@
+import { useHotkeys } from "react-hotkeys-hook";
+import { useTestProgress } from "../use-test-progress/use-test-progress";
+
+export const useTestHotkeys = ({ testId }: { testId: string }) => {
+  const getTest = useTestProgress((s) => s.getTest);
+  const answerQuestion = useTestProgress((s) => s.answerTestQuestion);
+  const navigateToQuestion = useTestProgress((s) => s.navigateToTestQuestion);
+
+  const selectOption = (optionIndex: number) => {
+    const test = getTest({ testId });
+    const currentQuestion = test.questions[test.currentQuestionIndex];
+    answerQuestion({
+      testId: test.id,
+      questionId: currentQuestion.questionId,
+      optionId: currentQuestion.options[optionIndex].id,
+    });
+  };
+
+  const navigateToIndex = (questionIndexDiff: number) => {
+    const test = getTest({ testId });
+    const questionIndex = test.currentQuestionIndex + questionIndexDiff;
+    const questionId = test.questions[questionIndex]?.questionId;
+    if (!questionId) return;
+    navigateToQuestion({
+      testId: test.id,
+      questionId,
+    });
+  };
+
+  useHotkeys("left", () => navigateToIndex(-1));
+  useHotkeys("right", () => navigateToIndex(1));
+  useHotkeys("up", () => navigateToIndex(-1));
+  useHotkeys("down", () => navigateToIndex(1));
+
+  useHotkeys("a", () => selectOption(0));
+  useHotkeys("b", () => selectOption(1));
+  useHotkeys("c", () => selectOption(2));
+  useHotkeys("d", () => selectOption(3));
+  useHotkeys("1", () => selectOption(0));
+  useHotkeys("2", () => selectOption(1));
+  useHotkeys("3", () => selectOption(2));
+  useHotkeys("4", () => selectOption(3));
+};
diff --git a/libs/react/containers/src/tests/use-test-progress-time/index.ts b/libs/react/containers/src/tests/use-test-progress-time/index.ts
new file mode 100644
index 000000000..b9f86975b
--- /dev/null
+++ b/libs/react/containers/src/tests/use-test-progress-time/index.ts
@@ -0,0 +1 @@
+export { useTestProgressTime } from "./use-test-progress-time";
diff --git a/libs/react/containers/src/tests/use-test-progress-time/use-test-progress-time.tsx b/libs/react/containers/src/tests/use-test-progress-time/use-test-progress-time.tsx
new file mode 100644
index 000000000..dc8a4ef8b
--- /dev/null
+++ b/libs/react/containers/src/tests/use-test-progress-time/use-test-progress-time.tsx
@@ -0,0 +1,38 @@
+import { useEffect } from "react";
+import { useRouter } from "next/router";
+import { useTestProgress } from "../use-test-progress";
+
+/**
+ * This hook has 3 side effects:
+ * 1) It starts the test if it's not started yet
+ * 2) It navigates away from the test once it's finished
+ * 3) It ticks the test timer every second
+ */
+export const useTestProgressTime = ({ testId }: { testId: string }) => {
+  const router = useRouter();
+  const getTest = useTestProgress((s) => s.getTest);
+  const startTest = useTestProgress((s) => s.startTest);
+  const tickTestTimer = useTestProgress((s) => s.tickTestTimer);
+
+  useEffect(() => {
+    const test = getTest({ testId });
+    if (test.status === "finished") {
+      router.push(`/tests/${test.id}/review`, undefined, { shallow: true });
+    }
+    if (test.status === "created") {
+      startTest({ testId: test.id });
+    }
+  }, [router, testId, getTest, startTest]);
+
+  useEffect(() => {
+    const test = getTest({ testId });
+    let lastTime = Date.now();
+    const interval = setInterval(() => {
+      const currentTime = Date.now();
+      const timeSpentInMs = currentTime - lastTime;
+      lastTime = currentTime;
+      tickTestTimer({ testId: test.id, timeSpentInMs });
+    }, 1000);
+    return () => clearInterval(interval);
+  }, [testId, getTest, tickTestTimer]);
+};
diff --git a/libs/react/containers/src/tests/use-test-progress/index.ts b/libs/react/containers/src/tests/use-test-progress/index.ts
new file mode 100644
index 000000000..d37fcb101
--- /dev/null
+++ b/libs/react/containers/src/tests/use-test-progress/index.ts
@@ -0,0 +1 @@
+export { useTestProgress } from "./use-test-progress";
diff --git a/libs/react/containers/src/tests/use-test-progress/use-test-progress.ts b/libs/react/containers/src/tests/use-test-progress/use-test-progress.ts
new file mode 100644
index 000000000..0e01c13e6
--- /dev/null
+++ b/libs/react/containers/src/tests/use-test-progress/use-test-progress.ts
@@ -0,0 +1,139 @@
+import { create } from "zustand";
+import { devtools, persist } from "zustand/middleware";
+import type { Test } from "@chair-flight/base/types";
+
+type TestProgress = {
+  tests: Record<string, Test>;
+  examModeAutoSkip: boolean;
+  studyModeAutoSkip: boolean;
+  getTest: (args: { testId: string }) => Test;
+  addTest: (args: { test: Test }) => void;
+  startTest: (args: { testId: string }) => void;
+  answerTestQuestion: (args: {
+    testId: string;
+    questionId: string;
+    optionId: string;
+  }) => void;
+  navigateToTestQuestion: (args: {
+    testId: string;
+    questionId: string;
+  }) => void;
+  tickTestTimer: (args: { testId: string; timeSpentInMs: number }) => void;
+  finishTest: (args: { testId: string }) => void;
+  setExamModeAutoSkip: (args: { enabled: boolean }) => void;
+  setStudyModeAutoSkip: (args: { enabled: boolean }) => void;
+};
+
+export const useTestProgress = create<TestProgress>()(
+  devtools(
+    persist(
+      (set, get) => ({
+        tests: {},
+        examModeAutoSkip: false,
+        studyModeAutoSkip: false,
+        getTest: ({ testId }) => {
+          const test = get().tests[testId];
+          if (!test) throw new Error(`Test ${testId} not found`);
+          return test;
+        },
+        addTest: ({ test }) => {
+          set({ tests: { ...get().tests, [test.id]: test } });
+        },
+        startTest: ({ testId }) => {
+          const test = get().tests[testId];
+          if (!test) throw new Error(`Test ${testId} not found`);
+          const newTest: Test = {
+            ...test,
+            startedAtEpochMs: Date.now(),
+            status: "started",
+          };
+          set({ tests: { ...get().tests, [testId]: newTest } });
+        },
+        answerTestQuestion: ({ testId, questionId, optionId }) => {
+          const test = get().tests[testId];
+          const question = test.questions.find(
+            (q) => q.questionId === questionId,
+          );
+          if (!question) {
+            throw new Error(
+              `Question ${questionId} not found in test ${testId}`,
+            );
+          }
+          question.selectedOptionId = optionId;
+
+          let currentQuestionIndex = test.currentQuestionIndex;
+          switch (test.mode) {
+            case "exam": {
+              if (get().examModeAutoSkip) {
+                currentQuestionIndex = Math.min(
+                  test.currentQuestionIndex + 1,
+                  test.questions.length - 1,
+                );
+              }
+              break;
+            }
+            case "study": {
+              if (get().studyModeAutoSkip) {
+                currentQuestionIndex = Math.min(
+                  test.currentQuestionIndex + 1,
+                  test.questions.length - 1,
+                );
+              }
+              break;
+            }
+          }
+          const newTest = {
+            ...test,
+            currentQuestionIndex,
+          };
+          set({ tests: { ...get().tests, [testId]: newTest } });
+        },
+        navigateToTestQuestion: ({ testId, questionId }) => {
+          const test = get().tests[testId];
+          const question = test.questions.find(
+            (q) => q.questionId === questionId,
+          );
+          if (!question) {
+            throw new Error(
+              `Question ${questionId} not found in test ${testId}`,
+            );
+          }
+          const newTest = {
+            ...test,
+            currentQuestionIndex: test.questions.indexOf(question),
+          };
+          set({ tests: { ...get().tests, [testId]: newTest } });
+        },
+        tickTestTimer: ({ testId, timeSpentInMs }) => {
+          const test = get().tests[testId];
+          if (!test) {
+            throw new Error(`Test ${testId} not found`);
+          }
+          const newTest = {
+            ...test,
+            timeSpentInMs: test.timeSpentInMs + timeSpentInMs,
+          };
+          set({ tests: { ...get().tests, [testId]: newTest } });
+        },
+        finishTest: ({ testId }) => {
+          const test = get().tests[testId];
+          if (!test) {
+            throw new Error(`Test ${testId} not found`);
+          }
+          const newTest: Test = {
+            ...test,
+            status: "finished",
+          };
+          set({ tests: { ...get().tests, [testId]: newTest } });
+        },
+        setExamModeAutoSkip: ({ enabled }) => {
+          set({ examModeAutoSkip: enabled });
+        },
+        setStudyModeAutoSkip: ({ enabled }) => {
+          set({ studyModeAutoSkip: enabled });
+        },
+      }),
+      { name: "cf-test-progress" },
+    ),
+  ),
+);
diff --git a/libs/react/containers/src/use-form-history/use-form-history.tsx b/libs/react/containers/src/use-form-history/use-form-history.tsx
index e65921558..c10ce8d01 100644
--- a/libs/react/containers/src/use-form-history/use-form-history.tsx
+++ b/libs/react/containers/src/use-form-history/use-form-history.tsx
@@ -54,7 +54,7 @@ const useFormHistoryZustand = create<FormPersistence<object>>()(
           }),
       })),
       {
-        name: "form-history",
+        name: "cf-form-history",
       },
     ),
   ),
diff --git a/libs/react/containers/src/use-user-voyage-flag/index.ts b/libs/react/containers/src/use-user-voyage-flag/index.ts
new file mode 100644
index 000000000..c2df45304
--- /dev/null
+++ b/libs/react/containers/src/use-user-voyage-flag/index.ts
@@ -0,0 +1 @@
+export { useUserVoyageFlag } from "./use-user-voyage-flag";
diff --git a/libs/react/containers/src/use-user-voyage-flag/use-user-voyage-flag.ts b/libs/react/containers/src/use-user-voyage-flag/use-user-voyage-flag.ts
index 560180f45..a4a9eb865 100644
--- a/libs/react/containers/src/use-user-voyage-flag/use-user-voyage-flag.ts
+++ b/libs/react/containers/src/use-user-voyage-flag/use-user-voyage-flag.ts
@@ -23,7 +23,7 @@ const useUserVoyageZustand = create<UserVoyageZustandStore>()(
           })),
         getData: (key: UserVoyageFlag) => get().data[key] ?? false,
       }),
-      { name: "user-voyage" },
+      { name: "cf-user-voyage" },
     ),
   ),
 );
diff --git a/libs/react/containers/tsconfig.json b/libs/react/containers/tsconfig.json
index ab0af7261..399aec831 100644
--- a/libs/react/containers/tsconfig.json
+++ b/libs/react/containers/tsconfig.json
@@ -8,6 +8,12 @@
     "../../../node_modules/@nx/react/typings/cssmodule.d.ts",
     "../../../node_modules/@nx/next/typings/image.d.ts"
   ],
-  "include": ["src/**/*.ts", "src/**/*.tsx"],
+  "include": [
+    "src/**/*.ts",
+    "src/**/*.tsx",
+    "src/tests/test-question-study",
+    "src/tests/test-question-navigation",
+    "src/tests/test-question-exam"
+  ],
   "exclude": ["node_modules", "src/**/*.spec.ts", "src/**/*.test.ts"]
 }
diff --git a/libs/react/containers/src/test-maker/__mocks__/subjects.mock.ts b/libs/trpc/mock/src/__mocks__/subjects.mock.ts
similarity index 100%
rename from libs/react/containers/src/test-maker/__mocks__/subjects.mock.ts
rename to libs/trpc/mock/src/__mocks__/subjects.mock.ts
diff --git a/libs/trpc/mock/src/__mocks__/test.mock.ts b/libs/trpc/mock/src/__mocks__/test.mock.ts
new file mode 100644
index 000000000..afaaebb2c
--- /dev/null
+++ b/libs/trpc/mock/src/__mocks__/test.mock.ts
@@ -0,0 +1,1683 @@
+import type { Test } from "@chair-flight/base/types";
+
+export const mockTest: Test = {
+  id: "PlfjmvaR",
+  title: "010 study",
+  status: "finished",
+  mode: "study",
+  currentQuestionIndex: 19,
+  timeSpentInMs: 199026,
+  durationInMs: 2400000,
+  questions: [
+    {
+      questionId: "7Sb6wMCE",
+      templateId: "Q7KSH158SR",
+      variantId: "EQ8LhYcg",
+      seed: "3xiPxtXm",
+      type: "multiple-choice",
+      question:
+        'If the crew on an arriving aircraft approaching a controlled aerodrome will report "field in sight", a clearance for "visual approach" may be given under certain conditions:',
+      annexes: [],
+      correctOptionId: "APCOYEC81S",
+      options: [
+        {
+          id: "APCOYEC81S",
+          text: "The air traffic controller will provide separation to other controlled traffic.",
+
+          why: "",
+        },
+        {
+          id: "A49QDRS5HZ",
+          text: "The meteorological visibility must not be less than 8 km.",
+
+          why: "",
+        },
+        {
+          id: "A6SA8WR64W",
+          text: "The approach must be passing the FAF.",
+
+          why: "",
+        },
+        {
+          id: "AWPU1GV86R",
+          text: "Continued approach will be according to VFR.",
+
+          why: "",
+        },
+      ],
+      explanation: "",
+      selectedOptionId: "APCOYEC81S",
+    },
+    {
+      questionId: "x6hQbble",
+      templateId: "QTJY91K6H7",
+      variantId: "ixQgwBv4",
+      seed: "3xiPxtXm",
+      type: "multiple-choice",
+      question:
+        "Rescue and fire-fighting (emergency) services provision is categorized according to physical characteristics of the type of aeroplane using the aerodrome\nThis classification is based upon",
+      annexes: [],
+      correctOptionId: "AGJ5LLU7LA",
+      options: [
+        {
+          id: "AGJ5LLU7LA",
+          text: "aeroplane overall length and fuselage width.",
+
+          why: "",
+        },
+        {
+          id: "ADOBBDVHKO",
+          text: "Maximum Landing Mass and maximum number of passengers.",
+
+          why: "",
+        },
+        {
+          id: "AWORDABZ5S",
+          text: "maximum number of passengers and crew.",
+
+          why: "",
+        },
+        {
+          id: "AIW6YI5RHK",
+          text: "aeroplane length and Maximum Take-off Mass.",
+
+          why: "",
+        },
+      ],
+      explanation: "",
+    },
+    {
+      questionId: "ZbflNDeu",
+      templateId: "QBVYY4C938",
+      variantId: "7c3DGfKz",
+      seed: "3xiPxtXm",
+      type: "multiple-choice",
+      question:
+        "A pattern 'B' runway-holding position marking at an intersection of a taxiway and a precision approach RWY shall be supplemented",
+      annexes: [],
+      correctOptionId: "ALQNV0DM4S",
+      options: [
+        {
+          id: "ALQNV0DM4S",
+          text: "with a category I, II or III holding position sign, as appropriate.",
+
+          why: "",
+        },
+        {
+          id: "AZNWZ1NH5C",
+          text: "with a category II or III holding position sign, though for CAT I runways a sign is NOT mandatory.",
+
+          why: "",
+        },
+        {
+          id: "ABDIK41Z31",
+          text: "only with a runway designation sign.",
+
+          why: "",
+        },
+        {
+          id: "AEWHQ4GTFS",
+          text: "with a taxiway designation sign.",
+
+          why: "",
+        },
+      ],
+      explanation: "",
+      selectedOptionId: "ABDIK41Z31",
+    },
+    {
+      questionId: "PAT3w6lN",
+      templateId: "Q3VR13C3QH",
+      variantId: "g46ThRJm",
+      seed: "3xiPxtXm",
+      type: "multiple-choice",
+      question: "An aircraft used for simulated instrument flying must have",
+      annexes: [],
+      correctOptionId: "A48UJH8O0C",
+      options: [
+        {
+          id: "A48UJH8O0C",
+          text: "a qualified safety pilot and fully functioning dual controls.",
+
+          why: "",
+        },
+        {
+          id: "AI5DBEWSF3",
+          text: "dual controls.",
+
+          why: "",
+        },
+        {
+          id: "AZAVI8J7QS",
+          text: "dual controls and a competent observer.",
+
+          why: "",
+        },
+        {
+          id: "ARN3I4R3E5",
+          text: "a competent observer in the front seat.",
+
+          why: "",
+        },
+      ],
+      explanation: "",
+    },
+    {
+      questionId: "LnPAQFZ8",
+      templateId: "QS8HP8YTS6",
+      variantId: "GWDdpJrb",
+      seed: "3xiPxtXm",
+      type: "multiple-choice",
+      question:
+        "Where should an airport display aircraft stand identification marking?",
+      annexes: [],
+      correctOptionId: "AB5W2BL7E8",
+      options: [
+        {
+          id: "AB5W2BL7E8",
+          text: "On any paved parking and de-icing area.",
+
+          why: "",
+        },
+        {
+          id: "A5ZCQXOAML",
+          text: "On any parking area and de-icing area.",
+
+          why: "",
+        },
+        {
+          id: "A15GN6SBL6",
+          text: "On any paved parking area.",
+
+          why: "",
+        },
+        {
+          id: "A8DASMPM7Z",
+          text: "On any parking area.",
+
+          why: "",
+        },
+      ],
+      explanation: "",
+    },
+    {
+      questionId: "b9bJ9OJZ",
+      templateId: "Q0MBACG3NT",
+      variantId: "Bcif8nEI",
+      seed: "3xiPxtXm",
+      type: "multiple-choice",
+      question:
+        "A series of red flashes from aerodrome control directed towards an aircraft in flight means..",
+      annexes: [],
+      correctOptionId: "A0CAHDJCZ4",
+      options: [
+        {
+          id: "A0CAHDJCZ4",
+          text: "aerodrome unsafe, do not land.",
+
+          why: "",
+        },
+        {
+          id: "AB76VMHM6W",
+          text: "aerodrome temporarily closed, continue circling.",
+
+          why: "",
+        },
+        {
+          id: "ARIOPOTJN9",
+          text: "continue circling and wait for further instruction.",
+
+          why: "",
+        },
+        {
+          id: "AKZXIA3TGD",
+          text: "give way to an aircraft in an emergency situation.",
+
+          why: "",
+        },
+      ],
+      explanation: "",
+    },
+    {
+      questionId: "Py9SQynm",
+      templateId: "QHKE1PY98Q",
+      variantId: "G6vyf2Fn",
+      seed: "3xiPxtXm",
+      type: "multiple-choice",
+      question:
+        "Which sign can be written in the sand by survivors on an island to give people in an aircraft a NEGATIVE response?",
+      annexes: [],
+      correctOptionId: "AKZ59W8L0E",
+      options: [
+        {
+          id: "AKZ59W8L0E",
+          text: "We have found some personnel.",
+
+          why: "",
+        },
+        {
+          id: "ABRXZ8ZO3P",
+          text: "We are not able to continue and we will return to base.",
+
+          why: "",
+        },
+        {
+          id: "A3RWBGEX99",
+          text: "Operation completed.",
+
+          why: "",
+        },
+        {
+          id: "AEFOIPGSL4",
+          text: "We have found all personnel.",
+
+          why: "",
+        },
+      ],
+      explanation: "",
+    },
+    {
+      questionId: "9p8HDnyY",
+      templateId: "QYM5APPB7M",
+      variantId: "qaqjbD3u",
+      seed: "3xiPxtXm",
+      type: "multiple-choice",
+      question:
+        "During take-off, the fire alarm sounded. After a rejected take-off, all passengers are evacuated. Nobody gets hurt, however, one wing is completely burnt. This is an example of a/an...",
+      annexes: [],
+      correctOptionId: "AOFJ083QXX",
+      options: [
+        {
+          id: "AOFJ083QXX",
+          text: "serious incident.",
+
+          why: "",
+        },
+        {
+          id: "AB94OYDMCV",
+          text: "incident.",
+
+          why: "",
+        },
+        {
+          id: "AF6BSNDMGU",
+          text: "serious accident.",
+
+          why: "",
+        },
+        {
+          id: "ANPBSFUCE4",
+          text: "accident.",
+
+          why: "",
+        },
+      ],
+      explanation: "",
+    },
+    {
+      questionId: "H3GcpZKV",
+      templateId: "Q6WV1ILG1C",
+      variantId: "PHbRYytD",
+      seed: "3xiPxtXm",
+      type: "multiple-choice",
+      question:
+        "When a pilot raises his arms extended, palms facing outwards and moves his hands inwards to cross in front of the face, this means:",
+      annexes: [],
+      correctOptionId: "AYX3LQUNBG",
+      options: [
+        {
+          id: "AYX3LQUNBG",
+          text: "insert chocks.",
+
+          why: "",
+        },
+        {
+          id: "AHCEEAVYOE",
+          text: "remove chocks.",
+
+          why: "",
+        },
+        {
+          id: "AQM3684JWC",
+          text: "brakes engaged.",
+
+          why: "",
+        },
+        {
+          id: "AAKN5AZJ77",
+          text: "brakes released.",
+
+          why: "",
+        },
+      ],
+      explanation: "",
+    },
+    {
+      questionId: "RFyaP5M1",
+      templateId: "QTONICLX6C",
+      variantId: "eBVnyMQn",
+      seed: "3xiPxtXm",
+      type: "multiple-choice",
+      question: "Alerting Service shall be provided:",
+      annexes: [],
+      correctOptionId: "AXBL017E2S",
+      options: [
+        {
+          id: "AXBL017E2S",
+          text: "for all controlled flights, to any aircraft known or believed to be subject of unlawful interference, and in so far as practicable to all aircraft having filed a flight plan or otherwise known to the ATS.",
+
+          why: "",
+        },
+        {
+          id: "AKQUY0UEN4",
+          text: "to any aircraft known or believed to be subject of unlawful interference, only.",
+
+          why: "",
+        },
+        {
+          id: "AR5RE4FCVC",
+          text: "in so far as practicable to all aircraft having filed a flight plan or otherwise known by the ATS.",
+
+          why: "",
+        },
+        {
+          id: "AV4PL5PPJ5",
+          text: "for all aircraft provided with Air Traffic Control Services, only.",
+
+          why: "",
+        },
+      ],
+      explanation: "",
+    },
+    {
+      questionId: "r7rttRfe",
+      templateId: "QAOUB4KU1C",
+      variantId: "4t5dcGXR",
+      seed: "3xiPxtXm",
+      type: "multiple-choice",
+      question: 'What is the meaning of abbreviation "MEHT"?',
+      annexes: [],
+      correctOptionId: "AJ3UXV7O57",
+      options: [
+        {
+          id: "AJ3UXV7O57",
+          text: "Minimum eye height over the threshold.",
+
+          why: "",
+        },
+        {
+          id: "AB3ASL4SLW",
+          text: "Mean height over the threshold.",
+
+          why: "",
+        },
+        {
+          id: "AII9S3S7DC",
+          text: "Maximum eye height over the threshold.",
+
+          why: "",
+        },
+        {
+          id: "AMYLTNFW4K",
+          text: "Minimum elevation height over the threshold.",
+
+          why: "",
+        },
+      ],
+      explanation: "",
+    },
+    {
+      questionId: "q81073VZ",
+      templateId: "Q5MBX0JGDS",
+      variantId: "mwepn1Ip",
+      seed: "3xiPxtXm",
+      type: "multiple-choice",
+      question:
+        "You are on the ground at an airfield with a 0-50,000ft altimeter in your aircraft. You move to a position of known elevation at the airfield and set local QNH. Your altimeter will read the elevation of that point plus the following:",
+      annexes: [],
+      correctOptionId: "A99OW29AYZ",
+      options: [
+        {
+          id: "A99OW29AYZ",
+          text: "The height of the altimeter from the ground with a +/-  80 ft tolerance",
+
+          why: "",
+        },
+        {
+          id: "AWNJBMF8TH",
+          text: "The height of the altimeter from the ground with a +/- 60 ft tolerance",
+
+          why: "",
+        },
+        {
+          id: "ALGOMQ3XPA",
+          text: "+/- 25 ft tolerence",
+
+          why: "",
+        },
+        {
+          id: "AVJMBKMHKL",
+          text: "+/- 80 ft tolerance",
+
+          why: "",
+        },
+      ],
+      explanation: "",
+    },
+    {
+      questionId: "94GD4awu",
+      templateId: "QWWKPSG25L",
+      variantId: "6UMTn3N6",
+      seed: "3xiPxtXm",
+      type: "multiple-choice",
+      question:
+        "A pilot is approaching a traffic circuit of a controlled airport in VMC. The communication on the frequency used is lost. Choose correct statements and actions taken:\n1- If a red flashing light appears, do not land and divert.\n2- Try to establish another way of communication.\n3- If a green flashing light appears, return for approach.\n4- If a flashing white light appears give way to another aircraft and continue circling.\n5- If a steady red light appears, the airfield is closed.",
+      annexes: [],
+      correctOptionId: "A17LCFNVDS",
+      options: [
+        {
+          id: "A17LCFNVDS",
+          text: "1, 2, 3",
+
+          why: "",
+        },
+        {
+          id: "ACFQMGI6TA",
+          text: "1, 2, 3, 4, 5",
+
+          why: "",
+        },
+        {
+          id: "ASFAYEBM64",
+          text: "1, 2, 3,5",
+
+          why: "",
+        },
+        {
+          id: "A7XOL7QSSI",
+          text: "2, 3, 4, 5",
+
+          why: "",
+        },
+      ],
+      explanation: "",
+    },
+    {
+      questionId: "TAQn78Cc",
+      templateId: "Q2HGA68VJO",
+      variantId: "KVBKZ3DA",
+      seed: "3xiPxtXm",
+      type: "multiple-choice",
+      question:
+        "A notice containing information concerning flight safety, air navigation, technical, administration or legislative matters and originated at the AIS of a state is called",
+      annexes: [],
+      correctOptionId: "AO37N3WP9X",
+      options: [
+        {
+          id: "AO37N3WP9X",
+          text: "Aeronautical Information Circular (AIC).",
+
+          why: "",
+        },
+        {
+          id: "A330CP0JS2",
+          text: "NOTAM.",
+
+          why: "",
+        },
+        {
+          id: "AL7LODX5PC",
+          text: "AIRAC.",
+
+          why: "",
+        },
+        {
+          id: "AUTKB0PXIJ",
+          text: "Aeronautical Information Publication (AIP).",
+
+          why: "",
+        },
+      ],
+      explanation: "",
+    },
+    {
+      questionId: "0noNy9bt",
+      templateId: "QJGT0104FP",
+      variantId: "TfRNv4Lg",
+      seed: "3xiPxtXm",
+      type: "multiple-choice",
+      question: "The standard color used for runway markings shall be:",
+      annexes: [],
+      correctOptionId: "AV81A3V0H6",
+      options: [
+        {
+          id: "AV81A3V0H6",
+          text: "white.",
+
+          why: "",
+        },
+        {
+          id: "A1TOF1E8U3",
+          text: "contrasting to the runway surface and acceptable to the authority.",
+
+          why: "",
+        },
+        {
+          id: "AEAPW0H184",
+          text: "yellow.",
+
+          why: "",
+        },
+        {
+          id: "ARJFUJ49J7",
+          text: "white or yellow.",
+
+          why: "",
+        },
+      ],
+      explanation: "",
+    },
+    {
+      questionId: "CAL7kHMb",
+      templateId: "QVQ391R41H",
+      variantId: "REoj1Pbs",
+      seed: "3xiPxtXm",
+      type: "multiple-choice",
+      question:
+        "When is it permissible to reset QNH whilst flying above the transition layer?",
+      annexes: [],
+      correctOptionId: "A3PHIZNF1V",
+      options: [
+        {
+          id: "A3PHIZNF1V",
+          text: "When cleared and maintaining a descent to an altitude and not flying level.",
+
+          why: "",
+        },
+        {
+          id: "A4BAH4Q7S7",
+          text: "QNH can only be set at the transition altitude in the descent.",
+
+          why: "",
+        },
+        {
+          id: "AARUFW82BW",
+          text: "This is the normal setting when flying above the trasition layer.",
+
+          why: "",
+        },
+        {
+          id: "A05XH3K4IO",
+          text: "QNH can only be set at the transition level in the descent.",
+
+          why: "",
+        },
+      ],
+      explanation: "",
+    },
+    {
+      questionId: "GCy9OTa0",
+      templateId: "Q56GSUFKFK",
+      variantId: "JdkSbzQL",
+      seed: "3xiPxtXm",
+      type: "multiple-choice",
+      question:
+        "A flight in controlled airspace is being subjected to unlawful interference, with a hostage situation.  According to SERA, the pilot shall attempt to notify ATC of...",
+      annexes: [],
+      correctOptionId: "AHFPMUV2BM",
+      options: [
+        {
+          id: "AHFPMUV2BM",
+          text: "any significant circumstances associated with the interference.",
+
+          why: "",
+        },
+        {
+          id: "A47BMZ1L8T",
+          text: "the type of aircraft being flown.",
+
+          why: "",
+        },
+        {
+          id: "A9LKQNZTZ6",
+          text: "the flight mumber, the flight time remaining, and any information about the type(s) of weapon being used.",
+
+          why: "",
+        },
+        {
+          id: "AGSGWQIOY6",
+          text: "the position of the aircraft and the time in UTC when the interference started.",
+
+          why: "",
+        },
+      ],
+      explanation: "",
+    },
+    {
+      questionId: "EqunJlFO",
+      templateId: "QIBYU3QHN2",
+      variantId: "JFHHQVNu",
+      seed: "3xiPxtXm",
+      type: "multiple-choice",
+      question:
+        "Who can change the limitations of class 1 medical certificate?",
+      annexes: [],
+      correctOptionId: "ADNC9F6EA5",
+      options: [
+        {
+          id: "ADNC9F6EA5",
+          text: "The licensing authority.",
+
+          why: "",
+        },
+        {
+          id: "AZG1K9IZM3",
+          text: "AME",
+
+          why: "",
+        },
+        {
+          id: "A73QPNP6II",
+          text: "AeMC",
+
+          why: "",
+        },
+        {
+          id: "AB6JXBTA8J",
+          text: "AME, together with AeMC",
+
+          why: "",
+        },
+      ],
+      explanation: "",
+      selectedOptionId: "AZG1K9IZM3",
+    },
+    {
+      questionId: "3BbyGvpJ",
+      templateId: "QCVMHNYAKK",
+      variantId: "fvlbedSO",
+      seed: "3xiPxtXm",
+      type: "multiple-choice",
+      question:
+        "One of the following statements about aircraft ground movement is correct",
+      annexes: [],
+      correctOptionId: "AMIEIYCF6X",
+      options: [
+        {
+          id: "AMIEIYCF6X",
+          text: "A taxiing aircraft has priority over a vehicle towing an aircraft.",
+
+          why: "",
+        },
+        {
+          id: "ASQSHAIA24",
+          text: "An aircraft overtaking another does so by passing on the right.",
+
+          why: "",
+        },
+        {
+          id: "AIJ40A2KZ1",
+          text: "Two airplanes approaching head-on will alter course to the left.",
+
+          why: "",
+        },
+        {
+          id: "AEP2YQIRZX",
+          text: "A vehicle towing an aircraft has priority over a taxiing aircraft.",
+
+          why: "",
+        },
+      ],
+      explanation: "",
+      selectedOptionId: "AMIEIYCF6X",
+    },
+    {
+      questionId: "QPq3o1kh",
+      templateId: "QIDZVBLLYH",
+      variantId: "kvuahId2",
+      seed: "3xiPxtXm",
+      type: "multiple-choice",
+      question: "Low intensity obstacle lights on mobile objects shall be:",
+      annexes: [],
+      correctOptionId: "A6KPG9KVAO",
+      options: [
+        {
+          id: "A6KPG9KVAO",
+          text: "flashing-blue or flashing-yellow.",
+
+          why: "",
+        },
+        {
+          id: "A30UA2FJ84",
+          text: "fixed red or preferably orange.",
+
+          why: "",
+        },
+        {
+          id: "AGMRMJC79Q",
+          text: "flashing blue.",
+
+          why: "",
+        },
+        {
+          id: "ARIULLWL1T",
+          text: "fixed red or preferably blue.",
+
+          why: "",
+        },
+      ],
+      explanation: "",
+    },
+    {
+      questionId: "p7jH3ITq",
+      templateId: "QWPJ92Z14F",
+      variantId: "gIti0rHW",
+      seed: "3xiPxtXm",
+      type: "multiple-choice",
+      question: "How long is a Mountain Rating valid for?",
+      annexes: [],
+      correctOptionId: "A990F77QFJ",
+      options: [
+        {
+          id: "A990F77QFJ",
+          text: "24 months.",
+
+          why: "",
+        },
+        {
+          id: "A8JKW0EHJP",
+          text: "36 months.",
+
+          why: "",
+        },
+        {
+          id: "AR0WN3YGUK",
+          text: "12 months.",
+
+          why: "",
+        },
+        {
+          id: "A3RTV8VLAF",
+          text: "6 months.",
+
+          why: "",
+        },
+      ],
+      explanation: "",
+    },
+    {
+      questionId: "FviVHt2N",
+      templateId: "QFP1F9NZS3",
+      variantId: "OZ91pZX3",
+      seed: "3xiPxtXm",
+      type: "multiple-choice",
+      question:
+        "In order to indicate unlawful interference with the operation of the flight, the aircraft SSR transponder must be set to...",
+      annexes: [],
+      correctOptionId: "ACS3S9AWYX",
+      options: [
+        {
+          id: "ACS3S9AWYX",
+          text: "7500",
+
+          why: "",
+        },
+        {
+          id: "AYNIK6KNE1",
+          text: "7700.",
+
+          why: "",
+        },
+        {
+          id: "AN8EO3GCCP",
+          text: "7000.",
+
+          why: "",
+        },
+        {
+          id: "ABH3LWYXZZ",
+          text: "7600.",
+
+          why: "",
+        },
+      ],
+      explanation: "",
+    },
+    {
+      questionId: "3nKHsh0e",
+      templateId: "QWO9HLO9RU",
+      variantId: "dn6WjcSF",
+      seed: "3xiPxtXm",
+      type: "multiple-choice",
+      question:
+        "A helicopter is flying in Class G airspace at less than 3000 ft.  What is the minimum flight visibility permitted if the aircraft is manoeuvered at a speed that will give adequate opportunity to observe other traffic or any obstacles in time to avoid a collision?",
+      annexes: [],
+      correctOptionId: "AAW34NVFDD",
+      options: [
+        {
+          id: "AAW34NVFDD",
+          text: "Less than 1500 m",
+
+          why: "",
+        },
+        {
+          id: "A9F3XI9V8I",
+          text: "No less than 3500 m",
+
+          why: "",
+        },
+        {
+          id: "A42SOQ5V9K",
+          text: "Less than 2500 m",
+
+          why: "",
+        },
+        {
+          id: "A09HK8IPSA",
+          text: "5 km",
+
+          why: "",
+        },
+      ],
+      explanation: "",
+    },
+    {
+      questionId: "hNq1K1Wj",
+      templateId: "QT7CZ3SQ7Y",
+      variantId: "fDQZ9QEI",
+      seed: "3xiPxtXm",
+      type: "multiple-choice",
+      question: "Compared to a DME/DME RNAV approach, a VOR/DME RNAV approach",
+      annexes: [],
+      correctOptionId: "AJ0GWUMR6I",
+      options: [
+        {
+          id: "AJ0GWUMR6I",
+          text: "is based on a specific navaid reference facility that will be indicated.",
+
+          why: "",
+        },
+        {
+          id: "A0VH7F6JWS",
+          text: "can be flown without an approval from the State of the Operator.",
+
+          why: "",
+        },
+        {
+          id: "AIIOGU38O7",
+          text: "is a precision approach, whereas the DME/DME is non-precision.",
+
+          why: "",
+        },
+        {
+          id: "ALC8ZTZ5HX",
+          text: "can be flown if the DME part is failed, provided that the VOR is serviceable.",
+
+          why: "",
+        },
+      ],
+      explanation: "",
+    },
+    {
+      questionId: "zqvBPjvq",
+      templateId: "QL8TKREI2J",
+      variantId: "ahjJ9Psq",
+      seed: "3xiPxtXm",
+      type: "multiple-choice",
+      question:
+        "Secondary Surveillance Radar (SSR) is not available. For radar identification ATC may request the pilot to execute one or more heading changes of:",
+      annexes: [],
+      correctOptionId: "A2XXDM7YCW",
+      options: [
+        {
+          id: "A2XXDM7YCW",
+          text: "controlled traffic not separated from another controlled traffic with the prescribed separation minima.",
+
+          why: "",
+        },
+        {
+          id: "AKQBAYQ320",
+          text: "controlled IFR flights separated from uncontrolled flights within advisory airspace.",
+
+          why: "",
+        },
+        {
+          id: "AP9XTOG694",
+          text: "uncontrolled IFR flights separated from uncontrolled VFR flights within advisory airspace.",
+
+          why: "",
+        },
+        {
+          id: "AJ9OFTQDRO",
+          text: "controlled traffic separated from other controlled traffic with the prescribed separation minima.",
+
+          why: "",
+        },
+      ],
+      explanation: "",
+    },
+    {
+      questionId: "mg3KqHVe",
+      templateId: "QH8BTKXPQ5",
+      variantId: "Tos905Y7",
+      seed: "3xiPxtXm",
+      type: "multiple-choice",
+      question: 'The "Manoeuvring area" is:',
+      annexes: [],
+      correctOptionId: "AYI3RSM643",
+      options: [
+        {
+          id: "AYI3RSM643",
+          text: "That part of an aerodrome to be used for the take-off, landing and taxiing of aircraft, excluding aprons.",
+
+          why: "",
+        },
+        {
+          id: "AMVV7DD6TK",
+          text: "That part of an aerodrome to be used for the take-off, landing and taxiing of aircraft, consisting of the movement area and the apron.",
+
+          why: "",
+        },
+        {
+          id: "AB5YB2SGYO",
+          text: "That part of the aerodrome designated for the manoeuvring of aircraft in front of the hangars only.",
+
+          why: "",
+        },
+        {
+          id: "A8GA5JKYWA",
+          text: "That part of the aerodrome suitable for the safe and efficient manoeuvring of aircraft; to include aprons, taxiways and runways.",
+
+          why: "",
+        },
+      ],
+      explanation: "",
+    },
+    {
+      questionId: "fkUqeRuO",
+      templateId: "Q8YZSJXUQX",
+      variantId: "XWasJKYf",
+      seed: "3xiPxtXm",
+      type: "multiple-choice",
+      question:
+        "According to PART-FCL, successful completion of multi-crew co-operation (MCC) training shall be required to:",
+      annexes: [],
+      correctOptionId: "AXEDK6N28H",
+      options: [
+        {
+          id: "AXEDK6N28H",
+          text: "obtain the first type rating on multi-pilot aeroplanes.",
+
+          why: "",
+        },
+        {
+          id: "AYRRWLQXJ1",
+          text: "revalidate any rating or licence.",
+
+          why: "",
+        },
+        {
+          id: "A2JW1DCGH4",
+          text: "obtain the first class rating on multi-engine aeroplanes.",
+
+          why: "",
+        },
+        {
+          id: "AKK70RPLMU",
+          text: "obtain a professional pilot licence.",
+
+          why: "",
+        },
+      ],
+      explanation: "",
+      selectedOptionId: "A2JW1DCGH4",
+    },
+    {
+      questionId: "PeyLv96l",
+      templateId: "QVWY95Q3GF",
+      variantId: "WLErkddK",
+      seed: "3xiPxtXm",
+      type: "multiple-choice",
+      question: "What are the correct values for the navigational light?",
+      annexes: [],
+      correctOptionId: "AW3KKQUPVE",
+      options: [
+        {
+          id: "AW3KKQUPVE",
+          text: "110 degrees red light on the left wing, 140 degrees white light aft position, 110 degrees green light on the right wing.",
+
+          why: "",
+        },
+        {
+          id: "A37OE4HOK5",
+          text: "110 degrees red light on the left wing, 140 degrees white light aft position, 110 degrees amber light on right wing.",
+
+          why: "",
+        },
+        {
+          id: "AW6XAHUJXJ",
+          text: "110 degrees white light on the left wing, 140 degrees green light aft position, 110 degrees red light on right wing.",
+
+          why: "",
+        },
+        {
+          id: "ABRRO0QQFT",
+          text: "110 degrees red light on the left wing, 140 degrees white light forward position, 110 degrees green light on right wing.",
+
+          why: "",
+        },
+      ],
+      explanation: "",
+    },
+    {
+      questionId: "h0TyvYSX",
+      templateId: "QAPMYGD5RD",
+      variantId: "f0Dl3lpA",
+      seed: "3xiPxtXm",
+      type: "multiple-choice",
+      question:
+        "An aircraft is expected to land at 22:30 UTC. The airport has little traffic. When must ground lights be brought into operation?",
+      annexes: [],
+      correctOptionId: "A5KEQO87GK",
+      options: [
+        {
+          id: "A5KEQO87GK",
+          text: "21:30 UTC",
+
+          why: "",
+        },
+        {
+          id: "ARH0AL6PD4",
+          text: "21:00 - 23:00 UTC",
+
+          why: "",
+        },
+        {
+          id: "AE1DPK3D9J",
+          text: "20:00 - 23:30 UTC",
+
+          why: "",
+        },
+        {
+          id: "ALAXQN2SD3",
+          text: "20:30 UTC",
+
+          why: "",
+        },
+      ],
+      explanation: "",
+    },
+    {
+      questionId: "wUhzoyhE",
+      templateId: "QJST67JZTX",
+      variantId: "QE39TRDC",
+      seed: "3xiPxtXm",
+      type: "multiple-choice",
+      question:
+        "Deviation from Flight Plan  Pilots of controlled flights are requested to inform the appropriate ATS whenever the average TAS at cruising level between reporting points varies or is expected to vary from the TAS given in the flight plan by",
+      annexes: [],
+      correctOptionId: "AUT6AP7L4Z",
+      options: [
+        {
+          id: "AUT6AP7L4Z",
+          text: "5 %",
+
+          why: "",
+        },
+        {
+          id: "ACJHFSV7J1",
+          text: "3 %",
+
+          why: "",
+        },
+        {
+          id: "APYQIUML4B",
+          text: "4 %",
+
+          why: "",
+        },
+        {
+          id: "AH3SVQ7J44",
+          text: "2 %",
+
+          why: "",
+        },
+      ],
+      explanation: "",
+    },
+    {
+      questionId: "cZekC61C",
+      templateId: "QLLWFP0E3Y",
+      variantId: "uAXYcSog",
+      seed: "3xiPxtXm",
+      type: "multiple-choice",
+      question:
+        "According to ICAO Annex 11, why must the movement of all persons, vehicles and towed aircraft on the maneuvering area be controlled by the aerodrome control tower?",
+      annexes: [],
+      correctOptionId: "ACXMGWR70J",
+      options: [
+        {
+          id: "ACXMGWR70J",
+          text: "To avoid hazard to them, or to aircrafts landing, taxiing, or taking off.",
+
+          why: "",
+        },
+        {
+          id: "AYJEWDOCPN",
+          text: "To provide safe vehicular access to aprons.",
+
+          why: "",
+        },
+        {
+          id: "AYT9WK5G3Y",
+          text: "To avoid damage to aerodrome navigation aids.",
+
+          why: "",
+        },
+        {
+          id: "AZXTFCHESL",
+          text: "To maintain an orderly flow of air and ground traffic on the movement area.",
+
+          why: "",
+        },
+      ],
+      explanation: "",
+    },
+    {
+      questionId: "7Fm56xFf",
+      templateId: "QQLJI8U13Z",
+      variantId: "QZuAEoPI",
+      seed: "3xiPxtXm",
+      type: "multiple-choice",
+      question: "The maximum recommended length of a runway Clearway is...",
+      annexes: [],
+      correctOptionId: "A3NODOIATK",
+      options: [
+        {
+          id: "A3NODOIATK",
+          text: "half of the Take-Off Run Available (TORA).",
+
+          why: "",
+        },
+        {
+          id: "AATZDB3GOC",
+          text: "100 m.",
+
+          why: "",
+        },
+        {
+          id: "A1Q88ADOB3",
+          text: "half of the Accelerate-Stop Distance Available (ASDA).",
+
+          why: "",
+        },
+        {
+          id: "AES4S57TQF",
+          text: "75 m.",
+
+          why: "",
+        },
+      ],
+      explanation: "",
+    },
+    {
+      questionId: "qsSsTkJY",
+      templateId: "QVDL1SCKNJ",
+      variantId: "rMW253dO",
+      seed: "3xiPxtXm",
+      type: "multiple-choice",
+      question:
+        "Where a final approach fix (FAF) is specified for a non-precision approach procedure, what is the Minimum Obstacle Clearance (MOC) fixed margin that is applied for all aircraft?",
+      annexes: [],
+      correctOptionId: "A6WT5NYW2U",
+      options: [
+        {
+          id: "A6WT5NYW2U",
+          text: "75 m (246 ft).",
+
+          why: "",
+        },
+        {
+          id: "AIG0NH202U",
+          text: "100 m (316 ft).",
+
+          why: "",
+        },
+        {
+          id: "ABW173I3SC",
+          text: "120 m (400 ft).",
+
+          why: "",
+        },
+        {
+          id: "ARRQR4V2RY",
+          text: "90 m (295 ft).",
+
+          why: "",
+        },
+      ],
+      explanation: "",
+    },
+    {
+      questionId: "qtPX8kYL",
+      templateId: "QLIR83O062",
+      variantId: "uxCQsajb",
+      seed: "3xiPxtXm",
+      type: "multiple-choice",
+      question:
+        "The responsibility for the initiation of an accident investigation in a Contracting State is with the",
+      annexes: [],
+      correctOptionId: "A1L38VP83S",
+      options: [
+        {
+          id: "A1L38VP83S",
+          text: "Authority of the State in which the accident occurred.",
+
+          why: "",
+        },
+        {
+          id: "A7YSQJWP2J",
+          text: "operators of the same type of aircraft.",
+
+          why: "",
+        },
+        {
+          id: "ABIM905E9J",
+          text: "aircraft manufacturer.",
+
+          why: "",
+        },
+        {
+          id: "ATJWFRH9PF",
+          text: "State of design and manufacturer.",
+
+          why: "",
+        },
+      ],
+      explanation: "",
+    },
+    {
+      questionId: "oPLaaRMc",
+      templateId: "Q810YH4G3V",
+      variantId: "pJl9N2zw",
+      seed: "3xiPxtXm",
+      type: "multiple-choice",
+      question:
+        "How many types of medical certificates and how many classes are available for pilots according to EASA AIRCREW regulation?",
+      annexes: [],
+      correctOptionId: "AGODEH89NK",
+      options: [
+        {
+          id: "AGODEH89NK",
+          text: "3 types, 2 classes",
+
+          why: "",
+        },
+        {
+          id: "AN5IH9IP34",
+          text: "3 types, 1 class",
+
+          why: "",
+        },
+        {
+          id: "ADSKYROPNJ",
+          text: "4 types, no classes",
+
+          why: "",
+        },
+        {
+          id: "ABPPDAL278",
+          text: "2 types, 2 classes",
+
+          why: "",
+        },
+      ],
+      explanation: "",
+    },
+    {
+      questionId: "qUg2PibO",
+      templateId: "Q99XQZWI17",
+      variantId: "NvaDV4Zf",
+      seed: "3xiPxtXm",
+      type: "multiple-choice",
+      question:
+        "The authority of the pilot-in-command in case of offences and certain acts committed on board aircraft is established by the Convention of",
+      annexes: [],
+      correctOptionId: "A15C3QBX3A",
+      options: [
+        {
+          id: "A15C3QBX3A",
+          text: "Tokyo.",
+
+          why: "",
+        },
+        {
+          id: "AHC7R3JOWY",
+          text: "Paris.",
+
+          why: "",
+        },
+        {
+          id: "AUUG3RGETI",
+          text: "Rome.",
+
+          why: "",
+        },
+        {
+          id: "AG8DZ6D0ZV",
+          text: "Chicago.",
+
+          why: "",
+        },
+      ],
+      explanation: "",
+    },
+    {
+      questionId: "PBl7rng9",
+      templateId: "QAXU9K8OXW",
+      variantId: "PCFBUm06",
+      seed: "3xiPxtXm",
+      type: "multiple-choice",
+      question:
+        "According to ICAO Annex 14, elevated runway, stopway and taxiway lights shall be...",
+      annexes: [],
+      correctOptionId: "AAFFIG7X8I",
+      options: [
+        {
+          id: "AAFFIG7X8I",
+          text: "Frangible.",
+
+          why: "",
+        },
+        {
+          id: "AZUSQUW2R9",
+          text: "Reinforced.",
+
+          why: "",
+        },
+        {
+          id: "APKHCFB7EG",
+          text: "Extra rigid.",
+
+          why: "",
+        },
+        {
+          id: "AL2E75IZO4",
+          text: "Flexible.",
+
+          why: "",
+        },
+      ],
+      explanation: "",
+    },
+    {
+      questionId: "q635Gp01",
+      templateId: "Q3GQCM1SGZ",
+      variantId: "mkMDyNKk",
+      seed: "3xiPxtXm",
+      type: "multiple-choice",
+      question:
+        "What is the standard colour code for an ATC document when considering the aeronautical information circular (AIC)?",
+      annexes: [],
+      correctOptionId: "AL7J24WGYY",
+      options: [
+        {
+          id: "AL7J24WGYY",
+          text: "yellow",
+
+          why: "",
+        },
+        {
+          id: "ASUCB52ABB",
+          text: "mauve",
+
+          why: "",
+        },
+        {
+          id: "AIRCQPVOLN",
+          text: "pink",
+
+          why: "",
+        },
+        {
+          id: "A34P3LG1JV",
+          text: "green",
+
+          why: "",
+        },
+      ],
+      explanation: "",
+    },
+    {
+      questionId: "0vilh9uS",
+      templateId: "Q8XLCFSSFD",
+      variantId: "Q0bHIHko",
+      seed: "3xiPxtXm",
+      type: "multiple-choice",
+      question: "The 'PAPI' shall consist of",
+      annexes: [],
+      correctOptionId: "ABX2D4QVNQ",
+      options: [
+        {
+          id: "ABX2D4QVNQ",
+          text: "a wing bar of 4 sharp transition multi-lamp or paired units equally spaced.",
+
+          why: "",
+        },
+        {
+          id: "AY6UWT0ISI",
+          text: "two wing bars of 6 sharp transition multi-lamp or paired units equally spaced.",
+
+          why: "",
+        },
+        {
+          id: "AUCGN9PLNK",
+          text: "a wing bar of 2 sharp transition multi-lamp equally spaced.",
+
+          why: "",
+        },
+        {
+          id: "AAC5ZBQBS3",
+          text: "two wing bars of 4 sharp transition multi-lamp or paired units equally spaced.",
+
+          why: "",
+        },
+      ],
+      explanation: "",
+    },
+    {
+      questionId: "YPsRQRjg",
+      templateId: "QCTH9GY034",
+      variantId: "hj5RCB5a",
+      seed: "3xiPxtXm",
+      type: "multiple-choice",
+      question:
+        "The ICAO Contracting States establish border controls for the entry and departure of persons Regarding the entry requirements for crew arriving on duty on an international flight,",
+      annexes: [],
+      correctOptionId: "AS8WUHE2K3",
+      options: [
+        {
+          id: "AS8WUHE2K3",
+          text: "States shall establish measures to expedite inspection of crew members and their baggage.",
+
+          why: "",
+        },
+        {
+          id: "APH0HY56KA",
+          text: "crew members are subject to the same entry requirements as passengers.",
+
+          why: "",
+        },
+        {
+          id: "AI9ZH5QX1Z",
+          text: "States shall ensure that the Flight Crew Licence is accepted as a valid document of identity.",
+
+          why: "",
+        },
+        {
+          id: "AYICY9JR80",
+          text: "crew must be in uniform in order to be allowed temporary entry into the Contracting State.",
+
+          why: "",
+        },
+      ],
+      explanation: "",
+    },
+    {
+      questionId: "rThKyhyz",
+      templateId: "QI9NFTV9OR",
+      variantId: "IXDMHUKS",
+      seed: "3xiPxtXm",
+      type: "multiple-choice",
+      question:
+        'According to ICAO Annex 2, which phrase would be used by an intercepting aircraft for the meaning "land at this aerodrome"?',
+      annexes: [],
+      correctOptionId: "AYATCKJ9C5",
+      options: [
+        {
+          id: "AYATCKJ9C5",
+          text: "You land",
+
+          why: "",
+        },
+        {
+          id: "AX82X25VQP",
+          text: "Descend",
+
+          why: "",
+        },
+        {
+          id: "AC4P8TX30Y",
+          text: "Descend for landing",
+
+          why: "",
+        },
+        {
+          id: "ALYSFYKNZ4",
+          text: "Touch down",
+
+          why: "",
+        },
+      ],
+      explanation: "",
+    },
+    {
+      questionId: "vksf9tZ2",
+      templateId: "QT1S3NUDMT",
+      variantId: "UXNUUn7s",
+      seed: "3xiPxtXm",
+      type: "multiple-choice",
+      question:
+        "The correct EASA PART-FCL definition for multi-pilot aircraft with regards to aeroplanes is:",
+      annexes: [],
+      correctOptionId: "AOPKM92QM6",
+      options: [
+        {
+          id: "AOPKM92QM6",
+          text: "Aeroplanes certificated for operation with a minimum crew of at least two pilots.",
+
+          why: "",
+        },
+        {
+          id: "AIUQH3U9A3",
+          text: "Commercially operated aeroplanes certificated for operation with a minimum crew of at least two pilots.",
+
+          why: "",
+        },
+        {
+          id: "A85ID17HFX",
+          text: "Aeroplanes certificated for operation with a crew of one or two pilots.",
+
+          why: "",
+        },
+        {
+          id: "ADZU0C7Q61",
+          text: "Commercially operated aeroplanes certificated for operation with a crew of one or two pilots.",
+
+          why: "",
+        },
+      ],
+      explanation: "",
+    },
+    {
+      questionId: "j1fnNSk6",
+      templateId: "QQ9D2V46ZB",
+      variantId: "DIP2rrjM",
+      seed: "3xiPxtXm",
+      type: "multiple-choice",
+      question:
+        "Which part of the AIP gives detailed information about refuelling facilities and the fuel grades available?",
+      annexes: [],
+      correctOptionId: "A5VYTLE9XF",
+      options: [
+        {
+          id: "A5VYTLE9XF",
+          text: "AD",
+
+          why: "",
+        },
+        {
+          id: "A07DGMAH8M",
+          text: "ENR",
+
+          why: "",
+        },
+        {
+          id: "A2AMUEIEG7",
+          text: "FAL",
+
+          why: "",
+        },
+        {
+          id: "A30P7CNUNF",
+          text: "GEN",
+
+          why: "",
+        },
+      ],
+      explanation: "",
+      selectedOptionId: "A07DGMAH8M",
+    },
+    {
+      questionId: "Uq344pRM",
+      templateId: "QBF4KFEU2L",
+      variantId: "27FTUqES",
+      seed: "3xiPxtXm",
+      type: "multiple-choice",
+      question:
+        "Can the separation between two aircraft be further reduced than the minimum separation?",
+      annexes: [],
+      correctOptionId: "A9G3Q4DD2J",
+      options: [
+        {
+          id: "A9G3Q4DD2J",
+          text: "Yes, in certain situations the minimum separation can be further reduced.",
+
+          why: "",
+        },
+        {
+          id: "AS7DJREN0V",
+          text: "Yes, at the discretion of the pilot or ATC.",
+
+          why: "",
+        },
+        {
+          id: "A24FYPYLA2",
+          text: "Yes, always by 10%.",
+
+          why: "",
+        },
+        {
+          id: "AN4OM2P9GO",
+          text: "No, under no circumstances.",
+
+          why: "",
+        },
+      ],
+      explanation: "",
+    },
+  ],
+  createdAtEpochMs: 1690962614024,
+  startedAtEpochMs: 1690962614152,
+  finishedAtEpochMs: null,
+};
diff --git a/libs/trpc/mock/src/index.ts b/libs/trpc/mock/src/index.ts
index ebb10b724..b24e6f325 100644
--- a/libs/trpc/mock/src/index.ts
+++ b/libs/trpc/mock/src/index.ts
@@ -2,3 +2,5 @@ import { createTRPCMsw } from "msw-trpc";
 import type { AppRouter } from "@chair-flight/trpc/server";
 
 export const trpcMsw = createTRPCMsw<AppRouter>();
+
+export { mockSubjects } from "./__mocks__/subjects.mock";
diff --git a/package.json b/package.json
index e2af67b3a..eb6290e5b 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,6 @@
     "@prisma/client": "^5.0.0",
     "@react-three/drei": "^9.80.0",
     "@react-three/fiber": "^8.13.6",
-    "@reduxjs/toolkit": "^1.9.5",
     "@tanstack/react-query": "^4.32.0",
     "@tanstack/react-query-devtools": "^4.32.0",
     "@trpc/client": "^10.36.0",
@@ -69,10 +68,8 @@
     "react-konva": "^18.2.10",
     "react-markdown": "^8.0.7",
     "react-merge-refs": "^2.0.2",
-    "react-redux": "^8.1.2",
     "react-render-if-visible": "^2.1.1",
     "recharts": "^2.7.2",
-    "redux": "^4.2.1",
     "remark-gemoji": "^7.0.1",
     "remark-gfm": "^3.0.1",
     "remark-supersub": "^1.0.0",
@@ -145,7 +142,6 @@
     "prettier": "^3.0.0",
     "prisma": "^5.0.0",
     "react-test-renderer": "^18.2.0",
-    "redux-persist": "^6.0.0",
     "storybook-dark-mode": "^3.0.1",
     "ts-node": "^10.9.1",
     "tsconfig-paths": "^4.2.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index dc69e0910..bb6da813e 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -49,9 +49,6 @@ dependencies:
   '@react-three/fiber':
     specifier: ^8.13.6
     version: 8.13.6(react-dom@18.2.0)(react@18.2.0)(three@0.154.0)
-  '@reduxjs/toolkit':
-    specifier: ^1.9.5
-    version: 1.9.5(react-redux@8.1.2)(react@18.2.0)
   '@tanstack/react-query':
     specifier: ^4.32.0
     version: 4.32.0(react-dom@18.2.0)(react@18.2.0)
@@ -121,18 +118,12 @@ dependencies:
   react-merge-refs:
     specifier: ^2.0.2
     version: 2.0.2
-  react-redux:
-    specifier: ^8.1.2
-    version: 8.1.2(@types/react-dom@18.2.7)(@types/react@18.2.18)(react-dom@18.2.0)(react@18.2.0)(redux@4.2.1)
   react-render-if-visible:
     specifier: ^2.1.1
     version: 2.1.1(react-dom@18.2.0)(react@18.2.0)
   recharts:
     specifier: ^2.7.2
     version: 2.7.2(prop-types@15.8.1)(react-dom@18.2.0)(react@18.2.0)
-  redux:
-    specifier: ^4.2.1
-    version: 4.2.1
   remark-gemoji:
     specifier: ^7.0.1
     version: 7.0.1
@@ -345,9 +336,6 @@ devDependencies:
   react-test-renderer:
     specifier: ^18.2.0
     version: 18.2.0(react@18.2.0)
-  redux-persist:
-    specifier: ^6.0.0
-    version: 6.0.0(react@18.2.0)(redux@4.2.1)
   storybook-dark-mode:
     specifier: ^3.0.1
     version: 3.0.1(react-dom@18.2.0)(react@18.2.0)
@@ -4398,25 +4386,6 @@ packages:
       zustand: 3.7.2(react@18.2.0)
     dev: false
 
-  /@reduxjs/toolkit@1.9.5(react-redux@8.1.2)(react@18.2.0):
-    resolution: {integrity: sha512-Rt97jHmfTeaxL4swLRNPD/zV4OxTes4la07Xc4hetpUW/vc75t5m1ANyxG6ymnEQ2FsLQsoMlYB2vV1sO3m8tQ==}
-    peerDependencies:
-      react: ^16.9.0 || ^17.0.0 || ^18
-      react-redux: ^7.2.1 || ^8.0.2
-    peerDependenciesMeta:
-      react:
-        optional: true
-      react-redux:
-        optional: true
-    dependencies:
-      immer: 9.0.21
-      react: 18.2.0
-      react-redux: 8.1.2(@types/react-dom@18.2.7)(@types/react@18.2.18)(react-dom@18.2.0)(react@18.2.0)(redux@4.2.1)
-      redux: 4.2.1
-      redux-thunk: 2.4.2(redux@4.2.1)
-      reselect: 4.1.8
-    dev: false
-
   /@rollup/pluginutils@4.2.1:
     resolution: {integrity: sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==}
     engines: {node: '>= 8.0.0'}
@@ -5811,13 +5780,6 @@ packages:
       '@types/unist': 2.0.7
     dev: false
 
-  /@types/hoist-non-react-statics@3.3.1:
-    resolution: {integrity: sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==}
-    dependencies:
-      '@types/react': 18.2.18
-      hoist-non-react-statics: 3.3.2
-    dev: false
-
   /@types/http-errors@2.0.1:
     resolution: {integrity: sha512-/K3ds8TRAfBvi5vfjuz8y6+GiAYBZ0x4tXv1Av6CWBWn0IlADc+ZX9pMq7oU0fNQPnBwIZl3rmeLp6SBApbxSQ==}
     dev: true
@@ -5966,6 +5928,7 @@ packages:
     resolution: {integrity: sha512-GRaAEriuT4zp9N4p1i8BDBYmEyfo+xQ3yHjJU4eiK5NDa1RmUZG+unZABUTK4/Ox/M+GaHwb6Ow8rUITrtjszA==}
     dependencies:
       '@types/react': 18.2.18
+    dev: true
 
   /@types/react-is@18.2.1:
     resolution: {integrity: sha512-wyUkmaaSZEzFZivD8F2ftSyAfk6L+DfFliVj/mYdOXbVjRcS87fQJLTnhk6dRZPuJjI+9g6RZJO4PNCngUrmyw==}
@@ -6070,10 +6033,6 @@ packages:
   /@types/unist@2.0.7:
     resolution: {integrity: sha512-cputDpIbFgLUaGQn6Vqg3/YsJwxUwHLO13v3i5ouxT4lat0khip9AEWxtERujXV9wxIB1EyF97BSJFt6vpdI8g==}
 
-  /@types/use-sync-external-store@0.0.3:
-    resolution: {integrity: sha512-EwmlvuaxPNej9+T4v5AuBPJa2x2UOJVdjCtDHgcDqitUeOtjnJKJ+apYjVcAoBEMjKW1VVFGZLUb5+qqa09XFA==}
-    dev: false
-
   /@types/webxr@0.5.2:
     resolution: {integrity: sha512-szL74BnIcok9m7QwYtVmQ+EdIKwbjPANudfuvDrAF8Cljg9MKUlIoc1w5tjj9PMpeSH3U1Xnx//czQybJ0EfSw==}
 
@@ -11006,10 +10965,6 @@ packages:
     dev: true
     optional: true
 
-  /immer@9.0.21:
-    resolution: {integrity: sha512-bc4NBHqOqSfRW7POMkHd51LvClaeMXpm8dx0e8oE2GORbq5aRK7Bxl4FyzVLdGtLmvLKL7BTDBG5ACQm4HWjTA==}
-    dev: false
-
   /immutable@4.3.1:
     resolution: {integrity: sha512-lj9cnmB/kVS0QHsJnYKD1uo3o39nrbKxszjnqS9Fr6NB7bZzW45U6WSGBPKXDL/CvDKqDNPA4r3DoDQ8GTxo2A==}
     dev: true
@@ -14875,40 +14830,6 @@ packages:
       scheduler: 0.23.0
     dev: false
 
-  /react-redux@8.1.2(@types/react-dom@18.2.7)(@types/react@18.2.18)(react-dom@18.2.0)(react@18.2.0)(redux@4.2.1):
-    resolution: {integrity: sha512-xJKYI189VwfsFc4CJvHqHlDrzyFTY/3vZACbE+rr/zQ34Xx1wQfB4OTOSeOSNrF6BDVe8OOdxIrAnMGXA3ggfw==}
-    peerDependencies:
-      '@types/react': ^16.8 || ^17.0 || ^18.0
-      '@types/react-dom': ^16.8 || ^17.0 || ^18.0
-      react: ^16.8 || ^17.0 || ^18.0
-      react-dom: ^16.8 || ^17.0 || ^18.0
-      react-native: '>=0.59'
-      redux: ^4 || ^5.0.0-beta.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-      react-dom:
-        optional: true
-      react-native:
-        optional: true
-      redux:
-        optional: true
-    dependencies:
-      '@babel/runtime': 7.22.6
-      '@types/hoist-non-react-statics': 3.3.1
-      '@types/react': 18.2.18
-      '@types/react-dom': 18.2.7
-      '@types/use-sync-external-store': 0.0.3
-      hoist-non-react-statics: 3.3.2
-      react: 18.2.0
-      react-dom: 18.2.0(react@18.2.0)
-      react-is: 18.2.0
-      redux: 4.2.1
-      use-sync-external-store: 1.2.0(react@18.2.0)
-    dev: false
-
   /react-refresh@0.14.0:
     resolution: {integrity: sha512-wViHqhAd8OHeLS/IRMJjTSDHF3U9eWi62F/MledQGPdJGDhodXJ9PBLNGr6WWL7qlH12Mt3TyTpbS+hGXMjCzQ==}
     engines: {node: '>=0.10.0'}
@@ -15124,32 +15045,6 @@ packages:
       postcss-value-parser: 3.3.1
     dev: false
 
-  /redux-persist@6.0.0(react@18.2.0)(redux@4.2.1):
-    resolution: {integrity: sha512-71LLMbUq2r02ng2We9S215LtPu3fY0KgaGE0k8WRgl6RkqxtGfl7HUozz1Dftwsb0D/5mZ8dwAaPbtnzfvbEwQ==}
-    peerDependencies:
-      react: '>=16'
-      redux: '>4.0.0'
-    peerDependenciesMeta:
-      react:
-        optional: true
-    dependencies:
-      react: 18.2.0
-      redux: 4.2.1
-    dev: true
-
-  /redux-thunk@2.4.2(redux@4.2.1):
-    resolution: {integrity: sha512-+P3TjtnP0k/FEjcBL5FZpoovtvrTNT/UXd4/sluaSyrURlSlhLSzEdfsTBW7WsKB6yPvgd7q/iZPICFjW4o57Q==}
-    peerDependencies:
-      redux: ^4
-    dependencies:
-      redux: 4.2.1
-    dev: false
-
-  /redux@4.2.1:
-    resolution: {integrity: sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==}
-    dependencies:
-      '@babel/runtime': 7.22.6
-
   /refractor@4.8.1:
     resolution: {integrity: sha512-/fk5sI0iTgFYlmVGYVew90AoYnNMP6pooClx/XKqyeeCQXrL0Kvgn8V0VEht5ccdljbzzF1i3Q213gcntkRExg==}
     dependencies:
@@ -15343,10 +15238,6 @@ packages:
     resolution: {integrity: sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==}
     dev: true
 
-  /reselect@4.1.8:
-    resolution: {integrity: sha512-ab9EmR80F/zQTMNeneUr4cv+jSwPJgIlvEmVwLerwrWVbpLlBuls9XHzIeTFy4cegU2NHBp3va0LKOzU5qFEYQ==}
-    dev: false
-
   /resolve-from@4.0.0:
     resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==}
     engines: {node: '>=4'}
diff --git a/tsconfig.base.json b/tsconfig.base.json
index e21d54818..2d9324fbb 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -28,7 +28,6 @@
       "@chair-flight/base/errors": ["libs/base/errors/src/index.ts"],
       "@chair-flight/base/types": ["libs/base/types/src/index.ts"],
       "@chair-flight/core/app": ["libs/core/app/src/index.ts"],
-      "@chair-flight/core/redux": ["libs/core/redux/src/index.ts"],
       "@chair-flight/core/schemas": ["libs/core/schemas/src/index.ts"],
       "@chair-flight/providers/analytics": [
         "libs/providers/analytics/src/index.ts"