diff --git a/app/Models/Client.php b/app/Models/Client.php
index e6770268aad7..9db671e1667e 100644
--- a/app/Models/Client.php
+++ b/app/Models/Client.php
@@ -210,14 +210,12 @@ class Client extends BaseModel
 
         //check group level (if a group is assigned)
         if($this->group_settings && (property_exists($this->group_settings->settings, $setting) !== false) && (isset($this->group_settings->settings->{$setting}) !== false)){
-                            \Log::error('returning group '.$this->group_settings->{$setting});
 
            return $this->group_settings->settings->{$setting};
         }
         
         //check company level
         if((property_exists($this->company->settings, $setting) != false ) && (isset($this->company->settings->{$setting}) !== false) ){
-                                        \Log::error('returning company '.$this->company->{$setting});
 
             return $this->company->settings->{$setting};
         }
diff --git a/tests/Unit/InvoiceTest.php b/tests/Unit/InvoiceTest.php
index 8d3b4a7100f5..f9b24a593e38 100644
--- a/tests/Unit/InvoiceTest.php
+++ b/tests/Unit/InvoiceTest.php
@@ -32,8 +32,8 @@ class InvoiceTest extends TestCase
 		
 		$this->settings = $this->invoice->settings;
 
-		$this->settings->custom_taxes1 = true;
-		$this->settings->custom_taxes2 = true;
+		$this->settings->custom_invoice_taxes1 = true;
+		$this->settings->custom_invoice_taxes2 = true;
 		$this->settings->inclusive_taxes = true;
 		$this->settings->precision = 2;