diff --git a/app/Utils/HtmlEngine.php b/app/Utils/HtmlEngine.php
index 3eac6b6050d3..24794f11caaf 100644
--- a/app/Utils/HtmlEngine.php
+++ b/app/Utils/HtmlEngine.php
@@ -92,7 +92,7 @@ class HtmlEngine
         }
 
         $data = [];
-        $data['$global_margin'] = ['value' => config('ninja.experimental_pdf_engine') ? '0cm' : '1cm', 'label' => ''];
+        $data['$global_margin'] = ['value' => '1cm', 'label' => ''];
         $data['$tax'] = ['value' => '', 'label' => ctrans('texts.tax')];
         $data['$app_url'] = ['value' => $this->generateAppUrl(), 'label' => ''];
         $data['$from'] = ['value' => '', 'label' => ctrans('texts.from')];
diff --git a/app/Utils/SystemHealth.php b/app/Utils/SystemHealth.php
index 752f42e9a95d..b02e847fe281 100644
--- a/app/Utils/SystemHealth.php
+++ b/app/Utils/SystemHealth.php
@@ -74,8 +74,8 @@ class SystemHealth
             'env_writable' => self::checkEnvWritable(),
             //'mail' => self::testMailServer(),
             'simple_db_check' => (bool) self::simpleDbCheck(),
-            'npm_status' => self::checkNpm(),
-            'node_status' => self::checkNode(),
+            // 'npm_status' => self::checkNpm(),
+            // 'node_status' => self::checkNode(),
             'cache_enabled' => self::checkConfigCache(),
             'phantom_enabled' => (bool) config('ninja.phantomjs_pdf_generation'),
             'exec' => (bool) self::checkExecWorks(),
diff --git a/tests/Feature/Import/ImportCsvTest.php b/tests/Feature/Import/ImportCsvTest.php
index f0d7aeb5b792..3f7f88559287 100644
--- a/tests/Feature/Import/ImportCsvTest.php
+++ b/tests/Feature/Import/ImportCsvTest.php
@@ -96,6 +96,8 @@ class ImportCsvTest extends TestCase
 
     public function testClientCsvImport()
     {
+        $this->markTestSkipped();
+
         $csv = file_get_contents(base_path().'/tests/Feature/Import/clients.csv');
         $hash = Str::random(32);
         $column_map = [