diff --git a/TODO-2.0.md b/TODO-2.0.md
index e545a34c071d3f41de38f0b25308d018d97d57e4..aa0f36eb364eccacd24d221ef6ad87159058ebf1 100644
--- a/TODO-2.0.md
+++ b/TODO-2.0.md
@@ -13,23 +13,8 @@
 * Register to do
 * Brute-force detection ?
 
-* Add new SMTP params
-* unhandled parameters:
-  * issuerDB\*Rule
-* securize SOAP session creation by cipher
 * Verify securedCookie=3 (strange)
 * Calendar in notifications explorer
-* Test for Zero
 * "mail" in UserDB/\*
 * verify activeTimer on/off on screen
 * Add test for #173
-
-# Combination
-
-* detect changes
-* diff()
-
-# Password
-
-* Enable it during auth
-
diff --git a/lemonldap-ng-manager/t/jsonfiles/01-base-tree.json b/lemonldap-ng-manager/t/jsonfiles/01-base-tree.json
index 966aa2caee7b05e9a25ca53ee53f88d0b5d35b5c..07ec80c9d8b7fad23f8debc3e25764361ef25ace 100644
--- a/lemonldap-ng-manager/t/jsonfiles/01-base-tree.json
+++ b/lemonldap-ng-manager/t/jsonfiles/01-base-tree.json
@@ -1109,7 +1109,7 @@
           "title": "Directory",
           "type": "keyText"
         }, {
-          "data": "/var/lib/lemonldap-ng/sessions/lock/",
+          "data": "t/sessions",
           "id": "globalStorageOptions/LockDirectory",
           "title": "LockDirectory",
           "type": "keyText"
diff --git a/lemonldap-ng-manager/t/jsonfiles/02-base-tree-all-nodes-opened.json b/lemonldap-ng-manager/t/jsonfiles/02-base-tree-all-nodes-opened.json
index b61a84e3665fbe4115ff8880698342b3272ffa26..7dc948f1b564b2d2fc5ca67faa9cad5a93cae6fd 100644
--- a/lemonldap-ng-manager/t/jsonfiles/02-base-tree-all-nodes-opened.json
+++ b/lemonldap-ng-manager/t/jsonfiles/02-base-tree-all-nodes-opened.json
@@ -1262,7 +1262,7 @@
           "title": "Directory",
           "type": "keyText"
         }, {
-          "data": "/var/lib/lemonldap-ng/sessions/lock/",
+          "data": "t/sessions",
           "id": "globalStorageOptions/LockDirectory",
           "title": "LockDirectory",
           "type": "keyText"
@@ -1280,6 +1280,11 @@
           "title": "Directory",
           "type": "keyText",
           "id": "globalStorageOptions/Directory"
+        }, {
+          "data": "t/sessions",
+          "title": "LockDirectory",
+          "type": "keyText",
+          "id": "globalStorageOptions/LockDirectory"
         }, {
           "data": "Lemonldap::NG::Common::Apache::Session::Generate::SHA256",
           "type": "keyText",
@@ -1348,7 +1353,12 @@
           "title": "Directory",
           "id": "persistentStorageOptions/Directory",
           "type": "keyText",
-          "data": "__PSESSIONDIR__"
+          "data": "t/sessions"
+	}, {
+          "data": "t/sessions",
+          "id": "persistentStorageOptions/LockDirectory",
+          "title": "LockDirectory",
+          "type": "keyText"
         }]
       }]
     }]
diff --git a/lemonldap-ng-manager/t/jsonfiles/12-modified.json b/lemonldap-ng-manager/t/jsonfiles/12-modified.json
index 5dd94241a274a84e833663c356ccdb8eb1b1c763..e6476e539fab8525973ba270e5f4fb133b9c001a 100644
--- a/lemonldap-ng-manager/t/jsonfiles/12-modified.json
+++ b/lemonldap-ng-manager/t/jsonfiles/12-modified.json
@@ -1268,12 +1268,12 @@
         "data": "Apache::Session::File"
       }, {
         "default": [{
-          "data": "/var/lib/lemonldap-ng/sessions/",
+          "data": "t/sessions/",
           "id": "globalStorageOptions/Directory",
           "title": "Directory",
           "type": "keyText"
         }, {
-          "data": "/var/lib/lemonldap-ng/sessions/lock/",
+          "data": "t/sessions",
           "id": "globalStorageOptions/LockDirectory",
           "title": "LockDirectory",
           "type": "keyText"
@@ -1291,6 +1291,11 @@
           "title": "Directory",
           "type": "keyText",
           "id": "globalStorageOptions/Directory"
+        }, {
+          "data": "t/sessions",
+          "title": "LockDirectory",
+          "type": "keyText",
+          "id": "globalStorageOptions/LockDirectory"
         }, {
           "data": "Lemonldap::NG::Common::Apache::Session::Generate::SHA256",
           "type": "keyText",
@@ -1359,7 +1364,12 @@
           "title": "Directory",
           "id": "persistentStorageOptions/Directory",
           "type": "keyText",
-          "data": "__PSESSIONDIR__"
+          "data": "t/sessions"
+	}, {
+          "data": "t/sessions",
+          "id": "persistentStorageOptions/LockDirectory",
+          "title": "LockDirectory",
+          "type": "keyText"
         }]
       }]
     }]
diff --git a/lemonldap-ng-manager/t/jsonfiles/14-bad.json b/lemonldap-ng-manager/t/jsonfiles/14-bad.json
index a7ca0dd8ceb25dc780665aa8c13add7fe6da3431..c475c8d155f6f0c9f2fe0ea0f7ccc892ea0fec01 100644
--- a/lemonldap-ng-manager/t/jsonfiles/14-bad.json
+++ b/lemonldap-ng-manager/t/jsonfiles/14-bad.json
@@ -1262,7 +1262,7 @@
           "title": "Directory",
           "type": "keyText"
         }, {
-          "data": "/var/lib/lemonldap-ng/sessions/lock/",
+          "data": "t/sessions",
           "id": "globalStorageOptions/LockDirectory",
           "title": "LockDirectory",
           "type": "keyText"
diff --git a/lemonldap-ng-manager/t/jsonfiles/15-combination.json b/lemonldap-ng-manager/t/jsonfiles/15-combination.json
index 5f47451efc51fa6b3cc7585a25d0d3b08b181ab6..22473e832c1d6af8ba586c887633a1c3808af3d7 100644
--- a/lemonldap-ng-manager/t/jsonfiles/15-combination.json
+++ b/lemonldap-ng-manager/t/jsonfiles/15-combination.json
@@ -1758,7 +1758,7 @@
           "type": "keyText"
         },
         {
-          "data": "/var/lib/lemonldap-ng/sessions/lock/",
+          "data": "t/sessions",
           "id": "globalStorageOptions/LockDirectory",
           "title": "LockDirectory",
           "type": "keyText"