diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 3a72fde2bc..424c51c646 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -470,6 +470,7 @@
     <inspection_tool class="PhpAbstractStaticMethodInspection" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="PhpAccessStaticViaInstanceInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
     <inspection_tool class="PhpAccessingStaticMembersOnTraitInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PhpAddOverrideAttributeInspection" enabled="false" level="INFORMATION" enabled_by_default="false" />
     <inspection_tool class="PhpApplyingEmptyIndexOperatorOnStringInspection" enabled="true" level="ERROR" enabled_by_default="true" />
     <inspection_tool class="PhpArgumentWithoutNamedIdentifierInspection" enabled="true" level="INFORMATION" enabled_by_default="true" />
     <inspection_tool class="PhpArithmeticTypeCheckInspection" enabled="true" level="ERROR" enabled_by_default="true" />
@@ -533,6 +534,7 @@
     <inspection_tool class="PhpConstantReassignmentInspection" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="PhpConstructorStyleInspection" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="PhpContinueTargetingSwitchInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
+    <inspection_tool class="PhpConvertToJsonValidateInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
     <inspection_tool class="PhpCoverageInspection" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="PhpCoveredCharacterInClassInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
     <inspection_tool class="PhpCurlyBraceAccessSyntaxUsageInspection" enabled="true" level="ERROR" enabled_by_default="true" />
@@ -642,6 +644,7 @@
     <inspection_tool class="PhpMethodOrClassCallIsNotCaseSensitiveInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
     <inspection_tool class="PhpMethodParametersCountMismatchInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
     <inspection_tool class="PhpMissingBreakStatementInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
+    <inspection_tool class="PhpMissingClassConstantTypeInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
     <inspection_tool class="PhpMissingDocCommentInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
     <inspection_tool class="PhpMissingFieldTypeInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
     <inspection_tool class="PhpMissingParamTypeInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
@@ -676,6 +679,7 @@
     <inspection_tool class="PhpObjectFieldsAreOnlyWrittenInspection" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="PhpObjectShapeCanBeAddedInspection" enabled="false" level="INFORMATION" enabled_by_default="false" />
     <inspection_tool class="PhpOptionalBeforeRequiredParametersInspection" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="PhpOverriddenMethodExistsInspection" enabled="false" level="ERROR" enabled_by_default="false" />
     <inspection_tool class="PhpOverridingMethodVisibilityInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
     <inspection_tool class="PhpParameterByRefIsNotUsedAsReferenceInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
     <inspection_tool class="PhpParameterNameChangedDuringInheritanceInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
@@ -960,10 +964,12 @@
     <inspection_tool class="TailRecursionJS" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="TaskProblemsInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
     <inspection_tool class="TextLabelInSwitchStatementJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ThemeInspection" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="ThisExpressionReferencesGlobalObjectJS" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="ThreeNegationsPerFunctionJS" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="ThrowFromFinallyBlockJS" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="TodoComment" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="TomlUnresolvedReference" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="TrivialConditionalJS" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="TrivialIfJS" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="TsLint" enabled="false" level="WARNING" enabled_by_default="false" />
@@ -988,6 +994,7 @@
     <inspection_tool class="TypeScriptValidateGenericTypes" enabled="true" level="ERROR" enabled_by_default="true" />
     <inspection_tool class="TypeScriptValidateJSTypes" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
     <inspection_tool class="TypeScriptValidateTypes" enabled="true" level="ERROR" enabled_by_default="true" />
+    <inspection_tool class="UndeclaredGeneric" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="UnnecessaryContinueJS" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="UnnecessaryLabelJS" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="UnnecessaryLabelOnBreakStatementJS" enabled="true" level="WARNING" enabled_by_default="true" />
@@ -999,9 +1006,11 @@
     <inspection_tool class="UnnecessaryReturnJS" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="UnreachableCodeJS" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="UnresolvedReference" enabled="true" level="ERROR" enabled_by_default="true" />
+    <inspection_tool class="UnsupportedDirective" enabled="false" level="ERROR" enabled_by_default="false" />
     <inspection_tool class="UnterminatedStatementJS" enabled="false" level="WARNING" enabled_by_default="false">
       <option name="ignoreSemicolonAtEndOfBlock" value="true" />
     </inspection_tool>
