diff --git a/app/Services/Invoice/EInvoice/FatturaPA.php b/app/Services/Invoice/EInvoice/FatturaPA.php
index a7a523ec190a..9d2dbe69a26e 100644
--- a/app/Services/Invoice/EInvoice/FatturaPA.php
+++ b/app/Services/Invoice/EInvoice/FatturaPA.php
@@ -66,7 +66,7 @@ class FatturaPA extends AbstractService
 
     public function run()
     {
-
+        return $this->addHeader()->getXml();
     }
     
    public function addHeader() {
@@ -108,11 +108,11 @@ class FatturaPA extends AbstractService
         }
         $lineItem = $this->xml->FatturaElettronicaBody->DatiBeniServizi->addChild('DettaglioLinee');
         $lineItem->addChild('NumeroLinea', $data['NumeroLinea']);
-        $lineItem->addChild('Descrizione', $data['Descrizione']);
-        $lineItem->addChild('Quantita', $data['Quantita']);
-        $lineItem->addChild('PrezzoUnitario', $data['PrezzoUnitario']);
-        $lineItem->addChild('PrezzoTotale', $data['PrezzoTotale']);
-        $lineItem->addChild('AliquotaIVA', $data['AliquotaIVA']);
+        $lineItem->addChild('Descrizione', $data['notes']);
+        $lineItem->addChild('Quantita', $data['quantity']);
+        $lineItem->addChild('PrezzoUnitario', $data['cost']);
+        $lineItem->addChild('PrezzoTotale', $data['line_total']);
+        $lineItem->addChild('AliquotaIVA', $data['tax_rate1']);
 
         if (isset($data['UnitaMisura'])) {
             $lineItem->addChild('UnitaMisura', $data['UnitaMisura']);
diff --git a/tests/Feature/EInvoice/FatturaPATest.php b/tests/Feature/EInvoice/FatturaPATest.php
new file mode 100644
index 000000000000..fbbf810e3e6c
--- /dev/null
+++ b/tests/Feature/EInvoice/FatturaPATest.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace Tests\Feature;
+
+use App\Services\Invoice\EInvoice\FatturaPA;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Illuminate\Routing\Middleware\ThrottleRequests;
+use Tests\MockAccountData;
+use Tests\TestCase;
+
+/**
+ * @test
+ */
+class FatturaPATest extends TestCase
+{
+    use DatabaseTransactions;
+    use MockAccountData;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->makeTestData();
+
+        $this->withoutMiddleware(
+            ThrottleRequests::class
+        );
+    }
+
+    public function testInvoiceBoot()
+    {
+        $fat = new FatturaPA($this->invoice);
+        $xml = $fat->run();
+
+        nlog($xml);
+        
+        $this->assertnotNull($xml);
+    }
+}
\ No newline at end of file