Merge branch 'main' into PCF-651-mode-analysis

Author: misspran

src/components/CompareResults/ResultsTable.tsx

@@ -143,6 +143,7 @@ export default function ResultsTable() {
     frameworkId,
     generation,
     replicates,
+    testVersion,
   } = useLoaderData<CombinedLoaderReturnValue>();
   const [searchParams, setSearchParams] = useSearchParams();
 
@@ -159,7 +160,9 @@ export default function ResultsTable() {
   const initialSearchTerm = rawSearchParams.get('search') ?? '';
   const [searchTerm, setSearchTerm] = useState(initialSearchTerm);
   const [frameworkIdVal, setFrameworkIdVal] = useState(frameworkId);
-  const [testVersionVal, setTestVersionVal] = useState<TestVersion>(STUDENT_T);
+  const [testVersionVal, setTestVersionVal] = useState<TestVersion>(
+    testVersion ?? STUDENT_T,
+  );
 
   const onFrameworkChange = (newFrameworkId: Framework['id']) => {
     setFrameworkIdVal(newFrameworkId);