diff --git a/.idea/nulib-base.iml b/.idea/nulib-base.iml
index c88c3c8..55df4ce 100644
--- a/.idea/nulib-base.iml
+++ b/.idea/nulib-base.iml
@@ -4,6 +4,7 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/php/src" isTestSource="false" packagePrefix="nulib\" />
       <sourceFolder url="file://$MODULE_DIR$/php/tests" isTestSource="true" packagePrefix="nulib\" />
+      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/php/vendor" />
     </content>
     <orderEntry type="inheritedJdk" />
diff --git a/.idea/php-test-framework.xml b/.idea/php-test-framework.xml
new file mode 100644
index 0000000..4b2e111
--- /dev/null
+++ b/.idea/php-test-framework.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="PhpTestFrameworkVersionCache">
+    <tools_cache>
+      <tool tool_name="PHPUnit">
+        <cache>
+          <versions>
+            <info id="Local/php/vendor/autoload.php" version="9.6.23" />
+          </versions>
+        </cache>
+      </tool>
+    </tools_cache>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/php.xml b/.idea/php.xml
index aced70d..7e6be21 100644
--- a/.idea/php.xml
+++ b/.idea/php.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="MessDetector">
+    <phpmd_settings>
+      <phpmd_by_interpreter asDefaultInterpreter="true" interpreter_id="846389f7-9fb5-4173-a868-1dc6b8fbb3fa" timeout="30000" />
+    </phpmd_settings>
+  </component>
   <component name="MessDetectorOptionsConfiguration">
     <option name="transferred" value="true" />
   </component>
@@ -10,6 +15,11 @@
     <option name="highlightLevel" value="WARNING" />
     <option name="transferred" value="true" />
   </component>
+  <component name="PhpCodeSniffer">
+    <phpcs_settings>
+      <phpcs_by_interpreter asDefaultInterpreter="true" interpreter_id="846389f7-9fb5-4173-a868-1dc6b8fbb3fa" timeout="30000" />
+    </phpcs_settings>
+  </component>
   <component name="PhpIncludePathManager">
     <include_path>
       <path value="$PROJECT_DIR$/php/vendor/symfony/polyfill-ctype" />
@@ -55,7 +65,7 @@
   </component>
   <component name="PhpUnit">
     <phpunit_settings>
-      <PhpUnitSettings configuration_file_path="$PROJECT_DIR$/php/vendor/sebastian/object-enumerator/phpunit.xml" custom_loader_path="$PROJECT_DIR$/vendor/autoload.php" use_configuration_file="true" />
+      <PhpUnitSettings custom_loader_path="$PROJECT_DIR$/php/vendor/autoload.php" phpunit_phar_path="" />
     </phpunit_settings>
   </component>
   <component name="PsalmOptionsConfiguration">
diff --git a/.idea/phpunit.xml b/.idea/phpunit.xml
new file mode 100644
index 0000000..4f8104c
--- /dev/null
+++ b/.idea/phpunit.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="PHPUnit">
+    <option name="directories">
+      <list>
+        <option value="$PROJECT_DIR$/tests" />
+      </list>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/runphp/update-runphp.sh b/runphp/update-runphp.sh
index 48a6095..b4555f5 100755
--- a/runphp/update-runphp.sh
+++ b/runphp/update-runphp.sh
@@ -41,9 +41,9 @@ p == 1 {
 }
 
 declare -A PHPWRAPPER_DESTDIRS=(
-    [_bg_launcher.php]=sbin
-    [.launcher.php]=cli
-    [_wrapper.sh]=cli
+    [_bg_launcher.php]=@@SBIN@@
+    [.launcher.php]=@@CLI@@
+    [_wrapper.sh]=@@CLI@@
 )
 declare -A PHPWRAPPER_MODES=(
     [_bg_launcher.php]=+x
@@ -156,20 +156,20 @@ if [ -n "$projdir" ]; then
 '
     fi
 
-    sbin_dest=sbin
-    cli_dest=cli_config
+    sbin_path=sbin
+    cli_path=cli_config
     if [ "$install_phpwrappers" == auto ]; then
         if [ ! -f "$PROJDIR/$COMPOSERDIR/composer.json" ]; then
             # ce doit être un projet PHP
             install_phpwrappers=
         elif [ -d "$projdir/cli_config" ]; then
             install_phpwrappers=1
-            sbin_dest=sbin
-            cli_dest=cli_config
+            sbin_path=sbin
+            cli_path=cli_config
         elif [ -d "$projdir/_cli" ]; then
             install_phpwrappers=1
-            sbin_dest=sbin
-            cli_dest=_cli
+            sbin_path=sbin
+            cli_path=_cli
         else
             install_phpwrappers=
         fi
@@ -184,15 +184,17 @@ if [ -n "$projdir" ]; then
             mode="${PHPWRAPPER_MODES[$destname]}"
 
             case "$destdir" in
-            sbin) destdir="$PROJDIR/$sbin_dest";;
-            cli) destdir="$PROJDIR/$cli_dest";;
+            @@SBIN@@) destdir="$PROJDIR/$sbin_path";;
+            @@CLI@@) destdir="$PROJDIR/$cli_path";;
             *) destdir="$PROJDIR/$destdir";;
             esac
 
             estep "$(relpath "$destdir/$destname")"
             mkdir -p "$destdir"
-            tail -n+4 "$MYDIR/$phpwrapper" |
-                sed "s|/@@CLI@@/|/$cli_dest/|" >"$destdir/$destname"
+            tail -n+4 "$MYDIR/$phpwrapper" | sed "
+s|/@@SBIN@@/|/$sbin_path/|
+s|/@@CLI@@/|/$cli_path/|
+" >"$destdir/$destname"
             [ -n "$mode" ] && chmod "$mode" "$destdir/$destname"
         done
     fi