diff --git a/service-api/app/features/context/Integration/LpaContext.php b/service-api/app/features/context/Integration/LpaContext.php
index 001098e259..3c4780099b 100644
--- a/service-api/app/features/context/Integration/LpaContext.php
+++ b/service-api/app/features/context/Integration/LpaContext.php
@@ -383,10 +383,7 @@ public function iProvideTheAttorneyDetailsFromAValidPaperLPADocument(): void
         $lpaMatchResponse = $addOlderLpa->validateRequest($this->userId, $data);
 
         $expectedLpaArray = json_decode(json_encode($this->lpa), true);
-        $expectedLpaArray['original_attorneys'] = $expectedLpaArray['attorneys'];
-        $expectedLpaArray['activeAttorneys'] = $expectedLpaArray['attorneys'];
-        $expectedLpaArray['inactiveAttorneys'] = [];
-        $expectedLpa = new \App\Service\Lpa\SiriusLpa($expectedLpaArray);
+        $expectedLpa      = new \App\Service\Lpa\SiriusLpa($expectedLpaArray);
         $expectedResponse = new AccessForAllValidation(
             new ActorMatch(
                 new SiriusPerson(json_decode(json_encode($this->lpa->attorneys[0]), true)),
@@ -1594,10 +1591,7 @@ public function iConfirmDetailsShownToMeOfTheFoundLPAAreCorrect(): void
         $lpaMatchResponse = $addOlderLpa->validateRequest($this->userId, $data);
 
         $expectedLpaArray = json_decode(json_encode($this->lpa), true);
-        $expectedLpaArray['original_attorneys'] = $expectedLpaArray['attorneys'];
-        $expectedLpaArray['activeAttorneys'] = $expectedLpaArray['attorneys'];
-        $expectedLpaArray['inactiveAttorneys'] = [];
-        $expectedLpa = new \App\Service\Lpa\SiriusLpa($expectedLpaArray);
+        $expectedLpa      = new \App\Service\Lpa\SiriusLpa($expectedLpaArray);
         $expectedResponse = new AccessForAllValidation(
             new ActorMatch(
                 new SiriusPerson(json_decode(json_encode($lpa->donor), true)),
@@ -1875,10 +1869,7 @@ public function iProvideDetailsThatMatchAValidPaperDocument($firstnames, $lastna
         $lpaMatchResponse   = $addAccessForAllLpa->validateRequest($this->userId, $data);
 
         $expectedLpaArray = json_decode(json_encode($this->lpa), true);
-        $expectedLpaArray['original_attorneys'] = $expectedLpaArray['attorneys'];
-        $expectedLpaArray['activeAttorneys'] = $expectedLpaArray['attorneys'];
-        $expectedLpaArray['inactiveAttorneys'] = [];
-        $expectedLpa = new \App\Service\Lpa\SiriusLpa($expectedLpaArray);
+        $expectedLpa      = new \App\Service\Lpa\SiriusLpa($expectedLpaArray);
         $expectedResponse = new AccessForAllValidation(
             new ActorMatch(
                 new SiriusPerson(json_decode(json_encode($this->lpa->donor), true)),
@@ -1938,10 +1929,7 @@ public function iProvideTheDetailsFromAValidPaperLPADocument(): void
         $lpaMatchResponse = $addOlderLpa->validateRequest($this->userId, $data);
 
         $expectedLpaArray = json_decode(json_encode($this->lpa), true);
-        $expectedLpaArray['original_attorneys'] = $expectedLpaArray['attorneys'];
-        $expectedLpaArray['activeAttorneys'] = $expectedLpaArray['attorneys'];
-        $expectedLpaArray['inactiveAttorneys'] = [];
-        $expectedLpa = new \App\Service\Lpa\SiriusLpa($expectedLpaArray);
+        $expectedLpa      = new \App\Service\Lpa\SiriusLpa($expectedLpaArray);
         $expectedResponse = new AccessForAllValidation(
             new ActorMatch(
                 new SiriusPerson(json_decode(json_encode($this->lpa->donor), true)),
@@ -2739,13 +2727,10 @@ public function iRequestForANewActivationKeyAgain(): void
         );
 
         $addOlderLpa = $this->container->get(AddAccessForAllLpa::class);
-        $response = $addOlderLpa->validateRequest($this->userId, $data);
+        $response    = $addOlderLpa->validateRequest($this->userId, $data);
 
         $expectedLpaArray = json_decode(json_encode($this->lpa), true);
-        $expectedLpaArray['original_attorneys'] = $expectedLpaArray['attorneys'];
-        $expectedLpaArray['activeAttorneys'] = $expectedLpaArray['attorneys'];
-        $expectedLpaArray['inactiveAttorneys'] = [];
-        $expectedLpa = new \App\Service\Lpa\SiriusLpa($expectedLpaArray);
+        $expectedLpa      = new \App\Service\Lpa\SiriusLpa($expectedLpaArray);
         $expectedResponse = new AccessForAllValidation(
             new ActorMatch(
                 new SiriusPerson(json_decode(json_encode($this->lpa->donor), true)),