diff --git a/app/DataMapper/EmailTemplateDefaults.php b/app/DataMapper/EmailTemplateDefaults.php
index a8423105aafc..40163be8f58d 100644
--- a/app/DataMapper/EmailTemplateDefaults.php
+++ b/app/DataMapper/EmailTemplateDefaults.php
@@ -34,7 +34,7 @@ class EmailTemplateDefaults
                 return self::emailPaymentTemplate();
                 break;
             case 'email_template_payment_partial':
-                return self::emailPaymentTemplate();
+                return self::emailPaymentPartialTemplate();
                 break;
             case 'email_template_statement':
                 return self::emailStatementTemplate();
@@ -73,7 +73,7 @@ class EmailTemplateDefaults
                 return self::emailPaymentSubject();
                 break;
             case 'email_subject_payment_partial':
-                return self::emailPaymentSubject();
+                return self::emailPaymentPartialSubject();
                 break;
             case 'email_subject_statement':
                 return self::emailStatementSubject();
@@ -140,13 +140,11 @@ class EmailTemplateDefaults
         ]);
 
         return $converter->convertToHtml(self::transformText('quote_message'));
-        //return Parsedown::instance()->line(self::transformText('quote_message'));
     }
 
     public static function emailPaymentSubject()
     {
         return ctrans('texts.payment_subject');
-        //return Parsedown::instance()->line(self::transformText('payment_subject'));
     }
 
     public static function emailPaymentTemplate()
@@ -158,7 +156,11 @@ class EmailTemplateDefaults
 
         return $converter->convertToHtml(self::transformText('payment_message'));
 
-        // return Parsedown::instance()->line(self::transformText('payment_message'));
+    }
+
+    public static function emailPaymentPartialSubject()
+    {
+        return ctrans('texts.payment_subject');
     }
 
     public static function emailReminder1Subject()
diff --git a/app/Models/Gateway.php b/app/Models/Gateway.php
index 4ac87da2facf..725352c06ab1 100644
--- a/app/Models/Gateway.php
+++ b/app/Models/Gateway.php
@@ -100,7 +100,7 @@ class Gateway extends StaticModel
      * Returns an array of methods and the gatewaytypes possible
      * 
      * @return array 
-     */
+     *///todo remove methods replace with gatewaytype:: and then nest refund / token billing
     public function getMethods()
     {
         switch ($this->id) {
diff --git a/app/Utils/HtmlEngine.php b/app/Utils/HtmlEngine.php
index a1c75a71ef5b..3d3b3e64b9b4 100644
--- a/app/Utils/HtmlEngine.php
+++ b/app/Utils/HtmlEngine.php
@@ -121,7 +121,7 @@ class HtmlEngine
             $data['$entity.terms'] = ['value' => $this->entity->terms ?: ' ', 'label' => ctrans('texts.invoice_terms')];
             $data['$terms'] = &$data['$entity.terms'];
             $data['$view_link'] = ['value' => '<a href="'.$this->invitation->getLink().'">'.ctrans('texts.view_invoice').'</a>', 'label' => ctrans('texts.view_invoice')];
-            // $data['$view_link']          = ['value' => $this->invitation->getLink(), 'label' => ctrans('texts.view_invoice')];
+            $data['$view_url'] = ['value' => $this->invitation->getLink(), 'label' => ctrans('texts.view_invoice')];
         }
 
         if ($this->entity_string == 'quote') {
diff --git a/composer.json b/composer.json
index 7316737155a7..9fc290fc3d51 100644
--- a/composer.json
+++ b/composer.json
@@ -64,16 +64,17 @@
         "laravel/ui": "^3.0"
     },
     "require-dev": {
-        "wildbit/postmark-php": "^4.0",
         "anahkiasen/former": "^4.2",
         "barryvdh/laravel-debugbar": "^3.4",
+        "brianium/paratest": "^5.0",
         "darkaonline/l5-swagger": "^8.0",
+        "facade/ignition": "^2.3.6",
         "filp/whoops": "^2.7",
+        "fzaninotto/faker": "^1.9.1",
         "mockery/mockery": "^1.3.1",
         "nunomaduro/collision": "^5.0",
         "phpunit/phpunit": "^9.0",
-        "fzaninotto/faker": "^1.9.1",
-        "facade/ignition": "^2.3.6"
+        "wildbit/postmark-php": "^4.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/cypress.json b/cypress.json
index 79a612a766cb..92e52adf8c0c 100644
--- a/cypress.json
+++ b/cypress.json
@@ -1,5 +1,5 @@
 {
     "video": false,
-    "baseUrl": "http://invoiceninja.wip/",
+    "baseUrl": "http://ninja.test:8000/",
     "chromeWebSecurity": false
 }