+    <inspection_tool class="UnusedAttribute" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="UnusedCatchParameterJS" enabled="false" level="WARNING" enabled_by_default="false">
       <option name="m_ignoreCatchBlocksWithComments" value="false" />
     </inspection_tool>
diff --git a/.idea/opg-use-an-lpa.iml b/.idea/opg-use-an-lpa.iml
index 9075f3d827..2c4c658de0 100644
--- a/.idea/opg-use-an-lpa.iml
+++ b/.idea/opg-use-an-lpa.iml
@@ -2,9 +2,12 @@
 <module type="WEB_MODULE" version="4">
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/service-api/app/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/service-front/app/test" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/tests/smoke/tests" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/service-api/app/test/AppTest" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/service-api/app/test/BehatTest" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/service-front/app/test/ActorTest" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/service-front/app/test/CommonTest" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/service-front/app/test/ViewerTest" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/service-api/app/vendor/alphagov/notifications-php-client" />
       <excludeFolder url="file://$MODULE_DIR$/service-api/app/vendor/amphp/amp" />
       <excludeFolder url="file://$MODULE_DIR$/service-api/app/vendor/amphp/byte-stream" />
diff --git a/.idea/php-test-framework.xml b/.idea/php-test-framework.xml
index f5a952fac4..695d1ce601 100644
--- a/.idea/php-test-framework.xml
+++ b/.idea/php-test-framework.xml
@@ -5,9 +5,10 @@
       <tool tool_name="Behat">
         <settings>
           <configurations>
-            <local_configuration configuration_file_path="$PROJECT_DIR$/tests/smoke/behat.yml" executable_path="$PROJECT_DIR$/tests/smoke/vendor/behat/behat/bin/behat" use_configuration_file="true" />
-            <local_configuration configuration_file_path="$PROJECT_DIR$/service-api/app/behat.yml" executable_path="$PROJECT_DIR$/service-api/app/vendor/behat/behat/bin/behat" use_configuration_file="true" />
-            <local_configuration configuration_file_path="$PROJECT_DIR$/service-front/app/behat.yml" executable_path="$PROJECT_DIR$/service-front/app/vendor/behat/behat/bin/behat" use_configuration_file="true" />
+            <configuration_by_sdk interpreter_id="a252f9af-85e6-4a7b-b4d0-a73204db31c6" executable_path="/app/vendor/behat/behat/bin/behat" />
+            <configuration_by_sdk interpreter_id="f727a88f-8a28-4df0-87a2-12a139ed8d31" configuration_file_path="/app/behat.yml" executable_path="/app/vendor/behat/behat/bin/behat" use_configuration_file="true" />
+            <configuration_by_sdk interpreter_id="629f1e4d-0e9c-4595-aa54-e8d28c3ac0df" configuration_file_path="/app/behat.yml" executable_path="/app/vendor/behat/behat/bin/behat" use_configuration_file="true" />
+            <configuration_by_sdk interpreter_id="d0145a1b-f903-43c7-8428-a985293fe8b9" configuration_file_path="/app/behat.yml" executable_path="/app/vendor/behat/behat/bin/behat" use_configuration_file="true" />
           </configurations>
         </settings>
       </tool>
@@ -21,15 +22,15 @@
             <info id="interpreter-629f1e4d-0e9c-4595-aa54-e8d28c3ac0df/app/vendor/behat/behat/bin/behat" version="3.11.0" />
             <info id="interpreter-a252f9af-85e6-4a7b-b4d0-a73204db31c6/app/vendor/behat/behat/bin/behat" version="3.13.0" />
             <info id="interpreter-d0145a1b-f903-43c7-8428-a985293fe8b9/app/vendor/behat/behat/bin/behat" version="3.13.0" />
+            <info id="interpreter-f727a88f-8a28-4df0-87a2-12a139ed8d31/app/vendor/behat/behat/bin/behat" version="3.13.0" />
           </versions>
         </cache>
       </tool>
       <tool tool_name="PHPUnit">
         <cache>
           <versions>
