diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index dd706e340..e84e1991b 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -3,20 +3,25 @@
 /**
  * Test harness bootstrap that sets up initial defines and builds up the initial database schema
  */
-
 include_once(__DIR__ . '/../bootstrap/autoload.php');
 
 use Illuminate\Contracts\Console\Kernel;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;
 
+// Setup basic app services
+$app = require __DIR__ . '/../bootstrap/app.php';
+$app->make(Kernel::class)->bootstrap();
+
 /**
  * @todo Migrate to configuration parameters
  */
 define('PATH_TRUNK', dirname(__DIR__));
 define('PATH_CORE', PATH_TRUNK . '/workflow/engine/');
 define('PATH_CONFIG', PATH_CORE . 'config/');
-define('PATH_DATA', dirname(__DIR__) . '/shared/');
+if (!defined("PATH_DATA")) {
+    define('PATH_DATA', dirname(__DIR__) . '/shared/');
+}
 define('PATH_RBAC_CORE', dirname(__DIR__) . '/rbac/engine/');
 define('PATH_DB', PATH_DATA . 'sites/');
 // Define some values related to the workspace
@@ -36,7 +41,9 @@ define('PATH_RBAC_HOME', PATH_TRUNK . '/rbac/');
 define('PATH_RBAC', PATH_RBAC_HOME . 'engine/classes/');
 define("PATH_CUSTOM_SKINS", PATH_DATA . "skins/");
 define("PATH_TPL", PATH_CORE . "templates/");
-define('PATH_C', PATH_DATA . 'compiled/');
+if (!defined("PATH_C")) {
+    define('PATH_C', PATH_DATA . 'compiled/');
+}
 define('DB_HOST', env('DB_HOST'));
 define('DB_NAME', env('DB_DATABASE'));
 define('DB_USER', env('DB_USERNAME'));
@@ -48,14 +55,10 @@ define('PATH_SMARTY_CACHE', PATH_TRUNK . '/shared/compiled/smarty/cache');
 define('PATH_THIRDPARTY', PATH_TRUNK . '/thirdparty/');
 
 // Set Time Zone
-$_SESSION['__SYSTEM_UTC_TIME_ZONE__'] = (int)(env('MAIN_SYSTEM_UTC_TIME_ZONE', 'workflow')) == 1;
+$_SESSION['__SYSTEM_UTC_TIME_ZONE__'] = (int) (env('MAIN_SYSTEM_UTC_TIME_ZONE', 'workflow')) == 1;
 ini_set('date.timezone', $_SESSION['__SYSTEM_UTC_TIME_ZONE__'] ? 'UTC' : env('MAIN_TIME_ZONE', 'America/New_York'));
 define('TIME_ZONE', ini_get('date.timezone'));
 
-// Setup basic app services
-$app = require __DIR__ . '/../bootstrap/app.php';
-$app->make(Kernel::class)->bootstrap();
-
 // Overwrite with the ProcessMaker env.ini configuration used in production environments
 //@todo: move env.ini configuration to .env
 ini_set('date.timezone', TIME_ZONE); //Set Time Zone
diff --git a/tests/unit/app/CustomizeFormatterTest.php b/tests/unit/app/CustomizeFormatterTest.php
index b5806a5a3..16cb653ee 100644
--- a/tests/unit/app/CustomizeFormatterTest.php
+++ b/tests/unit/app/CustomizeFormatterTest.php
@@ -17,7 +17,7 @@ class CustomizeFormatterTest extends TestCase
     protected function setUp()
     {
         parent::setUp();
-        self::$directory = PATH_TRUNK . '/storage/logs/';
+        self::$directory = PATH_DATA . 'logs/';
     }
 
     /**
diff --git a/tests/unit/workflow/engine/src/ProcessMaker/BusinessModel/SkinsTest.php b/tests/unit/workflow/engine/src/ProcessMaker/BusinessModel/SkinsTest.php
index a7316ca0d..e6076ce47 100644
--- a/tests/unit/workflow/engine/src/ProcessMaker/BusinessModel/SkinsTest.php
+++ b/tests/unit/workflow/engine/src/ProcessMaker/BusinessModel/SkinsTest.php
@@ -62,14 +62,17 @@ class SkinsTest extends TestCase
      */
     public function testGetSkinsCurrentWorkspace()
     {
-        $this->object->createSkin('test', 'test');
-        $this->object->createSkin(
-                'test2', 'test2', 'Second skin', 'ProcessMaker Team', 'current', 'neoclassic'
-        );
+        $this->object->createSkin('test2', 'test2', 'Second skin', 'ProcessMaker Team', 'current', 'neoclassic');
         $skins = $this->object->getSkins();
+
+        $this->assertCount(3, $skins);
+        $this->assertEquals($skins[2]['SKIN_FOLDER_ID'], 'test2');
+        $this->assertEquals($skins[2]['SKIN_WORKSPACE'], config("system.workspace"));
+
+        $this->object->createSkin('test', 'test');
+        $skins = $this->object->getSkins();
+
         $this->assertCount(4, $skins);
-        $this->assertEquals($skins[2]['SKIN_FOLDER_ID'], 'test');
-        $this->assertEquals($skins[3]['SKIN_FOLDER_ID'], 'test2');
-        $this->assertEquals($skins[3]['SKIN_WORKSPACE'], config("system.workspace"));
+        $this->assertEquals($skins[3]['SKIN_FOLDER_ID'], 'test');
     }
 }