diff --git a/tests/Feature/PdfMaker/PdfMakerDesignsTest.php b/tests/Feature/PdfMaker/PdfMakerDesignsTest.php
index 4858957741..d836a7ba34 100644
--- a/tests/Feature/PdfMaker/PdfMakerDesignsTest.php
+++ b/tests/Feature/PdfMaker/PdfMakerDesignsTest.php
@@ -24,27 +24,30 @@ class PdfMakerDesignsTest extends TestCase
 
         $this->state = [
             'variables' => [
-                '$css' => asset('css/tailwindcss@1.4.6.css'),
-                '$global-margin' => 'm-12',
-                '$global-padding' => 'p-12',
+                'labels' => [],
+                'values' => [
+                    '$css' => asset('css/tailwindcss@1.4.6.css'),
+                    '$global-margin' => 'm-12',
+                    '$global-padding' => 'p-12',
 
-                '$company-logo' => 'https://invoiceninja-invoice-templates.netlify.app/assets/images/invoiceninja-logo.png',
-                '$company-name' => 'Invoice Ninja',
-                '$entity-number-label' => 'Invoice number',
-                '$entity-number' => '10000',
-                '$entity-date-label' => 'Invoice date',
-                '$entity-date' => '3th of June, 2025.',
-                '$due-date-label' => 'Due date',
-                '$due-date' => '5th of June, 2025.',
-                '$balance-due-label' => 'Balance due',
-                '$balance-due' => '$800.50',
+                    '$company-logo' => 'https://invoiceninja-invoice-templates.netlify.app/assets/images/invoiceninja-logo.png',
+                    '$company-name' => 'Invoice Ninja',
+                    '$entity-number-label' => 'Invoice number',
+                    '$entity-number' => '10000',
+                    '$entity-date-label' => 'Invoice date',
+                    '$entity-date' => '3th of June, 2025.',
+                    '$due-date-label' => 'Due date',
+                    '$due-date' => '5th of June, 2025.',
+                    '$balance-due-label' => 'Balance due',
+                    '$balance-due' => '$800.50',
 
-                '$terms-label' => 'Terms',
-                '$terms' => 'Trend and SEO report has been sent via email. This is really long text just to test the width of the elements.',
+                    '$terms-label' => 'Terms',
+                    '$terms' => 'Trend and SEO report has been sent via email. This is really long text just to test the width of the elements.',
 
-                '$invoice-issued-to' => 'Invoice issued to:',
+                    '$invoice-issued-to' => 'Invoice issued to:',
 
-                '$entity' => 'Invoice',
+                    '$entity' => 'Invoice',
+                ],
             ],
         ];
     }
@@ -707,7 +710,7 @@ class PdfMakerDesignsTest extends TestCase
         $this->assertTrue(true);
     }
 
-public function testElegant()
+    public function testElegant()
     {
         $state = [
             'template' => [
@@ -799,7 +802,7 @@ public function testElegant()
                                 ['element' => 'td', 'content' => '$2.00', 'properties' => ['class' => 'px-4 py-2 text-right']],
                             ]],
                             ['element' => 'tr', 'content' => '', 'properties' => ['class' => 'mt-8 px-4 py-2'], 'elements' => [
-                            ['element' => 'td', 'content' => 'Balance due', 'properties' => ['class' => 'border-l-4 border-white px-4 text-right', 'colspan' => '4']],
+                                ['element' => 'td', 'content' => 'Balance due', 'properties' => ['class' => 'border-l-4 border-white px-4 text-right', 'colspan' => '4']],
                                 ['element' => 'td', 'content' => '$2.00', 'properties' => ['class' => 'px-4 py-2 text-right']],
                             ]],
                         ]],
diff --git a/tests/Feature/PdfMaker/PdfMakerTest.php b/tests/Feature/PdfMaker/PdfMakerTest.php
index f29f2eddd3..73ad3c8aef 100644
--- a/tests/Feature/PdfMaker/PdfMakerTest.php
+++ b/tests/Feature/PdfMaker/PdfMakerTest.php
@@ -10,7 +10,10 @@ class PdfMakerTest extends TestCase
 {
     public $state = [
         'template' => [],
-        'variables' => [],
+        'variables' => [
+            'labels' => [],
+            'values' => [],
+        ],
     ];
 
     public function testDesignLoadsCorrectly()
@@ -63,7 +66,10 @@ class PdfMakerTest extends TestCase
                     ],
                 ],
             ],
-            'variables' => [],
+            'variables' => [
+                'labels' => [],
+                'values' => [],
+            ],
         ];
 
         $maker = new PdfMaker($state);
@@ -97,7 +103,10 @@ class PdfMakerTest extends TestCase
                 ],
             ],
             'variables' => [
-                '$title' => 'Invoice Ninja',
+                'labels' => [],
+                'values' => [
+                    '$title' => 'Invoice Ninja',
+                ],
             ],
         ];
 
@@ -139,9 +148,12 @@ class PdfMakerTest extends TestCase
                 ],
             ],
             'variables' => [
-                '$company' => 'Invoice Ninja',
-                '$email' => 'contact@invoiceninja.com',
-                '$country' => 'UK',
+                'labels' => [],
+                'values' => [
+                    '$company' => 'Invoice Ninja',
+                    '$email' => 'contact@invoiceninja.com',
+                    '$country' => 'UK',
+                ],
             ],
         ];
 
@@ -294,8 +306,11 @@ class PdfMakerTest extends TestCase
                     ],
                 ]
             ],
-            'variables' =>[
-                '$title' => 'Invoice Ninja',
+            'variables' => [
+                'labels' => [],
+                'values' => [
+                    '$title' => 'Invoice Ninja',
+                ],
             ]
         ];