diff --git a/client/components/CandidateReview/CandidateTestPlanRun/InstructionsRenderer.jsx b/client/components/CandidateReview/CandidateTestPlanRun/InstructionsRenderer.jsx
index b363cc9d7..abc0eff0f 100644
--- a/client/components/CandidateReview/CandidateTestPlanRun/InstructionsRenderer.jsx
+++ b/client/components/CandidateReview/CandidateTestPlanRun/InstructionsRenderer.jsx
@@ -3,7 +3,10 @@ import PropTypes from 'prop-types';
 import styled from '@emotion/styled';
 import { Button } from 'react-bootstrap';
 import { unescape } from 'lodash';
-import { parseListContent } from '../../TestRenderer/utils';
+import {
+    parseListContent,
+    parseSettingsContent
+} from '../../TestRenderer/utils';
 import {
     userCloseWindow,
     userOpenWindow
@@ -120,8 +123,10 @@ const InstructionsRenderer = ({
 
     let allInstructions;
     const isV2 = testFormatVersion === 2;
+    let settingsContent = [];
 
     if (isV2) {
+        // There is at least one defined 'setting' for the list of AT commands
         const commandSettingSpecified = renderableContent.commands.some(
             ({ settings }) => settings && settings !== 'defaultMode'
         );
@@ -144,6 +149,10 @@ const InstructionsRenderer = ({
             setupScriptDescription + '.',
             testInstructions + ' ' + settingsInstructions
         ].map(e => unescape(e));
+        settingsContent = parseSettingsContent(
+            renderableContent.instructions.mode,
+            renderableContent.target.at.raw.settings
+        );
     } else {
         allInstructions = [
             ...pageContent.instructions.instructions.instructions,
@@ -168,8 +177,12 @@ const InstructionsRenderer = ({
     return (
         <>
             <NumberedList>{allInstructionsContent}</NumberedList>
-            <Heading>Assertions</Heading>
+
+            <Heading>{pageContent.instructions.assertions.header}</Heading>
+            {pageContent.instructions.assertions.description}
             <NumberedList>{assertionsContent}</NumberedList>
+            {settingsContent.length ? settingsContent : null}
+
             <Button
                 disabled={!pageContent.instructions.openTestPage.enabled}
                 onClick={pageContent.instructions.openTestPage.click}
diff --git a/client/components/DataManagement/DataManagementRow/index.jsx b/client/components/DataManagement/DataManagementRow/index.jsx
index d3010a193..46b214dab 100644
--- a/client/components/DataManagement/DataManagementRow/index.jsx
+++ b/client/components/DataManagement/DataManagementRow/index.jsx
@@ -507,12 +507,6 @@ const DataManagementRow = ({
             }
         };
 
-        // TODO: Remove this testFormatVersion check when #745 is implemented
-        const getLinkHref = version =>
-            version.metadata?.testFormatVersion === 2
-                ? null
-                : `/test-review/${version.id}`;
-
         switch (phase) {
             case 'RD': {
                 // If the latest version of the plan is in the draft, candidate, or recommended
@@ -555,14 +549,12 @@ const DataManagementRow = ({
                 // "active"
                 insertActivePhaseForTestPlan(latestVersion);
 
-                // TODO: Remove this testFormatVersion check when #745 is implemented
-                const linkHref = getLinkHref(latestVersion);
                 return (
                     <PhaseCell role="list" aria-setsize={isAdmin ? 2 : 1}>
                         <VersionString
                             role="listitem"
                             iconColor="#2BA51C"
-                            linkHref={linkHref}
+                            linkHref={`/test-review/${latestVersion.id}`}
                         >
                             {latestVersion.versionString}
                         </VersionString>
@@ -685,15 +677,13 @@ const DataManagementRow = ({
                     // Phase is "active"
                     insertActivePhaseForTestPlan(latestVersion);
 
-                    // TODO: Remove this testFormatVersion check when #745 is implemented
-                    const linkHref = getLinkHref(latestVersion);
                     return (
                         <PhaseCell role="list" aria-setsize={isAdmin ? 3 : 2}>
                             <VersionString
                                 role="listitem"
                                 iconColor="#2BA51C"
                                 linkRef={draftVersionStringRef}
-                                linkHref={linkHref}
+                                linkHref={`/test-review/${latestVersion.id}`}
                             >
                                 {latestVersion.versionString}
                             </VersionString>
@@ -887,15 +877,13 @@ const DataManagementRow = ({
                     // Phase is "active"
                     insertActivePhaseForTestPlan(latestVersion);
 
-                    // TODO: Remove this testFormatVersion check when #745 is implemented
-                    const linkHref = getLinkHref(latestVersion);
                     return (
                         <PhaseCell role="list" aria-setsize={isAdmin ? 5 : 4}>
                             <VersionString
                                 role="listitem"
                                 iconColor="#2BA51C"
                                 linkRef={candidateVersionStringRef}
-                                linkHref={linkHref}
+                                linkHref={`/test-review/${latestVersion.id}`}
                             >
                                 {latestVersion.versionString}
                             </VersionString>
@@ -1009,15 +997,13 @@ const DataManagementRow = ({
                 // Phase is "active"
                 insertActivePhaseForTestPlan(latestVersion);
 
-                // TODO: Remove this testFormatVersion check when #745 is implemented
-                const linkHref = getLinkHref(latestVersion);
                 return (
                     <PhaseCell role="list">
                         <VersionString
                             role="listitem"
                             iconColor="#2BA51C"
                             linkRef={recommendedVersionStringRef}
-                            linkHref={linkHref}
+                            linkHref={`/test-review/${latestVersion.id}`}
                         >
                             {latestVersion.versionString}
                         </VersionString>
diff --git a/client/components/TestPlanVersionsPage/index.jsx b/client/components/TestPlanVersionsPage/index.jsx
index a8b02fe7e..d14b2f62c 100644
--- a/client/components/TestPlanVersionsPage/index.jsx
+++ b/client/components/TestPlanVersionsPage/index.jsx
@@ -409,13 +409,7 @@ const TestPlanVersionsPage = () => {
                                                 testPlanVersion
                                             )}
                                             autoWidth={false}
-                                            // TODO: Remove this testFormatVersion check when #745 is implemented
-                                            linkHref={
-                                                testPlanVersion.metadata
-                                                    ?.testFormatVersion === 2
-                                                    ? null
-                                                    : `/test-review/${testPlanVersion.id}`
-                                            }
+                                            linkHref={`/test-review/${testPlanVersion.id}`}
                                         >
                                             {testPlanVersion.versionString}
                                         </VersionString>
@@ -672,27 +666,21 @@ const TestPlanVersionsPage = () => {
                                                 : {testPlanVersion.gitMessage}
                                             </a>
                                         </li>
-                                        {/* TODO: Remove this testFormatVersion check when #745 is implemented */}
-                                        {testPlanVersion.metadata
-                                            .testFormatVersion === 2 ? null : (
-                                            <li>
-                                                <a
-                                                    href={`/test-review/${testPlanVersion.id}`}
-                                                >
-                                                    <FontAwesomeIcon
-                                                        icon={
-                                                            faArrowUpRightFromSquare
-                                                        }
-                                                        size="xs"
-                                                        color="#818F98"
-                                                    />
-                                                    View tests in{' '}
-                                                    {
-                                                        testPlanVersion.versionString
+                                        <li>
+                                            <a
+                                                href={`/test-review/${testPlanVersion.id}`}
+                                            >
+                                                <FontAwesomeIcon
+                                                    icon={
+                                                        faArrowUpRightFromSquare
                                                     }
-                                                </a>
-                                            </li>
-                                        )}
+                                                    size="xs"
+                                                    color="#818F98"
+                                                />
+                                                View tests in{' '}
+                                                {testPlanVersion.versionString}
+                                            </a>
+                                        </li>
                                         {!hasFinalReports ? null : (
                                             <li>
                                                 <a
diff --git a/client/components/TestReview/index.jsx b/client/components/TestReview/index.jsx
index 08d4d34f9..fd7520768 100644
--- a/client/components/TestReview/index.jsx
+++ b/client/components/TestReview/index.jsx
@@ -7,10 +7,10 @@ import { Helmet } from 'react-helmet';
 import PageStatus from '../common/PageStatus';
 import InstructionsRenderer from '../CandidateReview/CandidateTestPlanRun/InstructionsRenderer';
 import FilterButtons from '../common/FilterButtons';
-import { uniq as unique } from 'lodash';
 import styled from '@emotion/styled';
 import { derivePhaseName } from '../../utils/aria';
 import { convertDateToString } from '../../utils/formatter';
+import supportJson from '../../resources/support.json';
 
 const Ul = styled.ul`
     li {
@@ -33,7 +33,6 @@ const TestReview = () => {
         variables: { testPlanVersionId },
         fetchPolicy: 'cache-and-network'
     });
-
     const [activeFilter, setActiveFilter] = useState('All ATs');
 
     if (loading) {
@@ -44,7 +43,6 @@ const TestReview = () => {
             />
         );
     }
-
     if (error || !data?.testPlanVersion) {
         const errorMessage =
             error?.message ??
@@ -58,17 +56,44 @@ const TestReview = () => {
             />
         );
     }
-
     const testPlanVersion = data.testPlanVersion;
-    const atNames = unique(
-        testPlanVersion.tests.flatMap(test => test.ats.map(at => at.name))
-    );
+    const atNames = supportJson.ats.map(at => at.name);
+    const isV2 = testPlanVersion.metadata.testFormatVersion === 2;
+
+    let testPlanVersionTests;
+    if (isV2) {
+        testPlanVersionTests = [];
+        testPlanVersion.tests.forEach(test => {
+            const testIndex = testPlanVersionTests.findIndex(
+                el => el.title === test.title
+            );
+
+            if (testIndex < 0) testPlanVersionTests.push(test);
+            else {
+                testPlanVersionTests[testIndex] = {
+                    ...testPlanVersionTests[testIndex],
+                    id: `${testPlanVersionTests[testIndex].id}${test.id}`,
+                    ats: [...testPlanVersionTests[testIndex].ats, ...test.ats],
+                    renderableContents: [
+                        ...testPlanVersionTests[testIndex].renderableContents,
+                        ...test.renderableContents
+                    ],
+                    renderedUrls: [
+                        ...testPlanVersionTests[testIndex].renderedUrls,
+                        ...test.renderedUrls
+                    ]
+                };
+            }
+        });
+    } else {
+        testPlanVersionTests = testPlanVersion.tests;
+    }
 
     let filteredTests;
     if (activeFilter === 'All ATs') {
-        filteredTests = testPlanVersion.tests;
+        filteredTests = testPlanVersionTests;
     } else {
-        filteredTests = testPlanVersion.tests.filter(test =>
+        filteredTests = testPlanVersionTests.filter(test =>
             test.ats.find(at => at.name === activeFilter)
         );
     }
@@ -77,9 +102,9 @@ const TestReview = () => {
         ['All ATs', ...atNames].map(key => {
             let count;
             if (key === 'All ATs') {
-                count = testPlanVersion.tests.length;
+                count = testPlanVersionTests.length;
             } else {
-                count = testPlanVersion.tests.filter(test =>
+                count = testPlanVersionTests.filter(test =>
                     test.ats.find(at => at.name === key)
                 ).length;
             }
@@ -169,7 +194,7 @@ const TestReview = () => {
             <h2>Tests</h2>
             <FilterButtonContainer>
                 <FilterButtons
-                    filterLabel="Filter tests by AT"
+                    filterLabel="Filter tests by covered AT"
                     filterOptions={filterOptions}
                     activeFilter={activeFilter}
                     onFilterChange={selectedFilter => {
@@ -177,16 +202,53 @@ const TestReview = () => {
                     }}
                 />
             </FilterButtonContainer>
+            <h2>Supporting Documentation</h2>
+            <ul>
+                {testPlanVersionTests[0].renderableContents[0].renderableContent.info.references.map(
+                    reference => {
+                        if (isV2) {
+                            let refValue = '';
+                            let refLinkText = '';
+                            if (
+                                reference.refId === 'example' ||
+                                reference.refId === 'designPattern' ||
+                                reference.refId === 'developmentDocumentation'
+                            ) {
+                                refValue = reference.value;
+                                refLinkText = reference.linkText;
+                            }
+                            return refValue ? (
+                                <li key={refValue}>
+                                    <a
+                                        href={refValue}
+                                        rel="noreferrer"
+                                        target="_blank"
+                                    >
+                                        {refLinkText}
+                                    </a>
+                                </li>
+                            ) : null;
+                        } else {
+                            return (
+                                <li key={reference.value}>
+                                    <a
+                                        href={reference.value}
+                                        rel="noreferrer"
+                                        target="_blank"
+                                    >
+                                        {reference.refId}
+                                    </a>
+                                </li>
+                            );
+                        }
+                    }
+                )}
+            </ul>
             {filteredTests.map((test, index) => {
                 const isFirst = index === 0;
-
-                const atMode =
-                    test.atMode.substring(0, 1) +
-                    test.atMode.toLowerCase().substring(1);
-
-                const specifications =
-                    test.renderableContents[0].renderableContent.info.references.map(
-                        ({ refId, value }) => [refId, value]
+                const hasAriaReference =
+                    test.renderableContents[0].renderableContent.info.references.some(
+                        reference => reference.type === 'aria'
                     );
 
                 let filteredAts;
@@ -201,36 +263,42 @@ const TestReview = () => {
                 return (
                     <Fragment key={test.id}>
                         {isFirst ? null : <hr />}
-                        <h3>{`Test ${test.rowNumber}: ${test.title}`}</h3>
-                        <ul>
-                            <li>
-                                <strong>Mode:&nbsp;</strong>
-                                {atMode}
-                            </li>
-                            <li>
-                                <strong>Assistive technologies:&nbsp;</strong>
-                                {test.ats.map(at => at.name).join(', ')}
-                            </li>
-                            <li>
-                                <strong>Relevant specifications:&nbsp;</strong>
-                                {specifications.map(([title, link], index) => {
-                                    const isLast =
-                                        index === specifications.length - 1;
-                                    return (
-                                        <Fragment key={title}>
-                                            <a
-                                                href={link}
-                                                rel="noreferrer"
-                                                target="_blank"
-                                            >
-                                                {title}
-                                            </a>
-                                            {isLast ? '' : ', '}
-                                        </Fragment>
-                                    );
-                                })}
-                            </li>
-                        </ul>
+                        <h3>{`Test ${index + 1}: ${test.title}`}</h3>
+                        {/* A defined 'aria' type is only available in v2 */}
+                        {isV2 && hasAriaReference ? (
+                            <>
+                                <p>
+                                    {
+                                        supportJson.testPlanStrings
+                                            .ariaSpecsPreface
+                                    }
+                                </p>
+                                <ul>
+                                    {test.renderableContents[0].renderableContent.info.references.map(
+                                        reference => {
+                                            let refValue = '';
+                                            let refLinkText = '';
+                                            if (reference.type === 'aria') {
+                                                refValue = reference.value;
+                                                refLinkText =
+                                                    reference.linkText;
+                                            }
+                                            return refValue ? (
+                                                <li key={refValue}>
+                                                    <a
+                                                        href={refValue}
+                                                        rel="noreferrer"
+                                                        target="_blank"
+                                                    >
+                                                        {refLinkText}
+                                                    </a>
+                                                </li>
+                                            ) : null;
+                                        }
+                                    )}
+                                </ul>
+                            </>
+                        ) : null}
                         {filteredAts.map(at => {
                             const renderableContent =
                                 test.renderableContents.find(
@@ -241,6 +309,7 @@ const TestReview = () => {
                             return (
                                 <Fragment key={at.id}>
                                     <h4>{at.name}</h4>
+                                    <h5>Instructions</h5>
                                     <InstructionsRenderer
                                         test={{ ...test, renderableContent }}
                                         testPageUrl={
@@ -248,6 +317,10 @@ const TestReview = () => {
                                         }
                                         at={at}
                                         headingLevel={5}
+                                        testFormatVersion={
+                                            testPlanVersion.metadata
+                                                .testFormatVersion
+                                        }
                                     />
                                 </Fragment>
                             );
diff --git a/client/components/TestReview/queries.js b/client/components/TestReview/queries.js
index 442f01772..b6f3aea83 100644
--- a/client/components/TestReview/queries.js
+++ b/client/components/TestReview/queries.js
@@ -1,7 +1,7 @@
 import { gql } from '@apollo/client';
 
 export const TEST_REVIEW_PAGE_QUERY = gql`
-    query TestPlanVersionsPageQuery($testPlanVersionId: ID!) {
+    query TestReviewPageQuery($testPlanVersionId: ID!) {
         testPlanVersion(id: $testPlanVersionId) {
             id
             title
@@ -40,6 +40,7 @@ export const TEST_REVIEW_PAGE_QUERY = gql`
                     renderableContent
                 }
             }
+            metadata
         }
     }
 `;
diff --git a/server/resolvers/Test/renderableContentsResolver.js b/server/resolvers/Test/renderableContentsResolver.js
index dfcc6606b..9163fa9ee 100644
--- a/server/resolvers/Test/renderableContentsResolver.js
+++ b/server/resolvers/Test/renderableContentsResolver.js
@@ -1,8 +1,24 @@
+const populateData = require('../../services/PopulatedData/populateData');
 const AtLoader = require('../../models/loaders/AtLoader');
 
-const renderableContents = async test => {
+const renderableContents = async (test, _, context) => {
     const ats = await AtLoader().getAll();
 
+    const { testPlanVersion } = await populateData(
+        { testId: test.id },
+        { context }
+    );
+
+    const isV2 = testPlanVersion.metadata.testFormatVersion === 2;
+    if (isV2) {
+        return test.atIds.map(atId => {
+            return {
+                at: ats.find(at => at.id === atId),
+                renderableContent: test.renderableContent // { renderableContent: { info, ... } }
+            };
+        });
+    }
+    // v1: { renderableContent: { 1: { info, ... }, 2: { ... }, ... } }
     return Object.entries(test.renderableContent).map(
         ([atId, renderableContent]) => {
             const at = ats.find(at => at.id == atId);
diff --git a/server/resolvers/Test/renderedUrlsResolver.js b/server/resolvers/Test/renderedUrlsResolver.js
index f13f4cf8e..f65a53f29 100644
--- a/server/resolvers/Test/renderedUrlsResolver.js
+++ b/server/resolvers/Test/renderedUrlsResolver.js
@@ -1,8 +1,25 @@
+const populateData = require('../../services/PopulatedData/populateData');
 const AtLoader = require('../../models/loaders/AtLoader');
 
-const renderedUrls = async test => {
+const renderedUrls = async (test, _, context) => {
     const ats = await AtLoader().getAll();
 
+    const { testPlanVersion } = await populateData(
+        { testId: test.id },
+        { context }
+    );
+
+    const isV2 = testPlanVersion.metadata.testFormatVersion === 2;
+    if (isV2) {
+        return test.atIds.map(atId => {
+            return {
+                at: ats.find(at => at.id === atId),
+                renderedUrl: test.renderedUrl // { renderedUrl: '/url/file/path.html' }
+            };
+        });
+    }
+
+    // v1: { renderedUrls: { 1: '/url/file/path.html' } }
     return Object.entries(test.renderedUrls).map(([atId, renderedUrl]) => {
         const at = ats.find(at => at.id == atId);
         return { at, renderedUrl };