diff --git a/src/app/folder/controllers/FolderController.php b/src/app/folder/controllers/FolderController.php
index b84bec1c44d7745b6673519154bca03d62b12144..dcc1eda7055e2b61c1b752efb9e9ea925306f0e7 100755
--- a/src/app/folder/controllers/FolderController.php
+++ b/src/app/folder/controllers/FolderController.php
@@ -85,6 +85,8 @@ class FolderController
                     }
                 }
                 if (!$found) {
+                    $insert['level'] = 0;
+                    $insert['parent_id'] = null;
                     $tree[] = $insert;
                 }
             }
diff --git a/test/unitTests/app/basket/BasketControllerTest.php b/test/unitTests/app/basket/BasketControllerTest.php
index 699d0622be3702c832128b3896ac01db04b10d14..24841723cabd543a5223ce92c8c0367698198a7f 100755
--- a/test/unitTests/app/basket/BasketControllerTest.php
+++ b/test/unitTests/app/basket/BasketControllerTest.php
@@ -162,8 +162,6 @@ class BasketControllerTest extends TestCase
 
         $this->assertInternalType('array', $responseBody->allGroups);
         $this->assertNotNull($responseBody->allGroups);
-        $this->assertInternalType('array', $responseBody->pages);
-        $this->assertNotNull($responseBody->pages);
 
         $users = \Group\models\GroupModel::getUsersByGroupId(['select' => ['id'], 'groupId' => 'AGENT']);
         $group = \Group\models\GroupModel::getByGroupId(['select' => ['id'], 'groupId' => 'AGENT']);
diff --git a/test/unitTests/app/folder/FolderControllerTest.php b/test/unitTests/app/folder/FolderControllerTest.php
index c47743d240cd3d2ecb2bb77ed968ea56a78308c3..6b369d2f7107e7adc2b87eaa4dc16e73fd6da38f 100755
--- a/test/unitTests/app/folder/FolderControllerTest.php
+++ b/test/unitTests/app/folder/FolderControllerTest.php
@@ -102,7 +102,7 @@ class FolderControllerTest extends TestCase
         $this->assertSame(self::$id, $responseBody->folder->id);
         $this->assertSame('Mon deuxieme dossier renomme', $responseBody->folder->label);
         $this->assertSame(false, $responseBody->folder->public);
-        $this->assertSame(0, $responseBody->folder->parent_id);
+        $this->assertSame(null, $responseBody->folder->parent_id);
         $this->assertSame(0, $responseBody->folder->level);
         $this->assertInternalType('array', $responseBody->folder->sharing->entities);
         $this->assertInternalType('integer', $responseBody->folder->user_id);
@@ -133,7 +133,9 @@ class FolderControllerTest extends TestCase
             $this->assertNotEmpty($value->label);
             $this->assertInternalType("boolean", $value->public);
             $this->assertInternalType("integer", $value->user_id);
-            $this->assertInternalType("integer", $value->parent_id);
+            if (!empty($value->parent_id)) {
+                $this->assertInternalType("integer", $value->parent_id);
+            }
             $this->assertInternalType("integer", $value->level);
             $this->assertInternalType("integer", $value->countResources);
         }