-            <info id="Local/Users/adam.cooper/Projects/Applications/opg-use-an-lpa/service-front/app/vendor/autoload.php" version="9.6.7" />
-            <info id="interpreter-d0145a1b-f903-43c7-8428-a985293fe8b9" version="8.5.27" />
-            <info id="interpreter-f727a88f-8a28-4df0-87a2-12a139ed8d31" version="8.5.27" />
+            <info id="interpreter-d0145a1b-f903-43c7-8428-a985293fe8b9" version="9.6.13" />
+            <info id="interpreter-f727a88f-8a28-4df0-87a2-12a139ed8d31" version="9.6.13" />
           </versions>
         </cache>
       </tool>
diff --git a/.idea/php.xml b/.idea/php.xml
index cb43c91537..80a90f4999 100644
--- a/.idea/php.xml
+++ b/.idea/php.xml
@@ -12,7 +12,6 @@
   <component name="PHPCodeSnifferOptionsConfiguration">
     <option name="codingStandard" value="Custom" />
     <option name="customRuleset" value="/app/phpcs.xml.dist" />
-    <option name="extensions" value="php,inc" />
     <option name="showSniffs" value="true" />
     <option name="transferred" value="true" />
   </component>
@@ -215,6 +214,7 @@
       <path value="$PROJECT_DIR$/service-front/app/vendor/sebastian/complexity" />
       <path value="$PROJECT_DIR$/service-front/app/vendor/dealerdirect/phpcodesniffer-composer-installer" />
       <path value="$PROJECT_DIR$/service-front/app/vendor/slevomat/coding-standard" />
+      <path value="$PROJECT_DIR$/service-front/app/vendor/stella-maris/clock" />
       <path value="$PROJECT_DIR$/service-front/app/vendor/psalm/plugin-phpunit" />
       <path value="$PROJECT_DIR$/service-front/app/vendor/psr/clock" />
       <path value="$PROJECT_DIR$/service-front/app/vendor/symfony/var-exporter" />
@@ -414,11 +414,12 @@
       <path value="$PROJECT_DIR$/service-api/app/vendor/sebastian/diff" />
       <path value="$PROJECT_DIR$/service-api/app/vendor/php-http/httplug" />
       <path value="$PROJECT_DIR$/service-api/app/vendor/sebastian/lines-of-code" />
+      <path value="$PROJECT_DIR$/service-front/app/vendor/stella-maris/clock" />
     </include_path>
   </component>
   <component name="PhpInterpreters">
     <interpreters>
-      <interpreter id="d0145a1b-f903-43c7-8428-a985293fe8b9" name="api-app" home="docker-compose://DATA" auto="false" debugger_id="php.debugger.XDebug" debugger_extension="/usr/local/lib/php/extensions/no-debug-non-zts-20210902/xdebug.so">
+      <interpreter id="d0145a1b-f903-43c7-8428-a985293fe8b9" name="api-app" home="docker-compose://DATA" false="false" debugger_id="php.debugger.XDebug" debugger_extension="/usr/local/lib/php/extensions/no-debug-non-zts-20210902/xdebug.so">
         <remote_data INTERPRETER_PATH="php" HELPERS_PATH="/opt/.phpstorm_helpers" VALID="true" RUN_AS_ROOT_VIA_SUDO="false" DOCKER_ACCOUNT_NAME="Docker" DOCKER_COMPOSE_SERVICE_NAME="api-app" DOCKER_REMOTE_PROJECT_PATH="/opt/project">
           <type_data command="RUN" />
           <dockerComposeConfigurationPaths>
@@ -429,7 +430,7 @@
           <envs />
         </remote_data>
       </interpreter>
-      <interpreter id="f727a88f-8a28-4df0-87a2-12a139ed8d31" name="front-app" home="docker-compose://DATA" auto="false" debugger_id="php.debugger.XDebug" debugger_extension="/usr/local/lib/php/extensions/no-debug-non-zts-20210902/xdebug.so">
+      <interpreter id="f727a88f-8a28-4df0-87a2-12a139ed8d31" name="front-app" home="docker-compose://DATA" false="false" debugger_id="php.debugger.XDebug" debugger_extension="/usr/local/lib/php/extensions/no-debug-non-zts-20210902/xdebug.so">
         <remote_data INTERPRETER_PATH="php" HELPERS_PATH="/opt/.phpstorm_helpers" VALID="true" RUN_AS_ROOT_VIA_SUDO="false" DOCKER_ACCOUNT_NAME="Docker" DOCKER_COMPOSE_SERVICE_NAME="actor-app" DOCKER_REMOTE_PROJECT_PATH="/opt/project">
           <type_data command="RUN" />
           <dockerComposeConfigurationPaths>
@@ -440,7 +441,7 @@
           <envs />
         </remote_data>
       </interpreter>
-      <interpreter id="629f1e4d-0e9c-4595-aa54-e8d28c3ac0df" name="smoke" home="docker-compose://DATA" auto="false" debugger_id="php.debugger.XDebug" debugger_extension="/usr/local/lib/php/extensions/no-debug-non-zts-20210902/xdebug.so">
+      <interpreter id="629f1e4d-0e9c-4595-aa54-e8d28c3ac0df" name="smoke" home="docker-compose://DATA" false="false" debugger_id="php.debugger.XDebug" debugger_extension="/usr/local/lib/php/extensions/no-debug-non-zts-20210902/xdebug.so">
         <remote_data INTERPRETER_PATH="php" HELPERS_PATH="/opt/.phpstorm_helpers" VALID="true" RUN_AS_ROOT_VIA_SUDO="false" DOCKER_ACCOUNT_NAME="Docker" DOCKER_COMPOSE_SERVICE_NAME="smoke-tests" DOCKER_REMOTE_PROJECT_PATH="/opt/project">
           <type_data command="RUN" />
           <dockerComposeConfigurationPaths>
@@ -454,7 +455,7 @@
           </envs>
         </remote_data>
       </interpreter>
-      <interpreter id="a252f9af-85e6-4a7b-b4d0-a73204db31c6" name="test-api-app" home="docker-compose://DATA" auto="false" debugger_id="php.debugger.XDebug" debugger_extension="/usr/local/lib/php/extensions/no-debug-non-zts-20210902/xdebug.so">
+      <interpreter id="a252f9af-85e6-4a7b-b4d0-a73204db31c6" name="test-api-app" home="docker-compose://DATA" false="false" debugger_id="php.debugger.XDebug" debugger_extension="/usr/local/lib/php/extensions/no-debug-non-zts-20210902/xdebug.so">
         <configuration_options>
           <configuration_option name="xdebug.client_host" value="host.docker.internal" />
         </configuration_options>
@@ -803,10 +804,7 @@
   <component name="PhpUnit">
     <phpunit_settings>
       <phpunit_by_interpreter interpreter_id="f727a88f-8a28-4df0-87a2-12a139ed8d31" custom_loader_path="/app/vendor/autoload.php" phpunit_phar_path="" />
-      <PhpUnitSettings custom_loader_path="$PROJECT_DIR$/tests/smoke/vendor/autoload.php" />
-      <PhpUnitSettings configuration_file_path="$PROJECT_DIR$/service-api/app/phpunit.xml.dist" custom_loader_path="$PROJECT_DIR$/service-api/app/vendor/autoload.php" use_configuration_file="true" />
       <phpunit_by_interpreter interpreter_id="d0145a1b-f903-43c7-8428-a985293fe8b9" custom_loader_path="/app/vendor/autoload.php" phpunit_phar_path="" />
-      <PhpUnitSettings custom_loader_path="$PROJECT_DIR$/service-front/app/vendor/autoload.php" phpunit_phar_path="" />
     </phpunit_settings>
   </component>
   <component name="Psalm">
@@ -814,6 +812,7 @@
       <PsalmConfiguration tool_path="$PROJECT_DIR$/service-api/app/vendor/bin/psalm" />
       <psalm_fixer_by_interpreter interpreter_id="f727a88f-8a28-4df0-87a2-12a139ed8d31" tool_path="/app/vendor/bin/psalm" timeout="60000" />
       <psalm_fixer_by_interpreter interpreter_id="d0145a1b-f903-43c7-8428-a985293fe8b9" tool_path="/app/vendor/bin/psalm" timeout="60000" />
+      <psalm_fixer_by_interpreter interpreter_id="629f1e4d-0e9c-4595-aa54-e8d28c3ac0df" tool_path="/app/vendor/bin/psalm" timeout="60000" />
     </Psalm_settings>
   </component>
   <component name="PsalmOptionsConfiguration">