diff --git a/doc/README.md b/doc/README.md
index 0faf2312..c606f47c 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -28,7 +28,6 @@ Rougail est un bibliothèque python3 qui permet de charger des dictionnaires (fi
   - [Les calcules automatiques](fill/README.md)
   - [Les vérifications des valeurs](check/README.md)
   - [Les conditions](condition/README.md)
-  - [Les variables meneuses ou suiveuses](variable/leadership.md)
 
 ## Les templates
 
diff --git a/doc/family/README.md b/doc/family/README.md
index 1aff0572..85da5368 100644
--- a/doc/family/README.md
+++ b/doc/family/README.md
@@ -2,4 +2,5 @@
 
   - [Une famille](simple.md)
   - [Famille crée dynamiquement](auto.md)
+  - [Les variables meneuses ou suiveuses](leadership.md)
 
diff --git a/doc/family/leadership.md b/doc/family/leadership.md
new file mode 100644
index 00000000..8d135021
--- /dev/null
+++ b/doc/family/leadership.md
@@ -0,0 +1,56 @@
+# Variable meneuse ou suiveuse
+
+## Variable meneuse
+
+Une variable meneuse est une variable qui va guider la longueur d'autre variables (appelé variables suiveuse).
+
+Une variable meneuse est une [variable](../variable/README.md) qui est obligatoirement de type multiple.
+
+Une variable meneuse peut être obligatoire.
+
+Le [mode](../mode.md) par défaut correspond au plus petit mode définit par l'utilisateur des variables suiveuses.
+
+## Variable suiveuse
+
+Une variable suiveuse est une variable donc la longueur n'est pas déterminé par elle-même, mais est identique à celle de la variable meneuse dont elle dépend.
+
+Une variable suiveuse est une variable placer juste derrière une variable meneuse ou une autre variable suiveuse.
+
+L'ordre de définition des variables suiveuses est important.
+
+Cette variable peut être de type multiple. Dans ce cas, pour un index determiné, il est possible de mettre plusieurs valeurs à une même variable.
+
+Une variable suiveuse peut être obligatoire. Cela signifie que lorsqu'une variable meneuse est renseigné, il faut obligatoirement que la variable suiveuse est également une valeur à l'index considéré.
+Si aucune valeur n'est définit pour la variable meneuse, aucune valeur n'est a spécifié pour la variable suiveuse.
+
+Le [mode](../mode.md) par défaut d'une variable suiveuse correspond au [mode](../mode.md) de la variable meneuse.
+
+Si une variable meneuse est caché ou désactivé, les variables suiveuses le seront également.
+
+## Définition des variables meneuse et suiveuse
+
+Les variables meneuses et suiveuses doivent dans une famille de type "leadership".
+
+Voici un exemple de définition d'une variable meneuse et de deux variables meneuses :
+
+```
+<variables>
+    <family name="family" leadership='True'>
+        <variable name="leader" multi='True'/>
+        <variable name="follower1"/>
+        <variable name="follower2" multi='True'/>
+    </family>
+</variables>
+```
+
+## Ajout d'une nouvelle variable suiveuse
+
+Pour ajouter, dans un nouveau dictionnaire, une variable suiveuse à notre groupe, rien de plus simple, il suffit définir une ou des nouvelles variables dans la famille :
+
+```
+<variables>
+    <family name="family">
+        <variable name="follower3"/>
+    </family>
+</variables>
+```
diff --git a/doc/fill/value.md b/doc/fill/value.md
index d1efaa72..4702d11e 100644
--- a/doc/fill/value.md
+++ b/doc/fill/value.md
@@ -49,8 +49,8 @@ Si une condition "hidden_if_in" est spécifié à la variable, la valeur sera mo
 
 ## Variable meneuse ou suiveuse avec valeur calculé
 
-Une [variable suiveuse](../variable/leadership.md) ne peut pas être calculé automatiquement.
-Une [variable meneuse](../variable/leadership.md) peut être calculé automatiquement.
+Une [variable suiveuse](../family/leadership.md) ne peut pas être calculé automatiquement.
+Une [variable meneuse](../family/leadership.md) peut être calculé automatiquement.
 Si la variable n'est pas multiple, il ne faut pas que le calcule retourne une liste.
 
 ## Variable dynamique avec une valeur calculée
diff --git a/doc/param/variable.md b/doc/param/variable.md
index 1b4062fe..2fe100b6 100644
--- a/doc/param/variable.md
+++ b/doc/param/variable.md
@@ -6,7 +6,7 @@ Imaginons que la variable "my_variable" pré-existe. La valeur de la variable se
 <param type="variable">my_variable</param>
 ```
 
-[Les variables meneuses ou suiveuses](../variable/leadership.md) peuvent être utilisé sans soucis comme paramètre.
+[Les variables meneuses ou suiveuses](../family/leadership.md) peuvent être utilisé sans soucis comme paramètre.
 
 ## Paramètre avec variable potentiellement non existante
 
diff --git a/doc/variable/README.md b/doc/variable/README.md
index af87388f..f3a1ea3a 100644
--- a/doc/variable/README.md
+++ b/doc/variable/README.md
@@ -1,4 +1,255 @@
 # Variable
 
-  - [Une variable](simple.md)
-  - [Variable meneuse ou suiveuse](leadership.md)
+## Un variable
+
+Une variable est forcement dans [variables](../variables.md) ou dans une [famille](../family/README.md).
+
+Une variable est déjà un nom. C'est à dire qu'on pourra utiliser plus tard la variable via ce nom.
+
+```
+<variables>
+    <variable name="my_variable"/>
+    <family name="my_family">
+        <variable name="my_family_variable"/>
+    </variable>
+</variables>
+```
+
+## Description et aide sur la variable
+
+En plus d'un nom, il est possible de mettre une "description" à la variable. C'est une information "utilisateur" qui nous permettra d'avoir des informations complémentaires sur le contenu de cette variable :
+
+```
+<variable name="my_variable" description="This is a greate variable"/>
+```
+
+En plus de la description, il est possible de préciser une aide complémentaire :
+
+```
+<variable name="my_variable" help="This is a greate variable"/>
+```
+
+Cette aide peut être utilisé à tout moment comme valeur [d'un paramètre](../param/information.md).
+
+## Le type de la variable
+
+Une variable a un type. Ce type permet de définir les valeurs acceptées par cette variable :
+
+- string : chaine de caractère (type par défaut)
+- number : un nombre
+- float : un chiffre flottant
+- boolean : "True" ou "False", si aucune valeur n'est défini la valeur par défaut de cette variable sera "True", ces variables sont également obligatoire par défaut
+- password : un mot de passe
+- mail : une adresse mail
+- filename : nom de fichier au sens Unix (exemple : "/etc/passwd")
+- date : une date au format "%Y-%m-%d" (exemple : "2021-01-30")
+- unix_user : nom d'utilisateur au sens Unix
+- ip : n'importe quelle adresse IPv4
+- cidr : n'importe quelle adresse IPv4 au format CIDR
+- local_ip : adresse IPv4 sur un réseau local, si l'adresse IPv4 n'est pas local, un warning sera afficher mais la valeur sera accepté tout de même
+- netmask : masque d'une adresse IPv4
+- network : adresse réseau
+- network_cidr : adresse réseau au format CIDR
+- broadcast : adresse de diffusion
+- netbios : nom netbios
+- domain : nom de domaine
+- hostname : nom d'hôte
+- web_address : adresse web (http://www.cadoles.com/)
+- port : port
+- mac : adresse MAC
+- schedule : périodicité du schedule, les valeurs possibles sont "none", "daily", "weekly" ou "monthly"
+- schedulemod : type de schedule, les valeurs possibles sont "pre" ou "post"
+
+Pour définir le type d'une variable :
+
+```
+<variable name="my_variable" type="number"/>
+```
+
+## Variable à valeur multiple
+
+Par défaut une variable ne peut acceuillir qu'une seule valeur. Il peut être utile de pouvoir spécifier plusieurs valeurs à une même variable.
+
+Pour définir une variable à valeur multiple :
+
+```
+<variable name="my_variable" multi="True"/>
+```
+
+## Variable invisible
+
+Il est possible de cacher une variable.
+
+Cacher une variable signifie qu'elle ne sera pas visible lorsqu'on modifie la configuration du service.
+Par contre cette variable sera accessibles lorsqu'on va l'utiliser.
+
+Pour cacher une variable :
+
+```
+<variable name="my_variable" hidden="True"/>
+```
+
+## Variable désactive
+
+Il est possible de désactiver une variable.
+
+Désactiver une variable signifie qu'elle ne sera pas visible lorsqu'on modifie la configuration du service mais également lorsqu'on va l'utiliser.
+
+Pour désactiver une variable :
+
+```
+<variable name="my_variable" disabled="True"/>
+```
+
+## Variable obligatoire
+
+Variable dont une valeur est requise :
+
+```
+<variable name="my_variable" mandatory="True"/>
+```
+
+Les variables booléans sont par défaut obligatoire. Pour qu'une variable booléan ne soit pas obligatoire il faut le préciser explicitement :
+
+```
+<variable name="my_variable" type="boolean" mandatory="False"/>
+```
+
+Les variables avec une valeur par défaut (non calculée) sont également automatiquement obligatoire.
+[Les variables à choix](../check/valid_enum.md) sans choix "None" sont également automatiquement obligatoire.
+
+## Valeur par défaut d'une variable
+
+Il est possible de fixer les valeurs par défaut d'une variable :
+
+```
+<variable name="my_variable">
+    <value>value</value>
+</variable>
+```
+
+Pour une variable multiple, il est possible de préciser plusieurs valeurs :
+
+```
+<variable name="my_variable" multi="True">
+    <value>value 1</value>
+    <value>value 2</value>
+</variable>
+```
+
+Si la variable n'est pas pas une [variable meneuse](../family/leadership.md), la première valeur défini dans cette liste sera également la valeur par défaut proposé si on ajoute une nouvelle valeur à cette variable.
+
+Une valeur par défaut peut également être [une valeur calculer](../fill/README.md).
+
+## Redéfinir une variable
+
+Il est possible de définir une variable dans un dictionnaire et de changer son comportement dans une second dictionnaire.
+
+Attention trois attributs ne sont redéfinisable :
+
+- name
+- type
+- multi
+
+Créons notre variable :
+
+    <variable name="my_variable"/>
+
+Et redéfinisons là :
+
+```
+<variable name="my_variable" redefine="True" description="New description"/>
+```
+
+## Créer une variable inexistante
+
+Il est parfois utile de créer une variable si elle n'existe pas dans un autre dictionnaire :
+
+```
+<variable name="my_variable" exists="False"/>
+```
+
+Si cette variable existe dans un autre dictionnaire, elle ne sera pas modifié ni recréé
+
+## Redéfinir une variable si elle existe
+
+Parfois on veut pouvoir redéfinir une variable mais seulement dans le cas où elle existe déjà :
+
+```
+<variable name="my_variable" redefine="True" exists="True" hidden="True"/>
+```
+
+## Variable à valeur automatiquement modifiée
+
+Une variable avec valeur automatiquement modifiée est une variable dont la valeur sera considéré comme modifié quand la propriété global "force_store_value" de Tiramisu est mise.
+
+Voici une variable a valeur automatiquement modifiée :
+
+```
+<variable name="my_variable" auto_save="True">
+    <value>my_value</value>
+</variable>
+```
+
+Dans ce cas la valeur est fixée à la valeur actuelle.
+Par exemple, si la valeur de cette variable est issue d'un calcul, la valeur ne sera plus recalculée.
+
+Ces variables sont généralement des variables obligatoires. En effet ces variable ne sont automatiquement modifiées que si elles ont une valeurs.
+
+Une [variable meneuse ou suiveuse](../family/leadership.md) ne peut pas avoir la propriété auto_save.
+
+## Variable à valeur en lecture seule automatique
+
+Une variable avec valeur en lecture seule automatique est une variable dont la valeur ne sera plus modifiable par l'utilisateur quand la [variable "server_deployed" passe à "True"](../dev/config.md).
+
+Voici un variable à valeur en lecture seule automatique :
+
+```
+<variable name="server_deployed" type="boolean">
+    <value>False</value>
+</variable>
+<variable name="my_variable" auto_freeze="True"/>
+```
+
+Dans ce cas la valeur est fixée à la valeur actuelle et elle ne sera plus modifiable par l'utilisateur.
+Par exemple, si la valeur de cette variable est issue d'un calcul, la valeur ne sera plus recalculée.
+
+Ces variables sont généralement des variables obligatoires. En effet ces variable ne sont en lecteur seul que si elles ont une valeurs.
+
+Une [variable meneuse ou suiveuse](../family/leadership.md) ne peut pas avoir la propriété auto_freeze.
+
+## Information "test"
+
+L'attribut "test" est un attribut spécial qui permet aux concepteurs d'un dictionnaire d'influancer le robot de test en précisant de valeurs utile à tester.
+
+Concrêtement, le contenu de cet attribut est enregister dans une "information" de l'option Tiramisu correspondante.
+
+Exemple :
+
+```
+<variable name="my_variable" test="yes"/>
+```
+
+Il est possible de préciser plusieurs valeurs avec le séparateur "|" :
+
+```
+<variable name="my_variable" test="yes|no"/>
+```
+
+Cette valeur peut être utilisé à tout moment comme valeur [d'un paramètre](../param/information.md).
+
+## Mode de la variable
+
+Le [mode](../mode.md) par défaut d'une variable correspond au [mode](../mode.md) de la [famille](../family/README.md).
+
+Cas particuliers :
+
+- une variable à valeur automatiquement modifiée ou une variable en lecture seule automatique est par défaut en mode "basic".
+- si la variable n'est pas dans une famille, la variable aura le mode "normal" par défaut.
+- une variable obligatoire sans valeur par défaut (calculer ou non) aura le mode "basic".
+
+Pour définir le [mode](../mode.md) :
+
+```
+<variable name="my_variable" mode="expert"/>
+```
diff --git a/doc/variable/simple.md b/doc/variable/simple.md
deleted file mode 100644
index 86a231b9..00000000
--- a/doc/variable/simple.md
+++ /dev/null
@@ -1,255 +0,0 @@
-# Variable
-
-## Un variable
-
-Une variable est forcement dans [variables](../variables.md) ou dans une [famille](../family/README.md).
-
-Une variable est déjà un nom. C'est à dire qu'on pourra utiliser plus tard la variable via ce nom.
-
-```
-<variables>
-    <variable name="my_variable"/>
-    <family name="my_family">
-        <variable name="my_family_variable"/>
-    </variable>
-</variables>
-```
-
-## Description et aide sur la variable
-
-En plus d'un nom, il est possible de mettre une "description" à la variable. C'est une information "utilisateur" qui nous permettra d'avoir des informations complémentaires sur le contenu de cette variable :
-
-```
-<variable name="my_variable" description="This is a greate variable"/>
-```
-
-En plus de la description, il est possible de préciser une aide complémentaire :
-
-```
-<variable name="my_variable" help="This is a greate variable"/>
-```
-
-Cette aide peut être utilisé à tout moment comme valeur [d'un paramètre](../param/information.md).
-
-## Le type de la variable
-
-Une variable a un type. Ce type permet de définir les valeurs acceptées par cette variable :
-
-- string : chaine de caractère (type par défaut)
-- number : un nombre
-- float : un chiffre flottant
-- boolean : "True" ou "False", si aucune valeur n'est défini la valeur par défaut de cette variable sera "True", ces variables sont également obligatoire par défaut
-- password : un mot de passe
-- mail : une adresse mail
-- filename : nom de fichier au sens Unix (exemple : "/etc/passwd")
-- date : une date au format "%Y-%m-%d" (exemple : "2021-01-30")
-- unix_user : nom d'utilisateur au sens Unix
-- ip : n'importe quelle adresse IPv4
-- cidr : n'importe quelle adresse IPv4 au format CIDR
-- local_ip : adresse IPv4 sur un réseau local, si l'adresse IPv4 n'est pas local, un warning sera afficher mais la valeur sera accepté tout de même
-- netmask : masque d'une adresse IPv4
-- network : adresse réseau
-- network_cidr : adresse réseau au format CIDR
-- broadcast : adresse de diffusion
-- netbios : nom netbios
-- domain : nom de domaine
-- hostname : nom d'hôte
-- web_address : adresse web (http://www.cadoles.com/)
-- port : port
-- mac : adresse MAC
-- schedule : périodicité du schedule, les valeurs possibles sont "none", "daily", "weekly" ou "monthly"
-- schedulemod : type de schedule, les valeurs possibles sont "pre" ou "post"
-
-Pour définir le type d'une variable :
-
-```
-<variable name="my_variable" type="number"/>
-```
-
-## Variable à valeur multiple
-
-Par défaut une variable ne peut acceuillir qu'une seule valeur. Il peut être utile de pouvoir spécifier plusieurs valeurs à une même variable.
-
-Pour définir une variable à valeur multiple :
-
-```
-<variable name="my_variable" multi="True"/>
-```
-
-## Variable invisible
-
-Il est possible de cacher une variable.
-
-Cacher une variable signifie qu'elle ne sera pas visible lorsqu'on modifie la configuration du service.
-Par contre cette variable sera accessibles lorsqu'on va l'utiliser.
-
-Pour cacher une variable :
-
-```
-<variable name="my_variable" hidden="True"/>
-```
-
-## Variable désactive
-
-Il est possible de désactiver une variable.
-
-Désactiver une variable signifie qu'elle ne sera pas visible lorsqu'on modifie la configuration du service mais également lorsqu'on va l'utiliser.
-
-Pour désactiver une variable :
-
-```
-<variable name="my_variable" disabled="True"/>
-```
-
-## Variable obligatoire
-
-Variable dont une valeur est requise :
-
-```
-<variable name="my_variable" mandatory="True"/>
-```
-
-Les variables booléans sont par défaut obligatoire. Pour qu'une variable booléan ne soit pas obligatoire il faut le préciser explicitement :
-
-```
-<variable name="my_variable" type="boolean" mandatory="False"/>
-```
-
-Les variables avec une valeur par défaut (non calculée) sont également automatiquement obligatoire.
-[Les variables à choix](../check/valid_enum.md) sans choix "None" sont également automatiquement obligatoire.
-
-## Valeur par défaut d'une variable
-
-Il est possible de fixer les valeurs par défaut d'une variable :
-
-```
-<variable name="my_variable">
-    <value>value</value>
-</variable>
-```
-
-Pour une variable multiple, il est possible de préciser plusieurs valeurs :
-
-```
-<variable name="my_variable" multi="True">
-    <value>value 1</value>
-    <value>value 2</value>
-</variable>
-```
-
-Si la variable n'est pas pas une [variable meneuse](leadership.md), la première valeur défini dans cette liste sera également la valeur par défaut proposé si on ajoute une nouvelle valeur à cette variable.
-
-Une valeur par défaut peut également être [une valeur calculer](../fill/README.md).
-
-## Redéfinir une variable
-
-Il est possible de définir une variable dans un dictionnaire et de changer son comportement dans une second dictionnaire.
-
-Attention trois attributs ne sont redéfinisable :
-
-- name
-- type
-- multi
-
-Créons notre variable :
-
-    <variable name="my_variable"/>
-
-Et redéfinisons là :
-
-```
-<variable name="my_variable" redefine="True" description="New description"/>
-```
-
-## Créer une variable inexistante
-
-Il est parfois utile de créer une variable si elle n'existe pas dans un autre dictionnaire :
-
-```
-<variable name="my_variable" exists="False"/>
-```
-
-Si cette variable existe dans un autre dictionnaire, elle ne sera pas modifié ni recréé
-
-## Redéfinir une variable si elle existe
-
-Parfois on veut pouvoir redéfinir une variable mais seulement dans le cas où elle existe déjà :
-
-```
-<variable name="my_variable" redefine="True" exists="True" hidden="True"/>
-```
-
-## Variable à valeur automatiquement modifiée
-
-Une variable avec valeur automatiquement modifiée est une variable dont la valeur sera considéré comme modifié quand la propriété global "force_store_value" de Tiramisu est mise.
-
-Voici une variable a valeur automatiquement modifiée :
-
-```
-<variable name="my_variable" auto_save="True">
-    <value>my_value</value>
-</variable>
-```
-
-Dans ce cas la valeur est fixée à la valeur actuelle.
-Par exemple, si la valeur de cette variable est issue d'un calcul, la valeur ne sera plus recalculée.
-
-Ces variables sont généralement des variables obligatoires. En effet ces variable ne sont automatiquement modifiées que si elles ont une valeurs.
-
-Une [variable meneuse ou suiveuse](leadership.md) ne peut pas avoir la propriété auto_save.
-
-## Variable à valeur en lecture seule automatique
-
-Une variable avec valeur en lecture seule automatique est une variable dont la valeur ne sera plus modifiable par l'utilisateur quand la [variable "server_deployed" passe à "True"](../dev/config.md).
-
-Voici un variable à valeur en lecture seule automatique :
-
-```
-<variable name="server_deployed" type="boolean">
-    <value>False</value>
-</variable>
-<variable name="my_variable" auto_freeze="True"/>
-```
-
-Dans ce cas la valeur est fixée à la valeur actuelle et elle ne sera plus modifiable par l'utilisateur.
-Par exemple, si la valeur de cette variable est issue d'un calcul, la valeur ne sera plus recalculée.
-
-Ces variables sont généralement des variables obligatoires. En effet ces variable ne sont en lecteur seul que si elles ont une valeurs.
-
-Une [variable meneuse ou suiveuse](leadership.md) ne peut pas avoir la propriété auto_freeze.
-
-## Information "test"
-
-L'attribut "test" est un attribut spécial qui permet aux concepteurs d'un dictionnaire d'influancer le robot de test en précisant de valeurs utile à tester.
-
-Concrêtement, le contenu de cet attribut est enregister dans une "information" de l'option Tiramisu correspondante.
-
-Exemple :
-
-```
-<variable name="my_variable" test="yes"/>
-```
-
-Il est possible de préciser plusieurs valeurs avec le séparateur "|" :
-
-```
-<variable name="my_variable" test="yes|no"/>
-```
-
-Cette valeur peut être utilisé à tout moment comme valeur [d'un paramètre](../param/information.md).
-
-## Mode de la variable
-
-Le [mode](../mode.md) par défaut d'une variable correspond au [mode](../mode.md) de la [famille](../family/README.md).
-
-Cas particuliers :
-
-- une variable à valeur automatiquement modifiée ou une variable en lecture seule automatique est par défaut en mode "basic".
-- si la variable n'est pas dans une famille, la variable aura le mode "normal" par défaut.
-- une variable obligatoire sans valeur par défaut (calculer ou non) aura le mode "basic".
-
-Pour définir le [mode](../mode.md) :
-
-```
-<variable name="my_variable" mode="expert"/>
-```
diff --git a/src/rougail/annotator/condition.py b/src/rougail/annotator/condition.py
index b31d8183..ebfacbb1 100644
--- a/src/rougail/annotator/condition.py
+++ b/src/rougail/annotator/condition.py
@@ -164,13 +164,12 @@ class Annotator(TargetAnnotator, ParamAnnotator, Walk):
                 return target.name, [target.name]
             # it's a leader, so apply property to leadership
             family_name = self.objectspace.paths.get_variable_family_path(target.name.path)
-            family = self.objectspace.paths.get_family(family_name,
-                                                       target.name.namespace,
-                                                       )
-            return family, family.variable
-        # it's a family
-        variable = self.objectspace.paths.get_family(target.name.path,
-                                                     target.namespace,
+            namespace = target.name.namespace
+        else:
+            family_name = target.name.path
+            namespace = target.namespace
+        variable = self.objectspace.paths.get_family(family_name,
+                                                     namespace,
                                                      )
         if hasattr(variable, 'variable'):
             return variable, list(variable.variable.values())
diff --git a/src/rougail/annotator/family.py b/src/rougail/annotator/family.py
index 3006b7b9..f30802b7 100644
--- a/src/rougail/annotator/family.py
+++ b/src/rougail/annotator/family.py
@@ -137,10 +137,10 @@ class Annotator(Walk):
         for variable in family.variable.values():
             self.valid_mode(variable)
             if isinstance(variable, self.objectspace.family):
-                if family_mode and not self._has_mode(variable):
-                    self._set_auto_mode(variable, family_mode)
-                continue
-            if isinstance(variable, self.objectspace.leadership):
+                if not variable.leadership:
+                    if family_mode and not self._has_mode(variable):
+                        self._set_auto_mode(variable, family_mode)
+                    continue
                 func = self._set_default_mode_leader
             else:
                 func = self._set_default_mode_variable
@@ -174,11 +174,12 @@ class Annotator(Walk):
         obj.mode_auto = True
 
     def _set_default_mode_leader(self,
-                                 leadership: 'self.objectspace.leadership',
+                                 leadership: 'self.objectspace.family',
                                  family_mode: str,
                                  ) -> None:
         leader_mode = None
-        for follower in leadership.variable:
+        leader = next(iter(leadership.variable.values()))
+        for follower in leadership.variable.values():
             self.valid_mode(follower)
             if follower.auto_save is True:
                 msg = _(f'leader/followers "{follower.name}" could not be auto_save')
@@ -192,9 +193,9 @@ class Annotator(Walk):
                 else:
                     follower_mode = self.objectspace.rougailconfig['default_variable_mode']
                 if self.modes[leader_mode] > self.modes[follower_mode]:
-                    if self._has_mode(follower) and not self._has_mode(leadership.variable[0]):
+                    if self._has_mode(follower) and not self._has_mode(leader):
                         # if follower has mode but not the leader
-                        self._set_auto_mode(leadership.variable[0], follower_mode)
+                        self._set_auto_mode(leader, follower_mode)
                     else:
                         # leader's mode is minimum level
                         if self._has_mode(follower):
@@ -206,12 +207,12 @@ class Annotator(Walk):
                                             family_mode,
                                             )
             if leader_mode is None:
-                if hasattr(leadership.variable[0], 'mode'):
-                    leader_mode = leadership.variable[0].mode
+                if hasattr(leader, 'mode'):
+                    leader_mode = leader.mode
                 else:
                     leader_mode = self.objectspace.rougailconfig['default_variable_mode']
-        if hasattr(leadership.variable[0], 'mode'):
-            leader_mode = leadership.variable[0].mode
+        if hasattr(leader, 'mode'):
+            leader_mode = leader.mode
         self._set_auto_mode(leadership, leader_mode)
 
     def _change_family_mode(self,
@@ -225,11 +226,14 @@ class Annotator(Walk):
         # change variable mode, but not if variables are not in a family
         if hasattr(family, 'variable'):
             for variable in family.variable.values():
-                if not isinstance(variable, self.objectspace.family):
-                    if isinstance(variable, self.objectspace.leadership):
+                if isinstance(variable, self.objectspace.family):
+                    if variable.leadership:
                         func = self._change_variable_mode_leader
                     else:
-                        func = self._change_variable_mode
+                        func = None
+                else:
+                    func = self._change_variable_mode
+                if func:
                     func(variable,
                          family_mode,
                          )
@@ -268,11 +272,13 @@ class Annotator(Walk):
                                      leadership,
                                      family_mode: str,
                                      ) -> None:
-        for follower in leadership.variable:
+        for idx, follower in enumerate(leadership.variable.values()):
+            if idx == 0:
+                leader = follower
             self._change_variable_mode(follower,
                                       family_mode,
                                       )
-        leadership.variable[0].mode = None
+        leader.mode = None
 
     def dynamic_families(self):
         """link dynamic families to object
diff --git a/src/rougail/annotator/group.py b/src/rougail/annotator/group.py
index 884dce32..a79160c7 100644
--- a/src/rougail/annotator/group.py
+++ b/src/rougail/annotator/group.py
@@ -27,9 +27,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 from rougail.i18n import _
 from rougail.error import DictConsistencyError
 from rougail.utils import normalize_family
+from rougail.annotator.variable import Walk
 
 
-class Annotator:
+class Annotator(Walk):
     """Annotate group
     """
     level = 10
@@ -37,126 +38,37 @@ class Annotator:
                  objectspace,
                  *args,
                  ):
-        self.objectspace = objectspace
-        if not hasattr(self.objectspace.space, 'constraints') or \
-                not hasattr(self.objectspace.space.constraints, 'group'):
+        if not hasattr(objectspace.space, 'variables'):
             return
+        self.objectspace = objectspace
         self.convert_groups()
 
     def convert_groups(self):  # pylint: disable=C0111
         """convert groups
         """
         # store old leaders family name
-        cache_paths = {}
-        for group in self.objectspace.space.constraints.group:
-            if group.leader in cache_paths:
-                leader_fam_path = cache_paths[group.leader]
-            else:
-                leader_fam_path = self.objectspace.paths.get_variable_family_path(group.leader, group.xmlfiles)
-                cache_paths[group.leader] = leader_fam_path
-            follower_names = list(group.follower.keys())
-            leader = self.objectspace.paths.get_variable(group.leader)
-            if '.' not in leader_fam_path:
-                # it's a namespace
-                ori_leader_family = self.objectspace.space.variables[leader_fam_path]
-            else:
-                # it's a sub family
-                ori_leader_family = self.objectspace.paths.get_family(leader_fam_path,
-                                                                      leader.namespace,
-                                                                      )
-            has_a_leader = False
-            for variable in list(ori_leader_family.variable.values()):
-                if isinstance(variable, self.objectspace.leadership) and \
-                        variable.variable[0].name == leader.name:
-                    # append follower to an existed leadership
-                    leader_space = variable
-                    has_a_leader = True
-                elif variable.name == leader.name:
+        for family in self.get_families(with_leadership=True):
+            if not isinstance(family, self.objectspace.family):
+                continue
+            if not family.leadership:
+                continue
+            if hasattr(family, 'dynamic'):
+                msg = _(f'the family "{family.name}" cannot be leadership and dynamic together')
+                raise DictConsistencyError(msg, 31, family.xmlfiles)
+            family.doc = family.description
+            for idx, variable in enumerate(family.variable.values()):
+                if idx == 0:
                     # it's a leader
-                    leader_space = self.manage_leader(variable,
-                                                      group,
-                                                      ori_leader_family,
-                                                      )
-                    has_a_leader = True
-                elif has_a_leader:
-                    # it's should be a follower
-                    self.manage_follower(follower_names.pop(0),
-                                         leader_fam_path,
-                                         variable,
-                                         leader_space,
-                                         )
-                    # this variable is not more in ori_leader_family
-                    ori_leader_family.variable.pop(normalize_family(variable.name))
-                    if follower_names == []:
-                        # no more follower
-                        break
-            else:
-                joined = '", "'.join(follower_names)
-                msg = _(f'when parsing leadership, we espect to find those followers "{joined}"')
-                raise DictConsistencyError(msg, 31, variable.xmlfiles)
-        del self.objectspace.space.constraints.group
-
-    def manage_leader(self,
-                      variable: 'Variable',
-                      group: 'Group',
-                      ori_leader_family,
-                      ) -> 'Leadership':
-        """manage leader's variable
-        """
-        if variable.multi is not True:
-            msg = _(f'the variable "{variable.name}" in a group must be multi')
-            raise DictConsistencyError(msg, 32, variable.xmlfiles)
-        if hasattr(group, 'name'):
-            ori_leadership_name = group.name
-        else:
-            ori_leadership_name = variable.name
-        leadership_name = normalize_family(ori_leadership_name)
-        leader_space = self.objectspace.leadership(variable.xmlfiles)
-        leader_space.variable = []
-        leader_space.name = leadership_name
-        leader_space.hidden = variable.hidden
-        if variable.hidden:
-            variable.frozen = True
-            variable.force_default_on_freeze = True
-        variable.hidden = None
-        if hasattr(group, 'description'):
-            leader_space.doc = group.description
-        elif variable.name == leadership_name and hasattr(variable, 'description'):
-            leader_space.doc = variable.description
-        else:
-            leader_space.doc = ori_leadership_name
-        leadership_path = ori_leader_family.path + '.' + leadership_name
-        self.objectspace.paths.add_leadership(variable.namespace,
-                                              leadership_path,
-                                              leader_space,
-                                              )
-        ori_leader_family.variable[normalize_family(variable.name)] = leader_space
-        leader_space.variable.append(variable)
-        self.objectspace.paths.set_leader(variable.namespace,
-                                          ori_leader_family.path,
-                                          leadership_name,
-                                          normalize_family(variable.name),
-                                          )
-        return leader_space
-
-    def manage_follower(self,
-                        follower_name: str,
-                        leader_family_name: str,
-                        variable: 'Variable',
-                        leader_space: 'Leadership',
-                        ) -> None:
-        """manage follower
-        """
-        if variable.name != follower_name:
-            msg = _('when parsing leadership, we expect to find the follower '
-                    f'"{follower_name}" but we found "{variable.name}"')
-            raise DictConsistencyError(msg, 33, variable.xmlfiles)
-        self.objectspace.paths.set_leader(variable.namespace,
-                                          leader_family_name,
-                                          leader_space.name,
-                                          normalize_family(variable.name),
-                                          )
-        if leader_space.hidden:
-            variable.frozen = True
-            variable.force_default_on_freeze = True
-        leader_space.variable.append(variable)
+                    if variable.multi is not True:
+                        msg = _(f'the variable "{variable.name}" in a leadership must be multi')
+                        raise DictConsistencyError(msg, 32, variable.xmlfiles)
+                    family.hidden = variable.hidden
+                    if variable.hidden:
+                        variable.frozen = True
+                        variable.force_default_on_freeze = True
+                    variable.hidden = None
+                else:
+                    # it's a follower
+                    if family.hidden:
+                        variable.frozen = True
+                        variable.force_default_on_freeze = True
diff --git a/src/rougail/annotator/property.py b/src/rougail/annotator/property.py
index 24feadc9..afd4d8a6 100644
--- a/src/rougail/annotator/property.py
+++ b/src/rougail/annotator/property.py
@@ -107,7 +107,7 @@ class Annotator(Walk):
         """convert variables
         """
         for variable in self.get_variables(with_leadership=True):
-            if isinstance(variable, self.objectspace.leadership):
-                for follower in variable.variable:
+            if isinstance(variable, self.objectspace.family):
+                for follower in variable.variable.values():
                     self.convert_property(follower)
             self.convert_property(variable)
diff --git a/src/rougail/annotator/value.py b/src/rougail/annotator/value.py
index 3697fd29..7d30d9d8 100644
--- a/src/rougail/annotator/value.py
+++ b/src/rougail/annotator/value.py
@@ -46,9 +46,9 @@ class Annotator(Walk):  # pylint: disable=R0903
         """convert value
         """
         for variable in self.get_variables(with_leadership=True):
-            if isinstance(variable, self.objectspace.leadership):
+            if isinstance(variable, self.objectspace.family):
                 variable_type = 'leader'
-                for follower in variable.variable:
+                for follower in variable.variable.values():
                     self._convert_value(follower,
                                         variable_type,
                                         )
@@ -82,19 +82,18 @@ class Annotator(Walk):  # pylint: disable=R0903
             return
         if variable.value[0].type == 'calculation':
             variable.default = variable.value[0]
+        elif variable.multi:
+            if variable_type != 'follower':
+                variable.default = [value.name for value in variable.value]
+            if variable_type != 'leader':
+                if variable.multi == 'submulti':
+                    variable.default_multi = [value.name for value in variable.value]
+                else:
+                    variable.default_multi = variable.value[0].name
         else:
-            if variable.multi:
-                if variable_type != 'follower':
-                    variable.default = [value.name for value in variable.value]
-                if variable_type != 'leader':
-                    if variable.multi == 'submulti':
-                        variable.default_multi = [value.name for value in variable.value]
-                    else:
-                        variable.default_multi = variable.value[0].name
-            else:
-                if len(variable.value) > 1:
-                    msg = _(f'the non multi variable "{variable.name}" cannot have '
-                            'more than one value')
-                    raise DictConsistencyError(msg, 68, variable.xmlfiles)
-                variable.default = variable.value[0].name
+            if len(variable.value) > 1:
+                msg = _(f'the non multi variable "{variable.name}" cannot have '
+                        'more than one value')
+                raise DictConsistencyError(msg, 68, variable.xmlfiles)
+            variable.default = variable.value[0].name
         del variable.value
diff --git a/src/rougail/annotator/variable.py b/src/rougail/annotator/variable.py
index e52783fb..15c06ecd 100644
--- a/src/rougail/annotator/variable.py
+++ b/src/rougail/annotator/variable.py
@@ -87,28 +87,30 @@ class Walk:
         if hasattr(family, 'variable'):
             for variable in family.variable.values():
                 if isinstance(variable, self.objectspace.family):
-                    yield from self._get_variables(variable, with_leadership)
-                    continue
-                if not with_leadership and isinstance(variable, self.objectspace.leadership):
-                    for follower in variable.variable:
-                        yield follower
-                    continue
+                    if variable.leadership is False:
+                        yield from self._get_variables(variable, with_leadership)
+                        continue
+                    if not with_leadership:
+                        for follower in variable.variable.values():
+                            yield follower
+                        continue
                 yield variable
 
-    def get_families(self):
+    def get_families(self, with_leadership=False):
         """Iter all families from the objectspace
         """
         for family in self.objectspace.space.variables.values():
-            yield from self._get_families(family)
+            yield from self._get_families(family, with_leadership)
 
     def _get_families(self,
                       family: 'self.objectspace.family',
+                      with_leadership: bool,
                       ):
         yield family
         if hasattr(family, 'variable'):
             for fam in family.variable.values():
-                if isinstance(fam, self.objectspace.family):
-                    yield from self._get_families(fam)
+                if isinstance(fam, self.objectspace.family) and (with_leadership or not fam.leadership):
+                    yield from self._get_families(fam, with_leadership)
 
 
 class Annotator(Walk):  # pylint: disable=R0903
@@ -133,10 +135,10 @@ class Annotator(Walk):  # pylint: disable=R0903
         """convert variable
         """
         for variable in self.get_variables(with_leadership=True):
-            if isinstance(variable, self.objectspace.leadership):
+            if isinstance(variable, self.objectspace.family):
                 # first variable is a leader, others are follower
                 variable_type = 'leader'
-                for follower in variable.variable:
+                for follower in variable.variable.values():
                     self._convert_variable(follower,
                                            variable_type,
                                            )
diff --git a/src/rougail/data/rougail.dtd b/src/rougail/data/rougail.dtd
index 8612f48d..df58c72e 100644
--- a/src/rougail/data/rougail.dtd
+++ b/src/rougail/data/rougail.dtd
@@ -38,7 +38,7 @@
 <!-- =============== -->
 
 <!ELEMENT rougail (services|variables|constraints)*>
-<!ATTLIST rougail version (0.9) #REQUIRED>
+<!ATTLIST rougail version (0.10) #REQUIRED>
 
 <!-- ============== -->
 <!-- files element  -->
@@ -83,6 +83,7 @@
 <!ATTLIST family mode CDATA #IMPLIED>
 <!ATTLIST family hidden (True|False) "False">
 <!ATTLIST family dynamic CDATA #IMPLIED>
+<!ATTLIST family leadership (True|False) "False">
 <!ATTLIST family provider CDATA #IMPLIED>
 
 <!ELEMENT variable (value*)>
@@ -107,7 +108,7 @@
 
 <!ELEMENT value (#PCDATA)>
 
-<!ELEMENT constraints ((fill*|check*|condition*|group*)*)>
+<!ELEMENT constraints ((fill*|check*|condition*)*)>
 
 <!ELEMENT fill ((target|param)+)>
 <!ATTLIST fill name CDATA #REQUIRED>
@@ -131,10 +132,3 @@
 <!ELEMENT target (#PCDATA)>
 <!ATTLIST target type (variable|family|servicelist|filelist|iplist) "variable">
 <!ATTLIST target optional (True|False) "False">
-
-<!ELEMENT group (follower+)>
-<!ATTLIST group leader CDATA #REQUIRED>
-<!ATTLIST group name CDATA #IMPLIED>
-<!ATTLIST group description CDATA #IMPLIED>
-
-<!ELEMENT follower (#PCDATA)>
diff --git a/src/rougail/objspace.py b/src/rougail/objspace.py
index 191cf007..eb77cf0d 100644
--- a/src/rougail/objspace.py
+++ b/src/rougail/objspace.py
@@ -38,9 +38,9 @@ FORCE_REDEFINABLES = ('family', 'follower', 'service', 'disknod', 'variables')
 # RougailObjSpace's elements that shall be forced to the UnRedefinable type
 FORCE_UNREDEFINABLES = ('value',)
 # RougailObjSpace's elements that shall not be modify
-UNREDEFINABLE = ('multi', 'type')
+UNREDEFINABLE = ('multi', 'type', 'leadership')
 # RougailObjSpace's elements that did not created automaticly
-FORCE_ELEMENTS = ('choice', 'property_', 'leadership', 'information')
+FORCE_ELEMENTS = ('choice', 'property_', 'information')
 # XML text are convert has name
 FORCED_TEXT_ELTS_AS_NAME = ('choice', 'property', 'value',)
 
@@ -474,11 +474,16 @@ class RougailObjSpace:
             else:
                 family_name = namespace
 
+            if isinstance(space, self.family) and space.leadership:
+                leader = space.path
+            else:
+                leader = None
             self.paths.add_variable(namespace,
                                     variableobj.name,
                                     space.path,
                                     document.attrib.get('dynamic') is not None,
                                     variableobj,
+                                    leader,
                                     )
         elif isinstance(variableobj, self.family):  # pylint: disable=E1101
             family_name = variableobj.name
diff --git a/src/rougail/path.py b/src/rougail/path.py
index bf5daf3b..3a44e720 100644
--- a/src/rougail/path.py
+++ b/src/rougail/path.py
@@ -77,19 +77,6 @@ class Path:
                                         )
         variableobj.path = full_name
 
-    def add_leadership(self,
-                       namespace: str,
-                       path: str,
-                       variableobj: str,
-                       ) -> str:  # pylint: disable=C0111
-        """add a new leadership
-        """
-        self.families[path] = dict(name=path,
-                                   namespace=namespace,
-                                   variableobj=variableobj,
-                                   )
-        variableobj.path = path
-
     def get_family(self,
                    name: str,
                    current_namespace: str,
@@ -109,26 +96,6 @@ class Path:
             raise DictConsistencyError(msg, 38, [])
         return dico['variableobj']
 
-    # Leadership
-    def set_leader(self,
-                   namespace: str,
-                   leader_family_name: str,
-                   leadership_name: str,
-                   name: str,
-                   ) -> None:  # pylint: disable=C0111
-        """set a variable a leadership member
-        """
-        # need rebuild path and move object in new path
-        old_path = leader_family_name + '.' + name
-        leadership_path = leader_family_name + '.' + leadership_name
-        new_path = leadership_path + '.' + name
-        self.variables[new_path] = self.variables.pop(old_path)
-        self.variables[new_path]['leader'] = leadership_path
-        self.variables[new_path]['variableobj'].path = new_path
-        self.variables[new_path]['family'] = leadership_path
-        if namespace == self.variable_namespace:
-            self.full_paths_variables[name] = new_path
-
     def is_leader(self, path):  # pylint: disable=C0111
         """Is the variable is a leader
         """
@@ -136,7 +103,7 @@ class Path:
         if not variable['leader']:
             return False
         leadership = self.get_family(variable['leader'], variable['variableobj'].namespace)
-        return leadership.variable[0].path == path
+        return next(iter(leadership.variable.values())).path == path
 
     def is_follower(self, path):
         """Is the variable is a follower
@@ -145,7 +112,7 @@ class Path:
         if not variable['leader']:
             return False
         leadership = self.get_family(variable['leader'], variable['variableobj'].namespace)
-        return leadership.variable[0].path != path
+        return next(iter(leadership.variable.values())).path != path
 
     # Variable
     def add_variable(self,  # pylint: disable=R0913
@@ -154,6 +121,7 @@ class Path:
                      family: str,
                      is_dynamic: bool,
                      variableobj,
+                     leader: 'self.objectspace.family'=None,
                      ) -> str:  # pylint: disable=C0111
         """Add a new variable (with path)
         """
@@ -169,7 +137,7 @@ class Path:
             raise DictConsistencyError(msg, 57, variableobj.xmlfiles)
         self.variables[full_path] = dict(name=name,
                                          family=family,
-                                         leader=None,
+                                         leader=leader,
                                          is_dynamic=is_dynamic,
                                          variableobj=variableobj,
                                          )
diff --git a/src/rougail/tiramisureflector.py b/src/rougail/tiramisureflector.py
index 318e6dd3..7d823fa6 100644
--- a/src/rougail/tiramisureflector.py
+++ b/src/rougail/tiramisureflector.py
@@ -371,7 +371,7 @@ class Family(Common):
         if hasattr(self.elt, 'suffixes'):
             self.objectspace.has_dyn_option = True
             self.object_type = 'ConvertDynOptionDescription'
-        elif isinstance(self.elt, self.objectspace.leadership):
+        elif hasattr(self.elt, 'leadership') and self.elt.leadership:
             self.object_type = 'Leadership'
         else:
             self.object_type = 'OptionDescription'
diff --git a/src/rougail/update.py b/src/rougail/update.py
index 19076048..dd9cddf9 100644
--- a/src/rougail/update.py
+++ b/src/rougail/update.py
@@ -31,10 +31,11 @@ from .i18n import _
 from .error import UpgradeError
 
 from .utils import normalize_family
+from .config import RougailConfig
 
 
 VERSIONS = {'creole': ['1'],
-            'rougail': ['0.9'],
+            'rougail': ['0.9', '0.10'],
             }
 
 
@@ -47,16 +48,24 @@ FUNCTION_VERSIONS = [(root, version, get_function_name(root, version)) for root,
 
 
 class RougailUpgrade:
-    def __init__(self, test=False, upgrade_help=None):
+    def __init__(self,
+                 test=False,
+                 upgrade_help=None,
+                 rougailconfig: RougailConfig=None,
+                 ) -> None:
         self.test = test
         if upgrade_help is None:
             upgrade_help = {}
         self.upgrade_help = upgrade_help
+        if rougailconfig is None:
+            rougailconfig = RougailConfig
+        self.rougailconfig = rougailconfig
 
     def load_xml_from_folders(self,
                               srcfolder: str,
                               dstfolder: str,
                               namespace: str,
+                              display: bool=True,
                               ):
         """Loads all the XML files located in the xmlfolders' list
 
@@ -77,13 +86,15 @@ class RougailUpgrade:
             function_found = False
             for root_name, version, function_version in FUNCTION_VERSIONS:
                 if function_found and hasattr(self, function_version):
-                    print(f'  - convert {filename} to version {version}')
+                    if display:
+                        print(f'  - convert {filename} to version {version}')
                     upgrade_help = self.upgrade_help.get(function_version, {}).get(filename, {})
                     if upgrade_help.get('remove') is True:
                         continue
                     root = getattr(self, function_version)(root, upgrade_help, namespace)
                 if function_version == search_function_name:
                     function_found = True
+                root.attrib['version'] = version
             with open(xmldst, 'wb') as xmlfh:
                 xmlfh.write(tostring(root, pretty_print=True, encoding="UTF-8", xml_declaration=True))
     #            if
@@ -94,6 +105,90 @@ class RougailUpgrade:
     #            yield xmlfile, document.getroot()
 
 
+    def update_rougail_0_10(self,
+                           root: 'Element',
+                           upgrade_help: dict,
+                           namespace: str,
+                           ) -> 'Element':
+        variables = root.find('variables')
+        if variables is None:
+            return root
+        constraints = root.find('constraints')
+        if constraints is None:
+            return root
+        groups = []
+        for constraint in constraints:
+            if constraint.tag == 'group':
+                constraints.remove(constraint)
+                groups.append(constraint)
+        if not groups:
+            return root
+        paths = self._get_path_variables(variables,
+                                         namespace == self.rougailconfig['variable_namespace'],
+                                         namespace,
+                                         )
+        for group in groups:
+            if group.attrib['leader'] in paths:
+                leader_obj = paths[group.attrib['leader']]
+                #FIXME name peut avoir "." il faut le virer
+                #FIXME si extra c'est un follower !
+                if 'name' in group.attrib:
+                    name = group.attrib['name']
+                    if 'description' in group.attrib:
+                        description = group.attrib['description']
+                    else:
+                        description = name
+                else:
+                    name = leader_obj['variable'].attrib['name']
+                    if '.' in name:
+                        name = name.rsplit('.', 1)[-1]
+                    if 'description' in group.attrib:
+                        description = group.attrib['description']
+                    elif 'description' in leader_obj['variable'].attrib:
+                        description = leader_obj['variable'].attrib['description']
+                    else:
+                        description = name
+                family = SubElement(leader_obj['parent'], 'family', name=name, description=description, leadership="True")
+                leader_obj['parent'].remove(leader_obj['variable'])
+                family.append(leader_obj['variable'])
+            else:
+                # append in group
+                follower = next(iter(group))
+                leader_name = group.attrib['leader']
+                if '.' in leader_name:
+                    leader_path = leader_name.rsplit('.', 1)[0]
+                    follower_path = leader_path + '.' + follower.text
+                else:
+                    follower_path = follower.text
+                obj = paths[follower_path]
+                family = SubElement(obj['parent'], 'family', name=leader_name, leadership="True")
+            for follower in group:
+                leader_name = group.attrib['leader']
+                if '.' in leader_name:
+                    leader_path = leader_name.rsplit('.', 1)[0]
+                    follower_path = leader_path + '.' + follower.text
+                else:
+                    follower_path = follower.text
+                follower_obj = paths[follower_path]
+                follower_obj['parent'].remove(follower_obj['variable'])
+                family.append(follower_obj['variable'])
+        return root
+
+    def _get_path_variables(self, variables, is_variable_namespace, path, dico=None):
+        if dico is None:
+            dico = {}
+        for variable in variables:
+            if not is_variable_namespace and path:
+                subpath = path + '.'
+            else:
+                subpath = ''
+            subpath += variable.attrib['name']
+            if variable.tag == 'family':
+                self._get_path_variables(variable, is_variable_namespace, subpath, dico)
+            elif variable.tag == 'variable':
+                dico[subpath] = {'variable': variable, 'parent': variables}
+        return dico
+
     def update_rougail_0_9(self,
                            root: 'Element',
                            upgrade_help: dict,
@@ -101,7 +196,6 @@ class RougailUpgrade:
                            ) -> 'Element':
         # rename root
         root.tag = 'rougail'
-        root.attrib['version'] = '0.9'
         variables_auto_valid_enum = {}
         variables_help = {}
         families_help = {}
@@ -146,7 +240,7 @@ class RougailUpgrade:
                             subsubsubelement.attrib['mandatory'] = 'True'
                         if subsubsubelement.attrib['name'] in upgrade_help.get('variables', {}).get('type', {}):
                             subsubsubelement.attrib['type'] = upgrade_help.get('variables', {}).get('type', {})[subsubsubelement.attrib['name']]
-                        if namespace == 'configuration':
+                        if namespace == self.rougailconfig['variable_namespace']:
                             path = subsubsubelement.attrib['name']
                             npath = normalize_family(subsubsubelement.attrib['name'])
                         else:
diff --git a/tests/dictionaries/00empty/00_base.xml b/tests/dictionaries/00empty/00_base.xml
index ea43804d..ef9ac4b4 100644
--- a/tests/dictionaries/00empty/00_base.xml
+++ b/tests/dictionaries/00empty/00_base.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <services>
-        <service name="tata">
+<rougail version="0.10">
+  <services>
+    <service name="tata">
         </service>
-    </services>
+  </services>
 </rougail>
diff --git a/tests/dictionaries/00load_autofreeze/00-base.xml b/tests/dictionaries/00load_autofreeze/00-base.xml
index 119c729b..96d54553 100644
--- a/tests/dictionaries/00load_autofreeze/00-base.xml
+++ b/tests/dictionaries/00load_autofreeze/00-base.xml
@@ -1,13 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <variable name="myvar" auto_freeze="True">
-            <value>no</value>
-        </variable>
-        <variable name="server_deployed" type="boolean">
-            <value>False</value>
-        </variable>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <variable name="myvar" auto_freeze="True">
+      <value>no</value>
+    </variable>
+    <variable name="server_deployed" type="boolean">
+      <value>False</value>
+    </variable>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/00load_autofreezeexpert/00-base.xml b/tests/dictionaries/00load_autofreezeexpert/00-base.xml
index d4f59f6e..7b8fbc53 100644
--- a/tests/dictionaries/00load_autofreezeexpert/00-base.xml
+++ b/tests/dictionaries/00load_autofreezeexpert/00-base.xml
@@ -1,13 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <variable name="my_var" auto_freeze="True" mode="expert">
-            <value>no</value>
-        </variable>
-        <variable name="server_deployed" type="boolean">
-            <value>False</value>
-        </variable>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <variable name="my_var" auto_freeze="True" mode="expert">
+      <value>no</value>
+    </variable>
+    <variable name="server_deployed" type="boolean">
+      <value>False</value>
+    </variable>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/00load_autosave/00-base.xml b/tests/dictionaries/00load_autosave/00-base.xml
index 28d7d0cf..731c00e5 100644
--- a/tests/dictionaries/00load_autosave/00-base.xml
+++ b/tests/dictionaries/00load_autosave/00-base.xml
@@ -1,13 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <variable name="server_deployed" type="boolean"/>
-        <family name="general" description="général">
-            <variable name="mode_conteneur_actif" type="string" description="No change" auto_save="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <variable name="server_deployed" type="boolean"/>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" auto_save="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/00load_autosaveexpert/00-base.xml b/tests/dictionaries/00load_autosaveexpert/00-base.xml
index 63b1dd76..a4e833da 100644
--- a/tests/dictionaries/00load_autosaveexpert/00-base.xml
+++ b/tests/dictionaries/00load_autosaveexpert/00-base.xml
@@ -1,13 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <variable name="server_deployed" type="boolean"/>
-        <family name="general" description="général">
-            <variable name="mode_conteneur_actif" type="string" description="No change" auto_save="True" mode="expert">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <variable name="server_deployed" type="boolean"/>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" auto_save="True" mode="expert">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/00load_comment/00-base.xml b/tests/dictionaries/00load_comment/00-base.xml
index e781b9f8..6ac1ab45 100644
--- a/tests/dictionaries/00load_comment/00-base.xml
+++ b/tests/dictionaries/00load_comment/00-base.xml
@@ -1,13 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general" description="général">
-            <!-- this is a comment -->
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general" description="général">
+      <!-- this is a comment -->
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/00load_notype/00-base.xml b/tests/dictionaries/00load_notype/00-base.xml
index fddb62b3..6594e939 100644
--- a/tests/dictionaries/00load_notype/00-base.xml
+++ b/tests/dictionaries/00load_notype/00-base.xml
@@ -1,15 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general" description="général">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="without_type">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="without_type">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/00load_save/00-base.xml b/tests/dictionaries/00load_save/00-base.xml
index 46d87131..f0576995 100644
--- a/tests/dictionaries/00load_save/00-base.xml
+++ b/tests/dictionaries/00load_save/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general" description="général">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/00load_subfolder/99-base.xml b/tests/dictionaries/00load_subfolder/99-base.xml
index 46d87131..f0576995 100644
--- a/tests/dictionaries/00load_subfolder/99-base.xml
+++ b/tests/dictionaries/00load_subfolder/99-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general" description="général">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/00load_subfolder/subfolder/00-base.xml b/tests/dictionaries/00load_subfolder/subfolder/00-base.xml
index d6b12510..b06fb689 100644
--- a/tests/dictionaries/00load_subfolder/subfolder/00-base.xml
+++ b/tests/dictionaries/00load_subfolder/subfolder/00-base.xml
@@ -1,13 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.9">
-    <variables>
-        <family name="general" description="général">
-            <variable name='mode_conteneur_actif1' type='string' description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif1" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01auto_autofreeze/00-base.xml b/tests/dictionaries/01auto_autofreeze/00-base.xml
index 7ce63e7d..fcfc4feb 100644
--- a/tests/dictionaries/01auto_autofreeze/00-base.xml
+++ b/tests/dictionaries/01auto_autofreeze/00-base.xml
@@ -1,19 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <variable name="server_deployed" type="boolean">
-            <value>no</value>
-        </variable>
-        <variable name="my_variable" auto_freeze="True" hidden="True">
-            <value>no</value>
-        </variable>
-    </variables>
-    <constraints>
-        <fill name="calc_val">
-            <param>yes</param>
-            <target>my_variable</target>
-        </fill>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <variable name="server_deployed" type="boolean">
+      <value>no</value>
+    </variable>
+    <variable name="my_variable" auto_freeze="True" hidden="True">
+      <value>no</value>
+    </variable>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param>yes</param>
+      <target>my_variable</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01auto_base/00-base.xml b/tests/dictionaries/01auto_base/00-base.xml
index b8e98b89..fe101284 100644
--- a/tests/dictionaries/01auto_base/00-base.xml
+++ b/tests/dictionaries/01auto_base/00-base.xml
@@ -1,22 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif1" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param type="variable">mode_conteneur_actif1</param>
-            <target>mode_conteneur_actif</target>
-        </fill>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="variable">mode_conteneur_actif1</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01auto_withoutparam/00-base.xml b/tests/dictionaries/01auto_withoutparam/00-base.xml
index 3647b4bd..cab468eb 100644
--- a/tests/dictionaries/01auto_withoutparam/00-base.xml
+++ b/tests/dictionaries/01auto_withoutparam/00-base.xml
@@ -1,21 +1,18 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif1" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <target>mode_conteneur_actif</target>
-        </fill>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01base_domainname/00-base.xml b/tests/dictionaries/01base_domainname/00-base.xml
index 343c76d1..0bad0a27 100644
--- a/tests/dictionaries/01base_domainname/00-base.xml
+++ b/tests/dictionaries/01base_domainname/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="domain" type="domainname" description="Description">
-                <value>my.domain.name</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="domain" type="domainname" description="Description">
+        <value>my.domain.name</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01base_file/00-base.xml b/tests/dictionaries/01base_file/00-base.xml
index 5e1ac5f7..8cb2c47b 100644
--- a/tests/dictionaries/01base_file/00-base.xml
+++ b/tests/dictionaries/01base_file/00-base.xml
@@ -1,20 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-
-    <services>
-        <service name="test">
-            <file>/etc/file</file>
-            <file engine="jinja2">/etc/file2</file>
-        </service>
-    </services>
-
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Description">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <services>
+    <service name="test">
+      <file>/etc/file</file>
+      <file engine="jinja2">/etc/file2</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Description">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01base_file_include/00-base.xml b/tests/dictionaries/01base_file_include/00-base.xml
index 5e1ac5f7..8cb2c47b 100644
--- a/tests/dictionaries/01base_file_include/00-base.xml
+++ b/tests/dictionaries/01base_file_include/00-base.xml
@@ -1,20 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-
-    <services>
-        <service name="test">
-            <file>/etc/file</file>
-            <file engine="jinja2">/etc/file2</file>
-        </service>
-    </services>
-
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Description">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <services>
+    <service name="test">
+      <file>/etc/file</file>
+      <file engine="jinja2">/etc/file2</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Description">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01base_file_include_content/00-base.xml b/tests/dictionaries/01base_file_include_content/00-base.xml
index 5f361ea7..2a038b2e 100644
--- a/tests/dictionaries/01base_file_include_content/00-base.xml
+++ b/tests/dictionaries/01base_file_include_content/00-base.xml
@@ -1,21 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-
-    <services>
-        <service name="test">
-            <file>/etc/file</file>
-            <file engine="jinja2">/etc/file2</file>
-            <file included="content">/etc/dir/incfile</file>
-        </service>
-    </services>
-
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Description">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <services>
+    <service name="test">
+      <file>/etc/file</file>
+      <file engine="jinja2">/etc/file2</file>
+      <file included="content">/etc/dir/incfile</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Description">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01base_file_include_name/00-base.xml b/tests/dictionaries/01base_file_include_name/00-base.xml
index ad7b470a..1bc14b59 100644
--- a/tests/dictionaries/01base_file_include_name/00-base.xml
+++ b/tests/dictionaries/01base_file_include_name/00-base.xml
@@ -1,21 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-
-    <services>
-        <service name="test">
-            <file>/etc/file</file>
-            <file engine="jinja2">/etc/file2</file>
-            <file included="name">/etc/dir/incfile</file>
-        </service>
-    </services>
-
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Description">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <services>
+    <service name="test">
+      <file>/etc/file</file>
+      <file engine="jinja2">/etc/file2</file>
+      <file included="name">/etc/dir/incfile</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Description">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01base_file_patch/00-base.xml b/tests/dictionaries/01base_file_patch/00-base.xml
index 5e1ac5f7..8cb2c47b 100644
--- a/tests/dictionaries/01base_file_patch/00-base.xml
+++ b/tests/dictionaries/01base_file_patch/00-base.xml
@@ -1,20 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-
-    <services>
-        <service name="test">
-            <file>/etc/file</file>
-            <file engine="jinja2">/etc/file2</file>
-        </service>
-    </services>
-
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Description">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <services>
+    <service name="test">
+      <file>/etc/file</file>
+      <file engine="jinja2">/etc/file2</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Description">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01base_file_utfchar/00-base.xml b/tests/dictionaries/01base_file_utfchar/00-base.xml
index 63bce895..15d4233e 100644
--- a/tests/dictionaries/01base_file_utfchar/00-base.xml
+++ b/tests/dictionaries/01base_file_utfchar/00-base.xml
@@ -1,20 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-
-    <services>
-        <service name="test">
-            <file>/etc/systemd-makefs@dev-disk-by\x2dpartlabel</file>
-            <file engine="jinja2">/etc/systemd-makefs@dev-disk-by\x2dpartlabel2</file>
-        </service>
-    </services>
-
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Description">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <services>
+    <service name="test">
+      <file>/etc/systemd-makefs@dev-disk-by\x2dpartlabel</file>
+      <file engine="jinja2">/etc/systemd-makefs@dev-disk-by\x2dpartlabel2</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Description">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01base_float/00-base.xml b/tests/dictionaries/01base_float/00-base.xml
index 617d04c8..95547048 100644
--- a/tests/dictionaries/01base_float/00-base.xml
+++ b/tests/dictionaries/01base_float/00-base.xml
@@ -1,15 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="float" type="float" description="Description">
-                <value>0.527</value>
-            </variable>
-            <variable name="float_multi" type="float" description="Description" multi="True">
-                <value>0.527</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="float" type="float" description="Description">
+        <value>0.527</value>
+      </variable>
+      <variable name="float_multi" type="float" description="Description" multi="True">
+        <value>0.527</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01base_help_quote/00-base.xml b/tests/dictionaries/01base_help_quote/00-base.xml
index a748eec1..dacddfcf 100644
--- a/tests/dictionaries/01base_help_quote/00-base.xml
+++ b/tests/dictionaries/01base_help_quote/00-base.xml
@@ -1,11 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Redefine description" help="message with '"/>
-            <variable name="mode_conteneur_actif1" type="string" description="Redefine description" help='message with "'/>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Redefine description" help="message with '"/>
+      <variable name="mode_conteneur_actif1" type="string" description="Redefine description" help="message with &quot;"/>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01base_multi/00-base.xml b/tests/dictionaries/01base_multi/00-base.xml
index 8d78cb86..c6c0f607 100644
--- a/tests/dictionaries/01base_multi/00-base.xml
+++ b/tests/dictionaries/01base_multi/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True" multi="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True" multi="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01base_value_doublequote/00-base.xml b/tests/dictionaries/01base_value_doublequote/00-base.xml
index a4e1ad39..f9e31773 100644
--- a/tests/dictionaries/01base_value_doublequote/00-base.xml
+++ b/tests/dictionaries/01base_value_doublequote/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True">
-                <value>quote"</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True">
+        <value>quote"</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01base_value_doublequote2/00-base.xml b/tests/dictionaries/01base_value_doublequote2/00-base.xml
index 64811b2a..dc3f9393 100644
--- a/tests/dictionaries/01base_value_doublequote2/00-base.xml
+++ b/tests/dictionaries/01base_value_doublequote2/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True">
-                <value>quote'"</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True">
+        <value>quote'"</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01base_value_doublequote3/00-base.xml b/tests/dictionaries/01base_value_doublequote3/00-base.xml
index 649311a8..fb2e6e0b 100644
--- a/tests/dictionaries/01base_value_doublequote3/00-base.xml
+++ b/tests/dictionaries/01base_value_doublequote3/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True">
-                <value>quote\"\'</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True">
+        <value>quote\"\'</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01base_value_multi_doublequote/00-base.xml b/tests/dictionaries/01base_value_multi_doublequote/00-base.xml
index 89f83e69..da0614e0 100644
--- a/tests/dictionaries/01base_value_multi_doublequote/00-base.xml
+++ b/tests/dictionaries/01base_value_multi_doublequote/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True" multi="True">
-                <value>quote"</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True" multi="True">
+        <value>quote"</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01base_value_multi_doublequote2/00-base.xml b/tests/dictionaries/01base_value_multi_doublequote2/00-base.xml
index 2a5957c4..35851b77 100644
--- a/tests/dictionaries/01base_value_multi_doublequote2/00-base.xml
+++ b/tests/dictionaries/01base_value_multi_doublequote2/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True" multi="True">
-                <value>quote'"</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True" multi="True">
+        <value>quote'"</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01base_value_multi_quote/00-base.xml b/tests/dictionaries/01base_value_multi_quote/00-base.xml
index 99054901..e61e305c 100644
--- a/tests/dictionaries/01base_value_multi_quote/00-base.xml
+++ b/tests/dictionaries/01base_value_multi_quote/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True" multi="True">
-                <value>quote'</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True" multi="True">
+        <value>quote'</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01base_value_quote/00-base.xml b/tests/dictionaries/01base_value_quote/00-base.xml
index a30582af..17be4883 100644
--- a/tests/dictionaries/01base_value_quote/00-base.xml
+++ b/tests/dictionaries/01base_value_quote/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True">
-                <value>quote'</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True">
+        <value>quote'</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01base_var_name_same_family/00-base.xml b/tests/dictionaries/01base_var_name_same_family/00-base.xml
index 780a0417..da0749bb 100644
--- a/tests/dictionaries/01base_var_name_same_family/00-base.xml
+++ b/tests/dictionaries/01base_var_name_same_family/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="general" type="string" description="description">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="general" type="string" description="description">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01boolean_no_mandatory/00-base.xml b/tests/dictionaries/01boolean_no_mandatory/00-base.xml
index 663cb3b9..ec14adb9 100644
--- a/tests/dictionaries/01boolean_no_mandatory/00-base.xml
+++ b/tests/dictionaries/01boolean_no_mandatory/00-base.xml
@@ -1,8 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <variable name="my_variable" type="boolean" mandatory="False"/>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <variable name="my_variable" type="boolean" mandatory="False"/>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01family_description/00-base.xml b/tests/dictionaries/01family_description/00-base.xml
index fb5dd3f0..bb32a55a 100644
--- a/tests/dictionaries/01family_description/00-base.xml
+++ b/tests/dictionaries/01family_description/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general" description="Other description">
-            <variable name="mode_conteneur_actif">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general" description="Other description">
+      <variable name="mode_conteneur_actif">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01fill_autofreeze/00-base.xml b/tests/dictionaries/01fill_autofreeze/00-base.xml
index ac1d1926..16602912 100644
--- a/tests/dictionaries/01fill_autofreeze/00-base.xml
+++ b/tests/dictionaries/01fill_autofreeze/00-base.xml
@@ -1,23 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <variable name="my_var1" auto_freeze="True">
-            <value>no</value>
-        </variable>
-        <variable name="my_var2">
-            <value>no</value>
-        </variable>
-        <variable name="server_deployed" type="boolean">
-            <value>False</value>
-        </variable>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param type="variable">my_var2</param>
-            <target>my_var1</target>
-        </fill>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <variable name="my_var1" auto_freeze="True">
+      <value>no</value>
+    </variable>
+    <variable name="my_var2">
+      <value>no</value>
+    </variable>
+    <variable name="server_deployed" type="boolean">
+      <value>False</value>
+    </variable>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="variable">my_var2</param>
+      <target>my_var1</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01fill_autosave/00-base.xml b/tests/dictionaries/01fill_autosave/00-base.xml
index 823d4187..fe9c791e 100644
--- a/tests/dictionaries/01fill_autosave/00-base.xml
+++ b/tests/dictionaries/01fill_autosave/00-base.xml
@@ -1,23 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <variable name="server_deployed" type="boolean"/>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" auto_save="True">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif1" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param type="variable">mode_conteneur_actif1</param>
-            <target>mode_conteneur_actif</target>
-        </fill>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <variable name="server_deployed" type="boolean"/>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" auto_save="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="variable">mode_conteneur_actif1</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01fill_base/00-base.xml b/tests/dictionaries/01fill_base/00-base.xml
index e2635058..ab755989 100644
--- a/tests/dictionaries/01fill_base/00-base.xml
+++ b/tests/dictionaries/01fill_base/00-base.xml
@@ -1,20 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change"/>
-            <variable name="mode_conteneur_actif1" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param type="variable">mode_conteneur_actif1</param>
-            <target>mode_conteneur_actif</target>
-        </fill>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change"/>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="variable">mode_conteneur_actif1</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01fill_mandatory/00-base.xml b/tests/dictionaries/01fill_mandatory/00-base.xml
index dbeacf98..40c178d2 100644
--- a/tests/dictionaries/01fill_mandatory/00-base.xml
+++ b/tests/dictionaries/01fill_mandatory/00-base.xml
@@ -1,20 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general" mode="basic">
-            <variable name="mode_conteneur_actif" type="string" description="No change" mandatory="True" mode="expert"/>
-            <variable name="mode_conteneur_actif1" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param type="variable">mode_conteneur_actif1</param>
-            <target>mode_conteneur_actif</target>
-        </fill>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general" mode="basic">
+      <variable name="mode_conteneur_actif" type="string" description="No change" mandatory="True" mode="expert"/>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="variable">mode_conteneur_actif1</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01fill_number/00-base.xml b/tests/dictionaries/01fill_number/00-base.xml
index 60d6ed6c..3054d582 100644
--- a/tests/dictionaries/01fill_number/00-base.xml
+++ b/tests/dictionaries/01fill_number/00-base.xml
@@ -1,20 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="number" description="No change" hidden="True"/>
-            <variable name="mode_conteneur_actif1" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param type="number">3</param>
-            <target>mode_conteneur_actif</target>
-        </fill>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="number" description="No change" hidden="True"/>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="number">3</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01fill_only_optional/00-base.xml b/tests/dictionaries/01fill_only_optional/00-base.xml
index 5e6dc7bc..fd9f67b1 100644
--- a/tests/dictionaries/01fill_only_optional/00-base.xml
+++ b/tests/dictionaries/01fill_only_optional/00-base.xml
@@ -1,22 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif1" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param type="variable" optional="True">mode_conteneur_actif4</param>
-            <target>mode_conteneur_actif</target>
-        </fill>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="variable" optional="True">mode_conteneur_actif4</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01fill_optional/00-base.xml b/tests/dictionaries/01fill_optional/00-base.xml
index 3fe145b6..4fd16348 100644
--- a/tests/dictionaries/01fill_optional/00-base.xml
+++ b/tests/dictionaries/01fill_optional/00-base.xml
@@ -1,24 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif1" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param type="variable" optional="True">mode_conteneur_actif4</param>
-            <param type="variable">mode_conteneur_actif1</param>
-            <param type="variable" optional="True">mode_conteneur_actif3</param>
-            <target>mode_conteneur_actif</target>
-        </fill>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="variable" optional="True">mode_conteneur_actif4</param>
+      <param type="variable">mode_conteneur_actif1</param>
+      <param type="variable" optional="True">mode_conteneur_actif3</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01fill_quote/00-base.xml b/tests/dictionaries/01fill_quote/00-base.xml
index ccf03093..058554ac 100644
--- a/tests/dictionaries/01fill_quote/00-base.xml
+++ b/tests/dictionaries/01fill_quote/00-base.xml
@@ -1,32 +1,29 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change"/>
-            <variable name="mode_conteneur_actif1" type="string" description="No change"/>
-            <variable name="mode_conteneur_actif2" type="string" description="No change"/>
-            <variable name="mode_conteneur_actif3" type="string" description="No change"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param>quote'</param>
-            <target>mode_conteneur_actif</target>
-        </fill>
-        <fill name="calc_val">
-            <param>quote"</param>
-            <target>mode_conteneur_actif1</target>
-        </fill>
-        <fill name="calc_val">
-            <param>quote"'</param>
-            <target>mode_conteneur_actif2</target>
-        </fill>
-        <fill name="calc_val">
-            <param>quote"\'</param>
-            <target>mode_conteneur_actif3</target>
-        </fill>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change"/>
+      <variable name="mode_conteneur_actif1" type="string" description="No change"/>
+      <variable name="mode_conteneur_actif2" type="string" description="No change"/>
+      <variable name="mode_conteneur_actif3" type="string" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param>quote'</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+    <fill name="calc_val">
+      <param>quote"</param>
+      <target>mode_conteneur_actif1</target>
+    </fill>
+    <fill name="calc_val">
+      <param>quote"'</param>
+      <target>mode_conteneur_actif2</target>
+    </fill>
+    <fill name="calc_val">
+      <param>quote"\'</param>
+      <target>mode_conteneur_actif3</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01fill_target_optional/00-base.xml b/tests/dictionaries/01fill_target_optional/00-base.xml
index 1003d6d5..7dbd36d9 100644
--- a/tests/dictionaries/01fill_target_optional/00-base.xml
+++ b/tests/dictionaries/01fill_target_optional/00-base.xml
@@ -1,19 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif1" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param type="variable">mode_conteneur_actif1</param>
-            <target optional="True">mode_conteneur_actif</target>
-        </fill>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="variable">mode_conteneur_actif1</param>
+      <target optional="True">mode_conteneur_actif</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01hidden_if_in_autofreeze/00-base.xml b/tests/dictionaries/01hidden_if_in_autofreeze/00-base.xml
index c8e9e8be..7876bac3 100644
--- a/tests/dictionaries/01hidden_if_in_autofreeze/00-base.xml
+++ b/tests/dictionaries/01hidden_if_in_autofreeze/00-base.xml
@@ -1,23 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <variable name="server_deployed" type="boolean">
-            <value>False</value>
-        </variable>
-        <variable name="my_var" type="string" auto_freeze="True">
-            <value>no</value>
-        </variable>
-    </variables>
-    <constraints>
-        <fill name="calc_val">
-            <param>yes</param>
-            <target>my_var</target>
-        </fill>
-        <condition name="hidden_if_in" source="server_deployed">
-            <param>True</param>
-            <target type="variable">my_var</target>
-        </condition>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <variable name="server_deployed" type="boolean">
+      <value>False</value>
+    </variable>
+    <variable name="my_var" type="string" auto_freeze="True">
+      <value>no</value>
+    </variable>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param>yes</param>
+      <target>my_var</target>
+    </fill>
+    <condition name="hidden_if_in" source="server_deployed">
+      <param>True</param>
+      <target type="variable">my_var</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01test/00-base.xml b/tests/dictionaries/01test/00-base.xml
index 4499bdd4..4c938a14 100644
--- a/tests/dictionaries/01test/00-base.xml
+++ b/tests/dictionaries/01test/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" test="test">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" test="test">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01test_multi/00-base.xml b/tests/dictionaries/01test_multi/00-base.xml
index 976d6fa6..971cd514 100644
--- a/tests/dictionaries/01test_multi/00-base.xml
+++ b/tests/dictionaries/01test_multi/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" test="test1|test2">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" test="test1|test2">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01test_multi_none/00-base.xml b/tests/dictionaries/01test_multi_none/00-base.xml
index d703f1df..9afd80f7 100644
--- a/tests/dictionaries/01test_multi_none/00-base.xml
+++ b/tests/dictionaries/01test_multi_none/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" test="|test1|test2">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" test="|test1|test2">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01test_redefine/00-base.xml b/tests/dictionaries/01test_redefine/00-base.xml
index 4499bdd4..4c938a14 100644
--- a/tests/dictionaries/01test_redefine/00-base.xml
+++ b/tests/dictionaries/01test_redefine/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" test="test">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" test="test">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01test_redefine/10-base.xml b/tests/dictionaries/01test_redefine/10-base.xml
index 7910620e..dd8ef751 100644
--- a/tests/dictionaries/01test_redefine/10-base.xml
+++ b/tests/dictionaries/01test_redefine/10-base.xml
@@ -1,10 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" redefine="True" test="test1"/>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" redefine="True" test="test1"/>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01test_redefine_base/00-base.xml b/tests/dictionaries/01test_redefine_base/00-base.xml
index 9047130c..e8b9ea61 100644
--- a/tests/dictionaries/01test_redefine_base/00-base.xml
+++ b/tests/dictionaries/01test_redefine_base/00-base.xml
@@ -1,8 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <variable name="my_variable"/>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <variable name="my_variable"/>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01test_redefine_base/10-base.xml b/tests/dictionaries/01test_redefine_base/10-base.xml
index a99cbf1f..2446a70e 100644
--- a/tests/dictionaries/01test_redefine_base/10-base.xml
+++ b/tests/dictionaries/01test_redefine_base/10-base.xml
@@ -1,8 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <variable name="my_variable" redefine="True" test="test1"/>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <variable name="my_variable" redefine="True" test="test1"/>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01test_redefine_remove/00-base.xml b/tests/dictionaries/01test_redefine_remove/00-base.xml
index 4499bdd4..4c938a14 100644
--- a/tests/dictionaries/01test_redefine_remove/00-base.xml
+++ b/tests/dictionaries/01test_redefine_remove/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" test="test">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" test="test">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01test_redefine_remove/10-base.xml b/tests/dictionaries/01test_redefine_remove/10-base.xml
index 5f7099f3..3a1e3e60 100644
--- a/tests/dictionaries/01test_redefine_remove/10-base.xml
+++ b/tests/dictionaries/01test_redefine_remove/10-base.xml
@@ -1,10 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" redefine="True" test=""/>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" redefine="True" test=""/>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/02autosave_hidden_frozenifin/00-base.xml b/tests/dictionaries/02autosave_hidden_frozenifin/00-base.xml
index 23223e08..99fb291e 100644
--- a/tests/dictionaries/02autosave_hidden_frozenifin/00-base.xml
+++ b/tests/dictionaries/02autosave_hidden_frozenifin/00-base.xml
@@ -1,24 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <variable name="server_deployed" type="boolean"/>
-        <family name="general" description="général">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="autosavevar" type="string" description="autosave variable" auto_save="True"/>
-        </family>
-    </variables>
-    <constraints>
-        <fill name="calc_val">
-            <param>oui</param>
-            <target>autosavevar</target>
-        </fill>
-        <condition name="hidden_if_in" source="mode_conteneur_actif">
-             <param>oui</param>
-             <target type="variable">autosavevar</target>
-        </condition>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <variable name="server_deployed" type="boolean"/>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="autosavevar" type="string" description="autosave variable" auto_save="True"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param>oui</param>
+      <target>autosavevar</target>
+    </fill>
+    <condition name="hidden_if_in" source="mode_conteneur_actif">
+      <param>oui</param>
+      <target type="variable">autosavevar</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/02fill_multi_calc_val/00-base.xml b/tests/dictionaries/02fill_multi_calc_val/00-base.xml
index f12a5cfe..1f15a122 100644
--- a/tests/dictionaries/02fill_multi_calc_val/00-base.xml
+++ b/tests/dictionaries/02fill_multi_calc_val/00-base.xml
@@ -1,19 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <variable name="var1">
-            <value>no</value>
-        </variable>
-        <variable name="var2" multi='True'/>
-    </variables>
-
-    <constraints>
-        <fill name="calc_value">
-            <param type="variable">var1</param>
-            <param type="boolean" name="multi">True</param>
-            <target>var2</target>
-        </fill>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <variable name="var1">
+      <value>no</value>
+    </variable>
+    <variable name="var2" multi="True"/>
+  </variables>
+  <constraints>
+    <fill name="calc_value">
+      <param type="variable">var1</param>
+      <param type="boolean" name="multi">True</param>
+      <target>var2</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/02fill_multi_calc_val_multi/00-base.xml b/tests/dictionaries/02fill_multi_calc_val_multi/00-base.xml
index ac1e413d..889202bf 100644
--- a/tests/dictionaries/02fill_multi_calc_val_multi/00-base.xml
+++ b/tests/dictionaries/02fill_multi_calc_val_multi/00-base.xml
@@ -1,20 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <variable name="var1" multi='True'>
-            <value>no</value>
-            <value>yes</value>
-            <value>maybe</value>
-        </variable>
-        <variable name="var2" multi='True'/>
-    </variables>
-
-    <constraints>
-        <fill name="calc_value">
-            <param type="variable">var1</param>
-            <target>var2</target>
-        </fill>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <variable name="var1" multi="True">
+      <value>no</value>
+      <value>yes</value>
+      <value>maybe</value>
+    </variable>
+    <variable name="var2" multi="True"/>
+  </variables>
+  <constraints>
+    <fill name="calc_value">
+      <param type="variable">var1</param>
+      <target>var2</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10autosave_hidden/00-base.xml b/tests/dictionaries/10autosave_hidden/00-base.xml
index 1785ae34..23d47d40 100644
--- a/tests/dictionaries/10autosave_hidden/00-base.xml
+++ b/tests/dictionaries/10autosave_hidden/00-base.xml
@@ -1,21 +1,18 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <variable name="server_deployed" type="boolean"/>
-        <family name="general" description="général">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="autosavevar" type="string" description="autosave variable" hidden="True" auto_save="True"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param>oui</param>
-            <target>autosavevar</target>
-        </fill>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <variable name="server_deployed" type="boolean"/>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="autosavevar" type="string" description="autosave variable" hidden="True" auto_save="True"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param>oui</param>
+      <target>autosavevar</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10check_base/00-base.xml b/tests/dictionaries/10check_base/00-base.xml
index af218790..a163cee3 100644
--- a/tests/dictionaries/10check_base/00-base.xml
+++ b/tests/dictionaries/10check_base/00-base.xml
@@ -1,20 +1,18 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>b</value>
-            </variable>
-            <variable name="int" type="number" description="No change"/>
-        </family>
-    </variables>
-    <constraints>
-        <check name="valid_entier">
-            <param name="mini" type="number">0</param>
-            <param name="maxi" type="number">100</param>
-            <target>int</target>
-        </check>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>b</value>
+      </variable>
+      <variable name="int" type="number" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_entier">
+      <param name="mini" type="number">0</param>
+      <param name="maxi" type="number">100</param>
+      <target>int</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10check_base_target_optional/00-base.xml b/tests/dictionaries/10check_base_target_optional/00-base.xml
index 5bd88212..723d1f30 100644
--- a/tests/dictionaries/10check_base_target_optional/00-base.xml
+++ b/tests/dictionaries/10check_base_target_optional/00-base.xml
@@ -1,15 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <variable name="my_variable"/>
-    </variables>
-    <constraints>
-        <check name="valid_entier">
-            <param name="mini" type="number">0</param>
-            <param name="maxi" type="number">100</param>
-            <target optional="True">int</target>
-        </check>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <variable name="my_variable"/>
+  </variables>
+  <constraints>
+    <check name="valid_entier">
+      <param name="mini" type="number">0</param>
+      <param name="maxi" type="number">100</param>
+      <target optional="True">int</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10check_no_param/00-base.xml b/tests/dictionaries/10check_no_param/00-base.xml
index 8042b729..1def8eb4 100644
--- a/tests/dictionaries/10check_no_param/00-base.xml
+++ b/tests/dictionaries/10check_no_param/00-base.xml
@@ -1,19 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>b</value>
-            </variable>
-            <variable name="int" type="number" description="No change"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_lower">
-            <target>int</target>
-        </check>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>b</value>
+      </variable>
+      <variable name="int" type="number" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_lower">
+      <target>int</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10check_option/00-base.xml b/tests/dictionaries/10check_option/00-base.xml
index a48d9e40..8931a184 100644
--- a/tests/dictionaries/10check_option/00-base.xml
+++ b/tests/dictionaries/10check_option/00-base.xml
@@ -1,24 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>b</value>
-            </variable>
-            <variable name="int2" type="number" description="No change">
-                <value>100</value>
-            </variable>
-            <variable name="int" type="number" description="No change"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_lower">
-            <param name="mini" type="number">0</param>
-            <param name="maxi" type="variable">int2</param>
-            <target>int</target>
-        </check>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>b</value>
+      </variable>
+      <variable name="int2" type="number" description="No change">
+        <value>100</value>
+      </variable>
+      <variable name="int" type="number" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_lower">
+      <param name="mini" type="number">0</param>
+      <param name="maxi" type="variable">int2</param>
+      <target>int</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10check_optional/00-base.xml b/tests/dictionaries/10check_optional/00-base.xml
index 230ff007..a4b36485 100644
--- a/tests/dictionaries/10check_optional/00-base.xml
+++ b/tests/dictionaries/10check_optional/00-base.xml
@@ -1,25 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>b</value>
-            </variable>
-            <variable name="int" type="number" description="No change"/>
-            <variable name="int2" type="number" description="No change"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_differ">
-            <param type="variable" optional="True">int2</param>
-            <target>int</target>
-        </check>
-        <check name="valid_differ">
-            <param type="variable" optional="True">int3</param>
-            <target>int</target>
-        </check>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>b</value>
+      </variable>
+      <variable name="int" type="number" description="No change"/>
+      <variable name="int2" type="number" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_differ">
+      <param type="variable" optional="True">int2</param>
+      <target>int</target>
+    </check>
+    <check name="valid_differ">
+      <param type="variable" optional="True">int3</param>
+      <target>int</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10check_valid_differ/00-base.xml b/tests/dictionaries/10check_valid_differ/00-base.xml
index 263d8457..57da70df 100644
--- a/tests/dictionaries/10check_valid_differ/00-base.xml
+++ b/tests/dictionaries/10check_valid_differ/00-base.xml
@@ -1,22 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>oui</value>
-            </variable>
-            <variable name="mode_conteneur_actif1" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_differ">
-            <param type="variable">mode_conteneur_actif1</param>
-            <target>mode_conteneur_actif</target>
-        </check>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>oui</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_differ">
+      <param type="variable">mode_conteneur_actif1</param>
+      <target>mode_conteneur_actif</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10check_valid_differ_add/00-base.xml b/tests/dictionaries/10check_valid_differ_add/00-base.xml
index e8eaac33..7ec67be0 100644
--- a/tests/dictionaries/10check_valid_differ_add/00-base.xml
+++ b/tests/dictionaries/10check_valid_differ_add/00-base.xml
@@ -1,28 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>oui</value>
-            </variable>
-            <variable name="mode_conteneur_actif1" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif3" type="string" description="No change">
-                <value>oui</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_differ">
-            <param type="variable">mode_conteneur_actif1</param>
-            <target>mode_conteneur_actif3</target>
-        </check>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>oui</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif3" type="string" description="No change">
+        <value>oui</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_differ">
+      <param type="variable">mode_conteneur_actif1</param>
+      <target>mode_conteneur_actif3</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10check_valid_differ_add/01-base.xml b/tests/dictionaries/10check_valid_differ_add/01-base.xml
index 514abfab..91112ba4 100644
--- a/tests/dictionaries/10check_valid_differ_add/01-base.xml
+++ b/tests/dictionaries/10check_valid_differ_add/01-base.xml
@@ -1,21 +1,18 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif3" redefine="True"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_differ">
-            <param type="variable">mode_conteneur_actif1</param>
-            <target>mode_conteneur_actif3</target>
-        </check>
-        <check name="valid_differ">
-            <param type="variable">mode_conteneur_actif2</param>
-            <target>mode_conteneur_actif3</target>
-        </check>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif3" redefine="True"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_differ">
+      <param type="variable">mode_conteneur_actif1</param>
+      <target>mode_conteneur_actif3</target>
+    </check>
+    <check name="valid_differ">
+      <param type="variable">mode_conteneur_actif2</param>
+      <target>mode_conteneur_actif3</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10check_valid_differ_removecheck/00-base.xml b/tests/dictionaries/10check_valid_differ_removecheck/00-base.xml
index e8eaac33..7ec67be0 100644
--- a/tests/dictionaries/10check_valid_differ_removecheck/00-base.xml
+++ b/tests/dictionaries/10check_valid_differ_removecheck/00-base.xml
@@ -1,28 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>oui</value>
-            </variable>
-            <variable name="mode_conteneur_actif1" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif3" type="string" description="No change">
-                <value>oui</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_differ">
-            <param type="variable">mode_conteneur_actif1</param>
-            <target>mode_conteneur_actif3</target>
-        </check>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>oui</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif3" type="string" description="No change">
+        <value>oui</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_differ">
+      <param type="variable">mode_conteneur_actif1</param>
+      <target>mode_conteneur_actif3</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10check_valid_differ_removecheck/01-base.xml b/tests/dictionaries/10check_valid_differ_removecheck/01-base.xml
index 589d86f5..4dd70a09 100644
--- a/tests/dictionaries/10check_valid_differ_removecheck/01-base.xml
+++ b/tests/dictionaries/10check_valid_differ_removecheck/01-base.xml
@@ -1,23 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif3" redefine="True" remove_check="True">
-                <value>oui</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_differ">
-            <param type="variable">mode_conteneur_actif1</param>
-            <target>mode_conteneur_actif3</target>
-        </check>
-        <check name="valid_differ">
-            <param type="variable">mode_conteneur_actif2</param>
-            <target>mode_conteneur_actif3</target>
-        </check>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif3" redefine="True" remove_check="True">
+        <value>oui</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_differ">
+      <param type="variable">mode_conteneur_actif1</param>
+      <target>mode_conteneur_actif3</target>
+    </check>
+    <check name="valid_differ">
+      <param type="variable">mode_conteneur_actif2</param>
+      <target>mode_conteneur_actif3</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10check_valid_in_network/00-base.xml b/tests/dictionaries/10check_valid_in_network/00-base.xml
index 35bce26e..20877efa 100644
--- a/tests/dictionaries/10check_valid_in_network/00-base.xml
+++ b/tests/dictionaries/10check_valid_in_network/00-base.xml
@@ -1,23 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>oui</value>
-            </variable>
-            <variable name="adresse_ip_eth0" type="local_ip" description="Adresse IP de la carte" mandatory="True" mode="basic"/>
-            <variable name="adresse_netmask_eth0" type="netmask" description="Masque de sous réseau de la carte" mandatory="True" mode="basic"/>
-            <variable name="adresse_ip" type="local_ip" description="IP" mandatory="True" mode="basic"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_in_network" level="warning">
-            <param type="variable">adresse_ip_eth0</param>
-            <param type="variable">adresse_netmask_eth0</param>
-            <target>adresse_ip</target>
-        </check>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>oui</value>
+      </variable>
+      <variable name="adresse_ip_eth0" type="local_ip" description="Adresse IP de la carte" mandatory="True" mode="basic"/>
+      <variable name="adresse_netmask_eth0" type="netmask" description="Masque de sous réseau de la carte" mandatory="True" mode="basic"/>
+      <variable name="adresse_ip" type="local_ip" description="IP" mandatory="True" mode="basic"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_in_network" level="warning">
+      <param type="variable">adresse_ip_eth0</param>
+      <param type="variable">adresse_netmask_eth0</param>
+      <target>adresse_ip</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10check_valid_in_network_cidr/00-base.xml b/tests/dictionaries/10check_valid_in_network_cidr/00-base.xml
index 5e6e2fcc..e9d4d8da 100644
--- a/tests/dictionaries/10check_valid_in_network_cidr/00-base.xml
+++ b/tests/dictionaries/10check_valid_in_network_cidr/00-base.xml
@@ -1,21 +1,18 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>oui</value>
-            </variable>
-            <variable name="adresse_ip_eth0" type="cidr" description="Adresse IP de la carte" mandatory="True" mode="basic"/>
-            <variable name="adresse_ip" type="local_ip" description="IP" mandatory="True" mode="basic"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_in_network" level="warning">
-            <param type="variable">adresse_ip_eth0</param>
-            <target>adresse_ip</target>
-        </check>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>oui</value>
+      </variable>
+      <variable name="adresse_ip_eth0" type="cidr" description="Adresse IP de la carte" mandatory="True" mode="basic"/>
+      <variable name="adresse_ip" type="local_ip" description="IP" mandatory="True" mode="basic"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_in_network" level="warning">
+      <param type="variable">adresse_ip_eth0</param>
+      <target>adresse_ip</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10check_valid_ipnetmask/00-base.xml b/tests/dictionaries/10check_valid_ipnetmask/00-base.xml
index 0c0a913c..f6af8dac 100644
--- a/tests/dictionaries/10check_valid_ipnetmask/00-base.xml
+++ b/tests/dictionaries/10check_valid_ipnetmask/00-base.xml
@@ -1,21 +1,18 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>oui</value>
-            </variable>
-            <variable name="adresse_ip_eth0" type="local_ip" description="Adresse IP de la carte" mandatory="True" mode="basic"/>
-            <variable name="adresse_netmask_eth0" type="netmask" description="Masque de sous réseau de la carte" mandatory="True" mode="basic"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_ipnetmask" level="warning">
-            <param type="variable">adresse_ip_eth0</param>
-            <target>adresse_netmask_eth0</target>
-        </check>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>oui</value>
+      </variable>
+      <variable name="adresse_ip_eth0" type="local_ip" description="Adresse IP de la carte" mandatory="True" mode="basic"/>
+      <variable name="adresse_netmask_eth0" type="netmask" description="Masque de sous réseau de la carte" mandatory="True" mode="basic"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_ipnetmask" level="warning">
+      <param type="variable">adresse_ip_eth0</param>
+      <target>adresse_netmask_eth0</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10fill_information/00-base.xml b/tests/dictionaries/10fill_information/00-base.xml
index 1b46fd3b..50f64a02 100644
--- a/tests/dictionaries/10fill_information/00-base.xml
+++ b/tests/dictionaries/10fill_information/00-base.xml
@@ -1,17 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param type="information">test_information</param>
-            <target>mode_conteneur_actif</target>
-        </fill>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="information">test_information</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10frozenifin_unknown_valid_enum_number/00-base.xml b/tests/dictionaries/10frozenifin_unknown_valid_enum_number/00-base.xml
index 3ae689fd..94538cd4 100644
--- a/tests/dictionaries/10frozenifin_unknown_valid_enum_number/00-base.xml
+++ b/tests/dictionaries/10frozenifin_unknown_valid_enum_number/00-base.xml
@@ -1,30 +1,26 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general" mode="expert">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="enumfam" mode="expert">
-            <variable name="enumvar" type="number" description="enumvar" help="bla bla bla"/>
-            <variable name="test_variable" type="number" description="test variable"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_enum">
-            <param>1</param>
-            <param>2</param>
-            <param>3</param>
-            <target>enumvar</target>
-        </check>
-        <condition name="hidden_if_in" source="enumvar">
-            <param>4</param>
-            <target type="variable">test_variable</target>
-        </condition>
-    </constraints>
-
+<rougail version="0.10">
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="enumfam" mode="expert">
+      <variable name="enumvar" type="number" description="enumvar" help="bla bla bla"/>
+      <variable name="test_variable" type="number" description="test variable"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>1</param>
+      <param>2</param>
+      <param>3</param>
+      <target>enumvar</target>
+    </check>
+    <condition name="hidden_if_in" source="enumvar">
+      <param>4</param>
+      <target type="variable">test_variable</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10leadership_append/00-base.xml b/tests/dictionaries/10leadership_append/00-base.xml
index a1c29b99..a3614dc1 100644
--- a/tests/dictionaries/10leadership_append/00-base.xml
+++ b/tests/dictionaries/10leadership_append/00-base.xml
@@ -1,30 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="general1">
-            <variable name="leader" type="string" description="leader" multi="True"/>
-            <variable name="follower1" type="string" description="follower1"/>
-            <variable name="follower2" type="string" description="follower2"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param name="valeur">valfill</param>
-	    <target>follower1</target>
-        </fill>
-        <fill name="calc_val">
-            <param type="variable">follower1</param>
-	    <target>follower2</target>
-        </fill>
-        <group leader="leader">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="general1">
+      <family name="leader" description="leader" leadership="True">
+        <variable name="leader" type="string" description="leader" multi="True"/>
+        <variable name="follower1" type="string" description="follower1"/>
+        <variable name="follower2" type="string" description="follower2"/>
+      </family>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valfill</param>
+      <target>follower1</target>
+    </fill>
+    <fill name="calc_val">
+      <param type="variable">follower1</param>
+      <target>follower2</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/10leadership_append/01-base.xml b/tests/dictionaries/10leadership_append/01-base.xml
index 84510a9a..6e37905b 100644
--- a/tests/dictionaries/10leadership_append/01-base.xml
+++ b/tests/dictionaries/10leadership_append/01-base.xml
@@ -1,14 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general1">
-            <variable name="follower3" type="string" description="follower3"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <group leader="leader">
-            <follower>follower3</follower>
-        </group>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general1">
+      <family name="leader" leadership="True">
+        <variable name="follower3" type="string" description="follower3"/>
+      </family>
+    </family>
+  </variables>
+  <constraints/>
 </rougail>
diff --git a/tests/dictionaries/10leadership_append_hidden/00-base.xml b/tests/dictionaries/10leadership_append_hidden/00-base.xml
index ad4f4862..98e8723f 100644
--- a/tests/dictionaries/10leadership_append_hidden/00-base.xml
+++ b/tests/dictionaries/10leadership_append_hidden/00-base.xml
@@ -1,30 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="general1">
-            <variable name="leader" type="string" description="leader" multi="True" hidden="True"/>
-            <variable name="follower1" type="string" description="follower1"/>
-            <variable name="follower2" type="string" description="follower2"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param name="valeur">valfill</param>
-	    <target>follower1</target>
-        </fill>
-        <fill name="calc_val">
-            <param type="variable">follower1</param>
-	    <target>follower2</target>
-        </fill>
-        <group leader="leader">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="general1">
+      <family name="leader" description="leader" leadership="True">
+        <variable name="leader" type="string" description="leader" multi="True" hidden="True"/>
+        <variable name="follower1" type="string" description="follower1"/>
+        <variable name="follower2" type="string" description="follower2"/>
+      </family>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valfill</param>
+      <target>follower1</target>
+    </fill>
+    <fill name="calc_val">
+      <param type="variable">follower1</param>
+      <target>follower2</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/10leadership_append_hidden/01-base.xml b/tests/dictionaries/10leadership_append_hidden/01-base.xml
index 84510a9a..6e37905b 100644
--- a/tests/dictionaries/10leadership_append_hidden/01-base.xml
+++ b/tests/dictionaries/10leadership_append_hidden/01-base.xml
@@ -1,14 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general1">
-            <variable name="follower3" type="string" description="follower3"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <group leader="leader">
-            <follower>follower3</follower>
-        </group>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general1">
+      <family name="leader" leadership="True">
+        <variable name="follower3" type="string" description="follower3"/>
+      </family>
+    </family>
+  </variables>
+  <constraints/>
 </rougail>
diff --git a/tests/dictionaries/10leadership_append_name/00-base.xml b/tests/dictionaries/10leadership_append_name/00-base.xml
index 94969b2d..303514f5 100644
--- a/tests/dictionaries/10leadership_append_name/00-base.xml
+++ b/tests/dictionaries/10leadership_append_name/00-base.xml
@@ -1,30 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="general1">
-            <variable name="leader" type="string" description="leader" multi="True"/>
-            <variable name="follower1" type="string" description="follower1"/>
-            <variable name="follower2" type="string" description="follower2"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param name="valeur">valfill</param>
-	    <target>follower1</target>
-        </fill>
-        <fill name="calc_val">
-            <param type="variable">follower1</param>
-	    <target>follower2</target>
-        </fill>
-        <group leader="leader" name="leadership">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="general1">
+      <family name="leadership" description="leadership" leadership="True">
+        <variable name="leader" type="string" description="leader" multi="True"/>
+        <variable name="follower1" type="string" description="follower1"/>
+        <variable name="follower2" type="string" description="follower2"/>
+      </family>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valfill</param>
+      <target>follower1</target>
+    </fill>
+    <fill name="calc_val">
+      <param type="variable">follower1</param>
+      <target>follower2</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/10leadership_append_name/01-base.xml b/tests/dictionaries/10leadership_append_name/01-base.xml
index 84510a9a..25153beb 100644
--- a/tests/dictionaries/10leadership_append_name/01-base.xml
+++ b/tests/dictionaries/10leadership_append_name/01-base.xml
@@ -1,14 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general1">
-            <variable name="follower3" type="string" description="follower3"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <group leader="leader">
-            <follower>follower3</follower>
-        </group>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general1">
+      <family name="leadership" leadership="True">
+        <variable name="follower3" type="string" description="follower3"/>
+      </family>
+    </family>
+  </variables>
+  <constraints/>
 </rougail>
diff --git a/tests/dictionaries/10leadership_auto/00-base.xml b/tests/dictionaries/10leadership_auto/00-base.xml
index cf529b26..ac6be61a 100644
--- a/tests/dictionaries/10leadership_auto/00-base.xml
+++ b/tests/dictionaries/10leadership_auto/00-base.xml
@@ -1,34 +1,30 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="leader" type="string" description="leader" multi="True"/>
-            <variable name="follower1" type="string" description="follower1" hidden="True"/>
-            <variable name="follower2" type="string" description="follower2" hidden="True"/>
-            <variable name="follower3" type="string" description="follower3" hidden="True"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param name="valeur">valfill</param>
-	    <target>follower1</target>
-        </fill>
-        <fill name="calc_val">
-            <param type="variable">follower1</param>
-	    <target>follower2</target>
-        </fill>
-        <fill name="calc_val">
-            <param type="variable">leader</param>
-	    <target>follower3</target>
-        </fill>
-        <group leader="leader">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-            <follower>follower3</follower>
-        </group>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <family name="leader" description="leader" leadership="True">
+        <variable name="leader" type="string" description="leader" multi="True"/>
+        <variable name="follower1" type="string" description="follower1" hidden="True"/>
+        <variable name="follower2" type="string" description="follower2" hidden="True"/>
+        <variable name="follower3" type="string" description="follower3" hidden="True"/>
+      </family>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valfill</param>
+      <target>follower1</target>
+    </fill>
+    <fill name="calc_val">
+      <param type="variable">follower1</param>
+      <target>follower2</target>
+    </fill>
+    <fill name="calc_val">
+      <param type="variable">leader</param>
+      <target>follower3</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/10leadership_auto_index/00-base.xml b/tests/dictionaries/10leadership_auto_index/00-base.xml
index ef54c49b..626ba083 100644
--- a/tests/dictionaries/10leadership_auto_index/00-base.xml
+++ b/tests/dictionaries/10leadership_auto_index/00-base.xml
@@ -1,21 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <variable name="leader" multi="True">
-            <value>a</value>
-            <value>b</value>
-            <value>c</value>
-        </variable>
-        <variable name="follower1" type="number"/>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param type="index"/>
-            <target>follower1</target>
-        </fill>
-        <group leader="leader">
-            <follower>follower1</follower>
-        </group>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="leader" description="leader" leadership="True">
+      <variable name="leader" multi="True">
+        <value>a</value>
+        <value>b</value>
+        <value>c</value>
+      </variable>
+      <variable name="follower1" type="number"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="index"/>
+      <target>follower1</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/10leadership_autoleader/00-base.xml b/tests/dictionaries/10leadership_autoleader/00-base.xml
index c7d93e40..0ac9cab9 100644
--- a/tests/dictionaries/10leadership_autoleader/00-base.xml
+++ b/tests/dictionaries/10leadership_autoleader/00-base.xml
@@ -1,28 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="leader" type="string" description="leader" multi="True"/>
-            <variable name="follower1" type="string" description="follower1" hidden="True"/>
-            <variable name="follower2" type="string" description="follower2" hidden="True"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param name="valeur">valfill</param>
-	    <target>follower1</target>
-        </fill>
-        <fill name="calc_val">
-            <param type="variable">leader</param>
-	    <target>follower2</target>
-        </fill>
-        <group leader="leader">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <family name="leader" description="leader" leadership="True">
+        <variable name="leader" type="string" description="leader" multi="True"/>
+        <variable name="follower1" type="string" description="follower1" hidden="True"/>
+        <variable name="follower2" type="string" description="follower2" hidden="True"/>
+      </family>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valfill</param>
+      <target>follower1</target>
+    </fill>
+    <fill name="calc_val">
+      <param type="variable">leader</param>
+      <target>follower2</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/10leadership_autoleader_expert/00-base.xml b/tests/dictionaries/10leadership_autoleader_expert/00-base.xml
index 9492e422..bcc07462 100644
--- a/tests/dictionaries/10leadership_autoleader_expert/00-base.xml
+++ b/tests/dictionaries/10leadership_autoleader_expert/00-base.xml
@@ -1,26 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general" mode="expert">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="leadermode">
-            <variable name="leader" type="string" description="leader" multi="True" mode="expert"/>
-            <variable name="follower1" type="string" description="follower1"/>
-            <variable name="follower2" type="string" description="follower2"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_list">
-            <param name="valeur">valfill</param>
-	    <target>leader</target>
-        </fill>
-        <group leader="leader">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="leadermode">
+      <family name="leader" description="leader" leadership="True">
+        <variable name="leader" type="string" description="leader" multi="True" mode="expert"/>
+        <variable name="follower1" type="string" description="follower1"/>
+        <variable name="follower2" type="string" description="follower2"/>
+      </family>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_list">
+      <param name="valeur">valfill</param>
+      <target>leader</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/10leadership_autosaveexpert/00-base.xml b/tests/dictionaries/10leadership_autosaveexpert/00-base.xml
index aed0bc94..1a117104 100644
--- a/tests/dictionaries/10leadership_autosaveexpert/00-base.xml
+++ b/tests/dictionaries/10leadership_autosaveexpert/00-base.xml
@@ -1,28 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="leader" type="string" description="leader" multi="True"/>
-            <variable name="follower1" type="string" description="follower1"/>
-            <variable name="follower2" type="string" description="follower2" mode="expert"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param name="valeur">valfill</param>
-	    <target>follower1</target>
-        </fill>
-        <fill name="calc_val">
-            <param type="variable">follower1</param>
-	    <target>follower2</target>
-        </fill>
-        <group leader="leader">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <family name="leader" description="leader" leadership="True">
+        <variable name="leader" type="string" description="leader" multi="True"/>
+        <variable name="follower1" type="string" description="follower1"/>
+        <variable name="follower2" type="string" description="follower2" mode="expert"/>
+      </family>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valfill</param>
+      <target>follower1</target>
+    </fill>
+    <fill name="calc_val">
+      <param type="variable">follower1</param>
+      <target>follower2</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/10leadership_leader_hidden/00-base.xml b/tests/dictionaries/10leadership_leader_hidden/00-base.xml
index 2833833f..5eb2d5a5 100644
--- a/tests/dictionaries/10leadership_leader_hidden/00-base.xml
+++ b/tests/dictionaries/10leadership_leader_hidden/00-base.xml
@@ -1,26 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general" mode="expert">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="leadermode">
-            <variable name="leader" type="string" description="leader" multi="True" hidden="True"/>
-            <variable name="follower1" type="string" description="follower1"/>
-            <variable name="follower2" type="string" description="follower2"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_list">
-            <param name="valeur">valfill</param>
-	    <target>leader</target>
-        </fill>
-        <group leader="leader">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="leadermode">
+      <family name="leader" description="leader" leadership="True">
+        <variable name="leader" type="string" description="leader" multi="True" hidden="True"/>
+        <variable name="follower1" type="string" description="follower1"/>
+        <variable name="follower2" type="string" description="follower2"/>
+      </family>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_list">
+      <param name="valeur">valfill</param>
+      <target>leader</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/10leadership_leader_hidden_if_in/00-base.xml b/tests/dictionaries/10leadership_leader_hidden_if_in/00-base.xml
index 1e1913b8..41266b1e 100644
--- a/tests/dictionaries/10leadership_leader_hidden_if_in/00-base.xml
+++ b/tests/dictionaries/10leadership_leader_hidden_if_in/00-base.xml
@@ -1,26 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general" mode="expert">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="leadermode">
-            <variable name="leader" type="string" description="leader" multi="True"/>
-            <variable name="follower1" type="string" description="follower1"/>
-            <variable name="follower2" type="string" description="follower2"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <group leader="leader">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-        <condition name="hidden_if_in" source="mode_conteneur_actif">
-            <param>non</param>
-            <target type="variable">leader</target>
-        </condition>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="leadermode">
+      <family name="leader" description="leader" leadership="True">
+        <variable name="leader" type="string" description="leader" multi="True"/>
+        <variable name="follower1" type="string" description="follower1"/>
+        <variable name="follower2" type="string" description="follower2"/>
+      </family>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="hidden_if_in" source="mode_conteneur_actif">
+      <param>non</param>
+      <target type="variable">leader</target>
+    </condition>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/10leadership_leader_hidden_if_in_name/00-base.xml b/tests/dictionaries/10leadership_leader_hidden_if_in_name/00-base.xml
index e969f76f..f977493e 100644
--- a/tests/dictionaries/10leadership_leader_hidden_if_in_name/00-base.xml
+++ b/tests/dictionaries/10leadership_leader_hidden_if_in_name/00-base.xml
@@ -1,26 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general" mode="expert">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="leadermode">
-            <variable name="leader" type="string" description="leader" multi="True"/>
-            <variable name="follower1" type="string" description="follower1"/>
-            <variable name="follower2" type="string" description="follower2"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <group leader="leader" name="other">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-        <condition name="hidden_if_in" source="mode_conteneur_actif">
-            <param>non</param>
-            <target type="variable">leader</target>
-        </condition>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="leadermode">
+      <family name="other" description="other" leadership="True">
+        <variable name="leader" type="string" description="leader" multi="True"/>
+        <variable name="follower1" type="string" description="follower1"/>
+        <variable name="follower2" type="string" description="follower2"/>
+      </family>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="hidden_if_in" source="mode_conteneur_actif">
+      <param>non</param>
+      <target type="variable">leader</target>
+    </condition>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/10leadership_leadermandatory/00-base.xml b/tests/dictionaries/10leadership_leadermandatory/00-base.xml
index 6cca43c9..d086a7be 100644
--- a/tests/dictionaries/10leadership_leadermandatory/00-base.xml
+++ b/tests/dictionaries/10leadership_leadermandatory/00-base.xml
@@ -1,28 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="leader" type="string" description="leader" multi="True" mandatory="True"/>
-            <variable name="follower1" type="string" description="follower1"/>
-            <variable name="follower2" type="string" description="follower2"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param name="valeur">valfill</param>
-	    <target>follower1</target>
-        </fill>
-	<fill name="calc_val">
-            <param type="variable">follower1</param>
-	    <target>follower2</target>
-        </fill>
-        <group leader="leader">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <family name="leader" description="leader" leadership="True">
+        <variable name="leader" type="string" description="leader" multi="True" mandatory="True"/>
+        <variable name="follower1" type="string" description="follower1"/>
+        <variable name="follower2" type="string" description="follower2"/>
+      </family>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valfill</param>
+      <target>follower1</target>
+    </fill>
+    <fill name="calc_val">
+      <param type="variable">follower1</param>
+      <target>follower2</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/10leadership_mandatory/00-base.xml b/tests/dictionaries/10leadership_mandatory/00-base.xml
index b6c3b8ef..c4f40801 100644
--- a/tests/dictionaries/10leadership_mandatory/00-base.xml
+++ b/tests/dictionaries/10leadership_mandatory/00-base.xml
@@ -1,28 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="leader" type="string" description="leader" multi="True"/>
-            <variable name="follower1" type="string" description="follower1" mandatory="True"/>
-            <variable name="follower2" type="string" description="follower2"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param name="valeur">valfill</param>
-	    <target>follower1</target>
-        </fill>
-	<fill name="calc_val">
-            <param type="variable">follower1</param>
-	    <target>follower2</target>
-        </fill>
-        <group leader="leader">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <family name="leader" description="leader" leadership="True">
+        <variable name="leader" type="string" description="leader" multi="True"/>
+        <variable name="follower1" type="string" description="follower1" mandatory="True"/>
+        <variable name="follower2" type="string" description="follower2"/>
+      </family>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valfill</param>
+      <target>follower1</target>
+    </fill>
+    <fill name="calc_val">
+      <param type="variable">follower1</param>
+      <target>follower2</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/10leadership_mandatoryfollower/00-base.xml b/tests/dictionaries/10leadership_mandatoryfollower/00-base.xml
index 8af3a1bc..94c8c119 100644
--- a/tests/dictionaries/10leadership_mandatoryfollower/00-base.xml
+++ b/tests/dictionaries/10leadership_mandatoryfollower/00-base.xml
@@ -1,20 +1,15 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general" description="général">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>oui</value>
-            </variable>
-			<variable name="nut_monitor_netmask" type="netmask" description="Masque de l'IP du réseau de l'esclave" multi="True"/>
-            <variable name="nut_monitor_host" type="network" description="Adresse IP du réseau de l'esclave" mandatory="True"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <group leader="nut_monitor_netmask">
-            <follower>nut_monitor_host</follower>
-        </group>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>oui</value>
+      </variable>
+      <family name="nut_monitor_netmask" description="Masque de l'IP du réseau de l'esclave" leadership="True">
+        <variable name="nut_monitor_netmask" type="netmask" description="Masque de l'IP du réseau de l'esclave" multi="True"/>
+        <variable name="nut_monitor_host" type="network" description="Adresse IP du réseau de l'esclave" mandatory="True"/>
+      </family>
+    </family>
+  </variables>
+  <constraints/>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10leadership_multi/00-base.xml b/tests/dictionaries/10leadership_multi/00-base.xml
index b24f297c..3ec72723 100644
--- a/tests/dictionaries/10leadership_multi/00-base.xml
+++ b/tests/dictionaries/10leadership_multi/00-base.xml
@@ -1,37 +1,32 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="general1">
-            <variable name="leader" type="string" description="leader" multi="True"/>
-            <variable name="follower1" type="string" description="follower1"/>
-            <variable name="follower2" type="string" description="follower2"/>
-            <variable name="leader1" type="string" description="leader" multi="True"/>
-            <variable name="follower11" type="string" description="follower1"/>
-            <variable name="follower21" type="string" description="follower2"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param name="valeur">valfill</param>
-	    <target>follower1</target>
-        </fill>
-        <fill name="calc_val">
-            <param type="variable">follower1</param>
-	    <target>follower2</target>
-        </fill>
-        <group leader="leader">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-        <group leader="leader1">
-            <follower>follower11</follower>
-            <follower>follower21</follower>
-        </group>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="general1">
+      <family name="leader" description="leader" leadership="True">
+        <variable name="leader" type="string" description="leader" multi="True"/>
+        <variable name="follower1" type="string" description="follower1"/>
+        <variable name="follower2" type="string" description="follower2"/>
+      </family>
+      <family name="leader1" description="leader" leadership="True">
+        <variable name="leader1" type="string" description="leader" multi="True"/>
+        <variable name="follower11" type="string" description="follower1"/>
+        <variable name="follower21" type="string" description="follower2"/>
+      </family>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valfill</param>
+      <target>follower1</target>
+    </fill>
+    <fill name="calc_val">
+      <param type="variable">follower1</param>
+      <target>follower2</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/10load_disabled_if_in/00-base.xml b/tests/dictionaries/10load_disabled_if_in/00-base.xml
index 08ed72c2..82a7a1c5 100644
--- a/tests/dictionaries/10load_disabled_if_in/00-base.xml
+++ b/tests/dictionaries/10load_disabled_if_in/00-base.xml
@@ -1,26 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="condition" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_in" source="condition">
-            <param>oui</param>
-            <target type="variable">mode_conteneur_actif</target>
-            <target type="variable">mode_conteneur_actif2</target>
-        </condition>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10load_disabled_if_in_fill/00-base.xml b/tests/dictionaries/10load_disabled_if_in_fill/00-base.xml
index 306d2409..36309a43 100644
--- a/tests/dictionaries/10load_disabled_if_in_fill/00-base.xml
+++ b/tests/dictionaries/10load_disabled_if_in_fill/00-base.xml
@@ -1,25 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="condition" type="string">
-                <value>no</value>
-            </variable>
-            <variable name="variable1" type="string"/>
-            <variable name="variable2" type="string"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_in" source="condition">
-            <param>no</param>
-            <target type="variable">variable1</target>
-        </condition>
-        <fill name="calc_val">
-            <param type="variable" propertyerror="False">variable1</param>
-            <target>variable2</target>
-        </fill>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string">
+        <value>no</value>
+      </variable>
+      <variable name="variable1" type="string"/>
+      <variable name="variable2" type="string"/>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>no</param>
+      <target type="variable">variable1</target>
+    </condition>
+    <fill name="calc_val">
+      <param type="variable" propertyerror="False">variable1</param>
+      <target>variable2</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10load_disabled_if_in_list_optional/00-base.xml b/tests/dictionaries/10load_disabled_if_in_list_optional/00-base.xml
index d1201d36..706dac54 100644
--- a/tests/dictionaries/10load_disabled_if_in_list_optional/00-base.xml
+++ b/tests/dictionaries/10load_disabled_if_in_list_optional/00-base.xml
@@ -1,15 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <variable name="condition" type="boolean"/>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_in" source="condition">
-            <param>True</param>
-            <target type="filelist" optional="True">unknown</target>
-        </condition>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <variable name="condition" type="boolean"/>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>True</param>
+      <target type="filelist" optional="True">unknown</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param/00-base.xml b/tests/dictionaries/10load_disabled_if_in_multi_param/00-base.xml
index 6ed6397a..114b6977 100644
--- a/tests/dictionaries/10load_disabled_if_in_multi_param/00-base.xml
+++ b/tests/dictionaries/10load_disabled_if_in_multi_param/00-base.xml
@@ -1,33 +1,30 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <services>
-        <service name="test">
-            <file filelist="afilllist">/tmp/file1</file>
-        </service>
-    </services>
-    <variables>
-        <family name="general">
-            <variable name="condition" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_in" source="condition">
-            <param>oui</param>
-            <param>maybe</param>
-            <target type="variable">mode_conteneur_actif</target>
-            <target type="variable">mode_conteneur_actif2</target>
-            <target type="filelist">afilllist</target>
-        </condition>
-    </constraints>
+<rougail version="0.10">
+  <services>
+    <service name="test">
+      <file filelist="afilllist">/tmp/file1</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>oui</param>
+      <param>maybe</param>
+      <target type="variable">mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+      <target type="filelist">afilllist</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param2/00-base.xml b/tests/dictionaries/10load_disabled_if_in_multi_param2/00-base.xml
index a395156f..802fd8f1 100644
--- a/tests/dictionaries/10load_disabled_if_in_multi_param2/00-base.xml
+++ b/tests/dictionaries/10load_disabled_if_in_multi_param2/00-base.xml
@@ -1,38 +1,35 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <services>
-        <service name="test">
-            <file filelist="afilllist">/tmp/file1</file>
-        </service>
-    </services>
-    <variables>
-        <family name="general">
-            <variable name="condition" type="string" description="No change">
-                <value>no</value>
-            </variable>
-            <variable name="condition2" type="string" description="No change">
-                <value>no</value>
-            </variable>
-            <variable name="test_variable" type="string" description="No change" hidden="True">
-                <value>no</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_in" source="condition">
-            <param>yes</param>
-            <param>maybe</param>
-            <target type="variable">test_variable</target>
-            <target type="filelist">afilllist</target>
-        </condition>
-        <condition name="disabled_if_in" source="condition2">
-            <param>yes</param>
-            <param>maybe</param>
-            <target type="variable">test_variable</target>
-            <target type="filelist">afilllist</target>
-        </condition>
-    </constraints>
+<rougail version="0.10">
+  <services>
+    <service name="test">
+      <file filelist="afilllist">/tmp/file1</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>no</value>
+      </variable>
+      <variable name="condition2" type="string" description="No change">
+        <value>no</value>
+      </variable>
+      <variable name="test_variable" type="string" description="No change" hidden="True">
+        <value>no</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>yes</param>
+      <param>maybe</param>
+      <target type="variable">test_variable</target>
+      <target type="filelist">afilllist</target>
+    </condition>
+    <condition name="disabled_if_in" source="condition2">
+      <param>yes</param>
+      <param>maybe</param>
+      <target type="variable">test_variable</target>
+      <target type="filelist">afilllist</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param3/00-base.xml b/tests/dictionaries/10load_disabled_if_in_multi_param3/00-base.xml
index ae7b9888..5bf93c03 100644
--- a/tests/dictionaries/10load_disabled_if_in_multi_param3/00-base.xml
+++ b/tests/dictionaries/10load_disabled_if_in_multi_param3/00-base.xml
@@ -1,38 +1,35 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <services>
-        <service name="test">
-            <file filelist="afilllist">/tmp/file1</file>
-        </service>
-    </services>
-    <variables>
-        <family name="general">
-            <variable name="condition" type="string" description="No change">
-                <value>no</value>
-            </variable>
-            <variable name="condition2" type="string" description="No change">
-                <value>no</value>
-            </variable>
-            <variable name="test_variable" type="string" description="No change" hidden="True">
-                <value>no</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_not_in" source="condition">
-            <param>yes</param>
-            <param>maybe</param>
-            <target type="variable">test_variable</target>
-            <target type="filelist">afilllist</target>
-        </condition>
-        <condition name="disabled_if_in" source="condition2">
-            <param>yes</param>
-            <param>maybe</param>
-            <target type="variable">test_variable</target>
-            <target type="filelist">afilllist</target>
-        </condition>
-    </constraints>
+<rougail version="0.10">
+  <services>
+    <service name="test">
+      <file filelist="afilllist">/tmp/file1</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>no</value>
+      </variable>
+      <variable name="condition2" type="string" description="No change">
+        <value>no</value>
+      </variable>
+      <variable name="test_variable" type="string" description="No change" hidden="True">
+        <value>no</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_not_in" source="condition">
+      <param>yes</param>
+      <param>maybe</param>
+      <target type="variable">test_variable</target>
+      <target type="filelist">afilllist</target>
+    </condition>
+    <condition name="disabled_if_in" source="condition2">
+      <param>yes</param>
+      <param>maybe</param>
+      <target type="variable">test_variable</target>
+      <target type="filelist">afilllist</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param4/00-base.xml b/tests/dictionaries/10load_disabled_if_in_multi_param4/00-base.xml
index 13d996be..e0bc5597 100644
--- a/tests/dictionaries/10load_disabled_if_in_multi_param4/00-base.xml
+++ b/tests/dictionaries/10load_disabled_if_in_multi_param4/00-base.xml
@@ -1,38 +1,35 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <services>
-        <service name="test">
-            <file filelist="afilllist">/tmp/file1</file>
-        </service>
-    </services>
-    <variables>
-        <family name="general">
-            <variable name="condition" type="string" description="No change">
-                <value>yes</value>
-            </variable>
-            <variable name="condition2" type="string" description="No change">
-                <value>no</value>
-            </variable>
-            <variable name="test_variable" type="string" description="No change" hidden="True">
-                <value>no</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_not_in" source="condition">
-            <param>yes</param>
-            <param>maybe</param>
-            <target type="variable">test_variable</target>
-            <target type="filelist">afilllist</target>
-        </condition>
-        <condition name="disabled_if_in" source="condition2">
-            <param>yes</param>
-            <param>maybe</param>
-            <target type="variable">test_variable</target>
-            <target type="filelist">afilllist</target>
-        </condition>
-    </constraints>
+<rougail version="0.10">
+  <services>
+    <service name="test">
+      <file filelist="afilllist">/tmp/file1</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>yes</value>
+      </variable>
+      <variable name="condition2" type="string" description="No change">
+        <value>no</value>
+      </variable>
+      <variable name="test_variable" type="string" description="No change" hidden="True">
+        <value>no</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_not_in" source="condition">
+      <param>yes</param>
+      <param>maybe</param>
+      <target type="variable">test_variable</target>
+      <target type="filelist">afilllist</target>
+    </condition>
+    <condition name="disabled_if_in" source="condition2">
+      <param>yes</param>
+      <param>maybe</param>
+      <target type="variable">test_variable</target>
+      <target type="filelist">afilllist</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param5/00-base.xml b/tests/dictionaries/10load_disabled_if_in_multi_param5/00-base.xml
index e84d34d9..5d12e44a 100644
--- a/tests/dictionaries/10load_disabled_if_in_multi_param5/00-base.xml
+++ b/tests/dictionaries/10load_disabled_if_in_multi_param5/00-base.xml
@@ -1,38 +1,35 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <services>
-        <service name="test">
-            <file filelist="afilllist">/tmp/file1</file>
-        </service>
-    </services>
-    <variables>
-        <family name="general">
-            <variable name="condition" type="string" description="No change">
-                <value>yes</value>
-            </variable>
-            <variable name="condition2" type="string" description="No change">
-                <value>yes</value>
-            </variable>
-            <variable name="test_variable" type="string" description="No change" hidden="True">
-                <value>no</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_not_in" source="condition">
-            <param>yes</param>
-            <param>maybe</param>
-            <target type="variable">test_variable</target>
-            <target type="filelist">afilllist</target>
-        </condition>
-        <condition name="disabled_if_in" source="condition2">
-            <param>yes</param>
-            <param>maybe</param>
-            <target type="variable">test_variable</target>
-            <target type="filelist">afilllist</target>
-        </condition>
-    </constraints>
+<rougail version="0.10">
+  <services>
+    <service name="test">
+      <file filelist="afilllist">/tmp/file1</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>yes</value>
+      </variable>
+      <variable name="condition2" type="string" description="No change">
+        <value>yes</value>
+      </variable>
+      <variable name="test_variable" type="string" description="No change" hidden="True">
+        <value>no</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_not_in" source="condition">
+      <param>yes</param>
+      <param>maybe</param>
+      <target type="variable">test_variable</target>
+      <target type="filelist">afilllist</target>
+    </condition>
+    <condition name="disabled_if_in" source="condition2">
+      <param>yes</param>
+      <param>maybe</param>
+      <target type="variable">test_variable</target>
+      <target type="filelist">afilllist</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param6/00-base.xml b/tests/dictionaries/10load_disabled_if_in_multi_param6/00-base.xml
index ccd8dc9d..0898e5df 100644
--- a/tests/dictionaries/10load_disabled_if_in_multi_param6/00-base.xml
+++ b/tests/dictionaries/10load_disabled_if_in_multi_param6/00-base.xml
@@ -1,38 +1,35 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <services>
-        <service name="test">
-            <file filelist="afilllist">/tmp/file1</file>
-        </service>
-    </services>
-    <variables>
-        <family name="general">
-            <variable name="condition" type="string" description="No change">
-                <value>no</value>
-            </variable>
-            <variable name="condition2" type="string" description="No change">
-                <value>yes</value>
-            </variable>
-            <variable name="test_variable" type="string" description="No change" hidden="True">
-                <value>no</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_not_in" source="condition">
-            <param>yes</param>
-            <param>maybe</param>
-            <target type="variable">test_variable</target>
-            <target type="filelist">afilllist</target>
-        </condition>
-        <condition name="disabled_if_in" source="condition2">
-            <param>yes</param>
-            <param>maybe</param>
-            <target type="variable">test_variable</target>
-            <target type="filelist">afilllist</target>
-        </condition>
-    </constraints>
+<rougail version="0.10">
+  <services>
+    <service name="test">
+      <file filelist="afilllist">/tmp/file1</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>no</value>
+      </variable>
+      <variable name="condition2" type="string" description="No change">
+        <value>yes</value>
+      </variable>
+      <variable name="test_variable" type="string" description="No change" hidden="True">
+        <value>no</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_not_in" source="condition">
+      <param>yes</param>
+      <param>maybe</param>
+      <target type="variable">test_variable</target>
+      <target type="filelist">afilllist</target>
+    </condition>
+    <condition name="disabled_if_in" source="condition2">
+      <param>yes</param>
+      <param>maybe</param>
+      <target type="variable">test_variable</target>
+      <target type="filelist">afilllist</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param_disabled/00-base.xml b/tests/dictionaries/10load_disabled_if_in_multi_param_disabled/00-base.xml
index 66ba77d2..77829939 100644
--- a/tests/dictionaries/10load_disabled_if_in_multi_param_disabled/00-base.xml
+++ b/tests/dictionaries/10load_disabled_if_in_multi_param_disabled/00-base.xml
@@ -1,33 +1,30 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <services>
-        <service name="test">
-            <file filelist="afilllist">/tmp/file1</file>
-        </service>
-    </services>
-    <variables>
-        <family name="general">
-            <variable name="condition" type="string" description="No change">
-                <value>oui</value>
-            </variable>
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_in" source="condition">
-            <param>oui</param>
-            <param>maybe</param>
-            <target type="variable">mode_conteneur_actif</target>
-            <target type="variable">mode_conteneur_actif2</target>
-            <target type="filelist">afilllist</target>
-        </condition>
-    </constraints>
+<rougail version="0.10">
+  <services>
+    <service name="test">
+      <file filelist="afilllist">/tmp/file1</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>oui</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>oui</param>
+      <param>maybe</param>
+      <target type="variable">mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+      <target type="filelist">afilllist</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10load_disabled_if_in_none/00-base.xml b/tests/dictionaries/10load_disabled_if_in_none/00-base.xml
index f173c854..68f058cd 100644
--- a/tests/dictionaries/10load_disabled_if_in_none/00-base.xml
+++ b/tests/dictionaries/10load_disabled_if_in_none/00-base.xml
@@ -1,26 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="condition" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_in" source="condition">
-            <param type="nil"/>
-            <target type="variable">mode_conteneur_actif</target>
-            <target type="variable">mode_conteneur_actif2</target>
-        </condition>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param type="nil"/>
+      <target type="variable">mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10load_disabled_if_in_twice/00-base.xml b/tests/dictionaries/10load_disabled_if_in_twice/00-base.xml
index 1eb5e706..56d38602 100644
--- a/tests/dictionaries/10load_disabled_if_in_twice/00-base.xml
+++ b/tests/dictionaries/10load_disabled_if_in_twice/00-base.xml
@@ -1,27 +1,24 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <variable name="my_var1">
-            <value>no</value>
-        </variable>
-        <variable name="my_var2">
-            <value>no</value>
-        </variable>
-        <variable name="my_var3">
-            <value>no</value>
-        </variable>
-    </variables>
-
-    <constraints>
-      <condition name="disabled_if_in" source="my_var1">
-          <param>no</param>
-          <target type="variable">my_var2</target>
-      </condition>
-      <condition name="disabled_if_in" source="my_var2">
-          <param>no</param>
-          <target type="variable">my_var3</target>
-      </condition>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <variable name="my_var1">
+      <value>no</value>
+    </variable>
+    <variable name="my_var2">
+      <value>no</value>
+    </variable>
+    <variable name="my_var3">
+      <value>no</value>
+    </variable>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="my_var1">
+      <param>no</param>
+      <target type="variable">my_var2</target>
+    </condition>
+    <condition name="disabled_if_in" source="my_var2">
+      <param>no</param>
+      <target type="variable">my_var3</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10load_disabled_if_in_variable/00-base.xml b/tests/dictionaries/10load_disabled_if_in_variable/00-base.xml
index 91654996..b08cdd2f 100644
--- a/tests/dictionaries/10load_disabled_if_in_variable/00-base.xml
+++ b/tests/dictionaries/10load_disabled_if_in_variable/00-base.xml
@@ -1,34 +1,28 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.9">
-
-    <variables>
-        <family name='general'>
-            <variable name='condition' type='string' description="No change">
-                <value>tous</value>
-            </variable>
-            <variable name='mode_conteneur_actif' type='string' description="No change">
-                <value>tous</value>
-            </variable>
-            <variable name='mode_conteneur_actif2' type='string' description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_enum">
-            <param>tous</param>
-            <param>authentifié</param>
-            <param>aucun</param>
-            <target>condition</target>
-        </check>
-        <condition name='disabled_if_in' source='condition'>
-            <param type="variable">mode_conteneur_actif</param>
-            <target type='variable'>mode_conteneur_actif2</target>
-        </condition>
-    </constraints>
-
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>tous</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>tous</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>tous</param>
+      <param>authentifié</param>
+      <param>aucun</param>
+      <target>condition</target>
+    </check>
+    <condition name="disabled_if_in" source="condition">
+      <param type="variable">mode_conteneur_actif</param>
+      <target type="variable">mode_conteneur_actif2</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10load_disabled_if_in_variable2/00-base.xml b/tests/dictionaries/10load_disabled_if_in_variable2/00-base.xml
index 6c6468ab..c8aa9b88 100644
--- a/tests/dictionaries/10load_disabled_if_in_variable2/00-base.xml
+++ b/tests/dictionaries/10load_disabled_if_in_variable2/00-base.xml
@@ -1,34 +1,28 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.9">
-
-    <variables>
-        <family name='general'>
-            <variable name='condition' type='string' description="No change">
-                <value>tous</value>
-            </variable>
-            <variable name='mode_conteneur_actif' type='string' description="No change">
-                <value>aucun</value>
-            </variable>
-            <variable name='mode_conteneur_actif2' type='string' description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_enum">
-            <param>tous</param>
-            <param>authentifié</param>
-            <param>aucun</param>
-            <target>condition</target>
-        </check>
-        <condition name='disabled_if_in' source='condition'>
-            <param type="variable">mode_conteneur_actif</param>
-            <target type='variable'>mode_conteneur_actif2</target>
-        </condition>
-    </constraints>
-
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>tous</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>aucun</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>tous</param>
+      <param>authentifié</param>
+      <param>aucun</param>
+      <target>condition</target>
+    </check>
+    <condition name="disabled_if_in" source="condition">
+      <param type="variable">mode_conteneur_actif</param>
+      <target type="variable">mode_conteneur_actif2</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10load_disabled_if_not_in_fallback/00-base.xml b/tests/dictionaries/10load_disabled_if_not_in_fallback/00-base.xml
index 481a4738..bc1bca98 100644
--- a/tests/dictionaries/10load_disabled_if_not_in_fallback/00-base.xml
+++ b/tests/dictionaries/10load_disabled_if_not_in_fallback/00-base.xml
@@ -1,27 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <services>
-        <service name="test">
-            <file filelist="afilllist">/tmp/file1</file>
-        </service>
-    </services>
-    <variables>
-        <family name="general">
-            <variable name="condition" type="string" description="No change">
-                <value>no</value>
-            </variable>
-            <variable name="disable_variable" type="string" description="No change">
-                <value>no</value>
-            </variable>
-        </family>
-    </variables>
-    <constraints>
-        <condition name="disabled_if_not_in" source="unknown" optional="True">
-            <param>no</param>
-            <target type="variable">disable_variable</target>
-            <target type="filelist">afilllist</target>
-        </condition>
-    </constraints>
+<rougail version="0.10">
+  <services>
+    <service name="test">
+      <file filelist="afilllist">/tmp/file1</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>no</value>
+      </variable>
+      <variable name="disable_variable" type="string" description="No change">
+        <value>no</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_not_in" source="unknown" optional="True">
+      <param>no</param>
+      <target type="variable">disable_variable</target>
+      <target type="filelist">afilllist</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10load_disabled_if_not_in_fallback_force/00-base.xml b/tests/dictionaries/10load_disabled_if_not_in_fallback_force/00-base.xml
index ea27633e..13f87664 100644
--- a/tests/dictionaries/10load_disabled_if_not_in_fallback_force/00-base.xml
+++ b/tests/dictionaries/10load_disabled_if_not_in_fallback_force/00-base.xml
@@ -1,31 +1,28 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="condition" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_not_in" source="unknown" apply_on_fallback="True" optional="True">
-            <param>oui</param>
-            <target type="variable">mode_conteneur_actif</target>
-            <target type="variable">mode_conteneur_actif2</target>
-            <target type="filelist">afilllist</target>
-        </condition>
-        <condition name="disabled_if_not_in" source="activer_client_ldap" optional="True">
-            <param>non</param>
-            <target type="variable">mode_conteneur_actif</target>
-        </condition>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_not_in" source="unknown" apply_on_fallback="True" optional="True">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+      <target type="filelist">afilllist</target>
+    </condition>
+    <condition name="disabled_if_not_in" source="activer_client_ldap" optional="True">
+      <param>non</param>
+      <target type="variable">mode_conteneur_actif</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10load_disabledifin_fallback/00-base.xml b/tests/dictionaries/10load_disabledifin_fallback/00-base.xml
index 2c0b1d3e..2dcbeca3 100644
--- a/tests/dictionaries/10load_disabledifin_fallback/00-base.xml
+++ b/tests/dictionaries/10load_disabledifin_fallback/00-base.xml
@@ -1,30 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="condition" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_in" source="condition">
-            <param>oui</param>
-            <target type="variable">mode_conteneur_actif</target>
-            <target type="variable">mode_conteneur_actif2</target>
-        </condition>
-        <condition name="disabled_if_in" source="activer_client_ldap" optional="True">
-            <param>non</param>
-            <target type="variable">mode_conteneur_actif</target>
-        </condition>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+    </condition>
+    <condition name="disabled_if_in" source="activer_client_ldap" optional="True">
+      <param>non</param>
+      <target type="variable">mode_conteneur_actif</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10load_disabledifin_fallback_force/00-base.xml b/tests/dictionaries/10load_disabledifin_fallback_force/00-base.xml
index 9cf6a79f..1a6fd8ac 100644
--- a/tests/dictionaries/10load_disabledifin_fallback_force/00-base.xml
+++ b/tests/dictionaries/10load_disabledifin_fallback_force/00-base.xml
@@ -1,30 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="condition" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_in" source="condition">
-            <param>oui</param>
-            <target type="variable">mode_conteneur_actif</target>
-            <target type="variable">mode_conteneur_actif2</target>
-        </condition>
-        <condition name="disabled_if_in" source="activer_client_ldap" optional="True" apply_on_fallback="False">
-            <param>non</param>
-            <target type="variable">mode_conteneur_actif</target>
-        </condition>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+    </condition>
+    <condition name="disabled_if_in" source="activer_client_ldap" optional="True" apply_on_fallback="False">
+      <param>non</param>
+      <target type="variable">mode_conteneur_actif</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10load_disabledifin_whithouttype/00-base.xml b/tests/dictionaries/10load_disabledifin_whithouttype/00-base.xml
index a2c40282..2af7dc7d 100644
--- a/tests/dictionaries/10load_disabledifin_whithouttype/00-base.xml
+++ b/tests/dictionaries/10load_disabledifin_whithouttype/00-base.xml
@@ -1,26 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="condition" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_in" source="condition">
-            <param>oui</param>
-            <target>mode_conteneur_actif</target>
-            <target type="variable">mode_conteneur_actif2</target>
-        </condition>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>oui</param>
+      <target>mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10load_emptyvalue/00-base.xml b/tests/dictionaries/10load_emptyvalue/00-base.xml
index 121dd396..d8cf2012 100644
--- a/tests/dictionaries/10load_emptyvalue/00-base.xml
+++ b/tests/dictionaries/10load_emptyvalue/00-base.xml
@@ -1,15 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value></value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="string" description="No change">
-                <value/>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value/>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value/>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10load_frozenifin/00-base.xml b/tests/dictionaries/10load_frozenifin/00-base.xml
index 5d9bde1a..bc758815 100644
--- a/tests/dictionaries/10load_frozenifin/00-base.xml
+++ b/tests/dictionaries/10load_frozenifin/00-base.xml
@@ -1,26 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="condition" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="hidden_if_in" source="condition">
-            <param>oui</param>
-            <target type="variable">mode_conteneur_actif</target>
-            <target type="variable">mode_conteneur_actif2</target>
-        </condition>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="hidden_if_in" source="condition">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10load_frozenifin_auto/00-base.xml b/tests/dictionaries/10load_frozenifin_auto/00-base.xml
index 8b18838a..4fbc6af9 100644
--- a/tests/dictionaries/10load_frozenifin_auto/00-base.xml
+++ b/tests/dictionaries/10load_frozenifin_auto/00-base.xml
@@ -1,30 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="condition" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="hidden_if_in" source="condition">
-            <param>oui</param>
-            <target type="variable">mode_conteneur_actif</target>
-            <target type="variable">mode_conteneur_actif2</target>
-        </condition>
-        <fill name="calc_val">
-            <param>non</param>
-            <target>mode_conteneur_actif</target>
-        </fill>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="hidden_if_in" source="condition">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+    </condition>
+    <fill name="calc_val">
+      <param>non</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10load_frozenifin_multiparam/00-base.xml b/tests/dictionaries/10load_frozenifin_multiparam/00-base.xml
index e41ba0a4..b2f5efe2 100644
--- a/tests/dictionaries/10load_frozenifin_multiparam/00-base.xml
+++ b/tests/dictionaries/10load_frozenifin_multiparam/00-base.xml
@@ -1,33 +1,30 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="condition" type="string" description="No change">
-                <value>tous</value>
-            </variable>
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_enum">
-            <param>tous</param>
-            <param>authentifié</param>
-            <param>aucun</param>
-            <target>condition</target>
-        </check>
-        <condition name="hidden_if_in" source="condition">
-            <param>tous</param>
-            <param>authentifié</param>
-            <target type="variable">mode_conteneur_actif</target>
-            <target type="variable">mode_conteneur_actif2</target>
-        </condition>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>tous</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>tous</param>
+      <param>authentifié</param>
+      <param>aucun</param>
+      <target>condition</target>
+    </check>
+    <condition name="hidden_if_in" source="condition">
+      <param>tous</param>
+      <param>authentifié</param>
+      <target type="variable">mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10load_frozenifin_noexist/00-base.xml b/tests/dictionaries/10load_frozenifin_noexist/00-base.xml
index 28f16410..96b89e55 100644
--- a/tests/dictionaries/10load_frozenifin_noexist/00-base.xml
+++ b/tests/dictionaries/10load_frozenifin_noexist/00-base.xml
@@ -1,36 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.9">
-
-    <variables>
-        <family name='general'>
-            <variable name='condition' type='string' description="No change">
-                <value>tous</value>
-            </variable>
-            <variable name='mode_conteneur_actif' type='string' description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name='mode_conteneur_actif2' type='string' description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_enum">
-            <param>tous</param>
-            <param>authentifié</param>
-            <param>aucun</param>
-            <target>condition</target>
-        </check>
-        <condition name='hidden_if_in' source='condition'>
-            <param>oui</param>
-            <param>non</param>
-            <target type='variable'>mode_conteneur_actif</target>
-            <target type='variable'>mode_conteneur_actif2</target>
-        </condition>
-    </constraints>
-
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>tous</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>tous</param>
+      <param>authentifié</param>
+      <param>aucun</param>
+      <target>condition</target>
+    </check>
+    <condition name="hidden_if_in" source="condition">
+      <param>oui</param>
+      <param>non</param>
+      <target type="variable">mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10load_frozenifin_variable/00-base.xml b/tests/dictionaries/10load_frozenifin_variable/00-base.xml
index fd053cf3..d2a3fac8 100644
--- a/tests/dictionaries/10load_frozenifin_variable/00-base.xml
+++ b/tests/dictionaries/10load_frozenifin_variable/00-base.xml
@@ -1,34 +1,28 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.9">
-
-    <variables>
-        <family name='general'>
-            <variable name='condition' type='string' description="No change">
-                <value>tous</value>
-            </variable>
-            <variable name='mode_conteneur_actif' type='string' description="No change">
-                <value>tous</value>
-            </variable>
-            <variable name='mode_conteneur_actif2' type='string' description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_enum">
-            <param>tous</param>
-            <param>authentifié</param>
-            <param>aucun</param>
-            <target>condition</target>
-        </check>
-        <condition name='hidden_if_in' source='condition'>
-            <param type="variable">mode_conteneur_actif</param>
-            <target type='variable'>mode_conteneur_actif2</target>
-        </condition>
-    </constraints>
-
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>tous</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>tous</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>tous</param>
+      <param>authentifié</param>
+      <param>aucun</param>
+      <target>condition</target>
+    </check>
+    <condition name="hidden_if_in" source="condition">
+      <param type="variable">mode_conteneur_actif</param>
+      <target type="variable">mode_conteneur_actif2</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10load_frozenifnotin/00-base.xml b/tests/dictionaries/10load_frozenifnotin/00-base.xml
index 1758e16b..95ba4779 100644
--- a/tests/dictionaries/10load_frozenifnotin/00-base.xml
+++ b/tests/dictionaries/10load_frozenifnotin/00-base.xml
@@ -1,26 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="condition" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="hidden_if_not_in" source="condition">
-            <param>oui</param>
-            <target type="variable">mode_conteneur_actif</target>
-            <target type="variable">mode_conteneur_actif2</target>
-        </condition>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="hidden_if_not_in" source="condition">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10load_frozenifnotin_noexist/00-base.xml b/tests/dictionaries/10load_frozenifnotin_noexist/00-base.xml
index 8fa44115..778d5b34 100644
--- a/tests/dictionaries/10load_frozenifnotin_noexist/00-base.xml
+++ b/tests/dictionaries/10load_frozenifnotin_noexist/00-base.xml
@@ -1,36 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.9">
-
-    <variables>
-        <family name='general'>
-            <variable name='condition' type='string' description="No change">
-                <value>tous</value>
-            </variable>
-            <variable name='mode_conteneur_actif' type='string' description="No change">
-                <value>non</value>
-            </variable>
-            <variable name='mode_conteneur_actif2' type='string' description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_enum">
-            <param>tous</param>
-            <param>authentifié</param>
-            <param>aucun</param>
-            <target>condition</target>
-        </check>
-        <condition name='hidden_if_not_in' source='condition'>
-            <param>oui</param>
-            <param>non</param>
-            <target type='variable'>mode_conteneur_actif</target>
-            <target type='variable'>mode_conteneur_actif2</target>
-        </condition>
-    </constraints>
-
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>tous</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>tous</param>
+      <param>authentifié</param>
+      <param>aucun</param>
+      <target>condition</target>
+    </check>
+    <condition name="hidden_if_not_in" source="condition">
+      <param>oui</param>
+      <param>non</param>
+      <target type="variable">mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10load_hidden_if_empty_family/00-base.xml b/tests/dictionaries/10load_hidden_if_empty_family/00-base.xml
index 77f84247..0df3cf0e 100644
--- a/tests/dictionaries/10load_hidden_if_empty_family/00-base.xml
+++ b/tests/dictionaries/10load_hidden_if_empty_family/00-base.xml
@@ -1,29 +1,26 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general" description="Général">
-            <variable name="condition" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif" type="string" description="No change" >
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="string" description="No change">
-                <value>non</value>
-            </variable>
+<rougail version="0.10">
+  <variables>
+    <family name="general" description="Général">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="general2" description="Général2">
         </family>
-        <family name="general2" description="Général2">
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="hidden_if_in" source="condition">
-            <param>oui</param>
-            <target type="variable">mode_conteneur_actif</target>
-            <target type="variable">mode_conteneur_actif2</target>
-            <target type="family">general2</target>
-        </condition>
-    </constraints>
+  </variables>
+  <constraints>
+    <condition name="hidden_if_in" source="condition">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+      <target type="family">general2</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10load_hidden_if_family/00-base.xml b/tests/dictionaries/10load_hidden_if_family/00-base.xml
index 85ea05f1..682bc8f3 100644
--- a/tests/dictionaries/10load_hidden_if_family/00-base.xml
+++ b/tests/dictionaries/10load_hidden_if_family/00-base.xml
@@ -1,32 +1,29 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general" description="Général">
-            <variable name="condition" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif" type="string" description="No change" >
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="general2" description="Général2">
-            <variable name="mode_conteneur_actif3" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="hidden_if_in" source="condition">
-            <param>oui</param>
-            <target type="variable">mode_conteneur_actif</target>
-            <target type="variable">mode_conteneur_actif2</target>
-            <target type="family">general2</target>
-        </condition>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general" description="Général">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="general2" description="Général2">
+      <variable name="mode_conteneur_actif3" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="hidden_if_in" source="condition">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+      <target type="family">general2</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10load_leadership/00-base.xml b/tests/dictionaries/10load_leadership/00-base.xml
index a1c29b99..a3614dc1 100644
--- a/tests/dictionaries/10load_leadership/00-base.xml
+++ b/tests/dictionaries/10load_leadership/00-base.xml
@@ -1,30 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="general1">
-            <variable name="leader" type="string" description="leader" multi="True"/>
-            <variable name="follower1" type="string" description="follower1"/>
-            <variable name="follower2" type="string" description="follower2"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param name="valeur">valfill</param>
-	    <target>follower1</target>
-        </fill>
-        <fill name="calc_val">
-            <param type="variable">follower1</param>
-	    <target>follower2</target>
-        </fill>
-        <group leader="leader">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="general1">
+      <family name="leader" description="leader" leadership="True">
+        <variable name="leader" type="string" description="leader" multi="True"/>
+        <variable name="follower1" type="string" description="follower1"/>
+        <variable name="follower2" type="string" description="follower2"/>
+      </family>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valfill</param>
+      <target>follower1</target>
+    </fill>
+    <fill name="calc_val">
+      <param type="variable">follower1</param>
+      <target>follower2</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/10load_leadership_default_multi/00-base.xml b/tests/dictionaries/10load_leadership_default_multi/00-base.xml
index de492d17..8879a9c9 100644
--- a/tests/dictionaries/10load_leadership_default_multi/00-base.xml
+++ b/tests/dictionaries/10load_leadership_default_multi/00-base.xml
@@ -1,22 +1,18 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="leader" multi="True">
-                <value>non</value>
-            </variable>
-            <variable name="leader" type="string" description="leader" multi="True"/>
-            <variable name="follower1" type="string" description="follower1">
-                <value>value</value>
-            </variable>
-            <variable name="follower2" type="string" description="follower2"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <group leader="leader">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="leader" multi="True">
+        <value>non</value>
+      </variable>
+      <family name="leader" description="leader" leadership="True">
+        <variable name="leader" type="string" description="leader" multi="True"/>
+        <variable name="follower1" type="string" description="follower1">
+          <value>value</value>
+        </variable>
+        <variable name="follower2" type="string" description="follower2"/>
+      </family>
+    </family>
+  </variables>
+  <constraints/>
 </rougail>
diff --git a/tests/dictionaries/10load_leadership_default_submulti/00-base.xml b/tests/dictionaries/10load_leadership_default_submulti/00-base.xml
index 81d84182..c8176738 100644
--- a/tests/dictionaries/10load_leadership_default_submulti/00-base.xml
+++ b/tests/dictionaries/10load_leadership_default_submulti/00-base.xml
@@ -1,27 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="leader" multi="True">
-                <value>non</value>
-            </variable>
-            <variable name="leader" type="string" description="leader" multi="True">
-                <value>leader</value>
-            </variable>
-            <variable name="follower1" type="string" description="follower1" multi="True">
-               <value>value</value>
-            </variable>
-            <variable name="follower2" type="string" description="follower2" multi="True">
-               <value>value1</value>
-               <value>value2</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <group leader="leader">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="leader" multi="True">
+        <value>non</value>
+      </variable>
+      <family name="leader" description="leader" leadership="True">
+        <variable name="leader" type="string" description="leader" multi="True">
+          <value>leader</value>
+        </variable>
+        <variable name="follower1" type="string" description="follower1" multi="True">
+          <value>value</value>
+        </variable>
+        <variable name="follower2" type="string" description="follower2" multi="True">
+          <value>value1</value>
+          <value>value2</value>
+        </variable>
+      </family>
+    </family>
+  </variables>
+  <constraints/>
 </rougail>
diff --git a/tests/dictionaries/10load_leadership_defaultmulti_leader/00-base.xml b/tests/dictionaries/10load_leadership_defaultmulti_leader/00-base.xml
index e2fb8c4f..fe60cee7 100644
--- a/tests/dictionaries/10load_leadership_defaultmulti_leader/00-base.xml
+++ b/tests/dictionaries/10load_leadership_defaultmulti_leader/00-base.xml
@@ -1,22 +1,18 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-          <variable name="mode_conteneur_actif" type="string" description="leader" multi="True">
-            <value>non</value>
-          </variable>
-          <variable name="leader" type="string" description="leader" multi="True">
-           <value>value</value>
-          </variable>
-          <variable name="follower1" type="string" description="follower1"/>
-          <variable name="follower2" type="string" description="follower2"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <group leader="leader">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="leader" multi="True">
+        <value>non</value>
+      </variable>
+      <family name="leader" description="leader" leadership="True">
+        <variable name="leader" type="string" description="leader" multi="True">
+          <value>value</value>
+        </variable>
+        <variable name="follower1" type="string" description="follower1"/>
+        <variable name="follower2" type="string" description="follower2"/>
+      </family>
+    </family>
+  </variables>
+  <constraints/>
 </rougail>
diff --git a/tests/dictionaries/10load_leadership_description/00-base.xml b/tests/dictionaries/10load_leadership_description/00-base.xml
index f27ad339..72e577f9 100644
--- a/tests/dictionaries/10load_leadership_description/00-base.xml
+++ b/tests/dictionaries/10load_leadership_description/00-base.xml
@@ -1,29 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
-<rougail version="0.9">
-    <variables>
-        <family name='general'>
-            <variable name='mode_conteneur_actif' type='string' description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name='general1'>
-            <variable name='leader' type='string' description="leader" multi="True"/>
-            <variable name='follower1' type='string' description="follower1"/>
-            <variable name='follower2' type='string' description="follower2"/>
-        </family>
-    </variables>
-    <constraints>
-        <fill name='calc_val'>
-            <param name='valeur'>valfill</param>
- 	    <target>follower1</target>
-        </fill>
-        <fill name='calc_val'>
-            <param type='variable'>follower1</param>
- 	    <target>follower2</target>
-        </fill>
-        <group leader='leader' description="other description">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-    </constraints>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="general1">
+      <family name="leader" description="other description" leadership="True">
+        <variable name="leader" type="string" description="leader" multi="True"/>
+        <variable name="follower1" type="string" description="follower1"/>
+        <variable name="follower2" type="string" description="follower2"/>
+      </family>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valfill</param>
+      <target>follower1</target>
+    </fill>
+    <fill name="calc_val">
+      <param type="variable">follower1</param>
+      <target>follower2</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/10load_leadership_name/00-base.xml b/tests/dictionaries/10load_leadership_name/00-base.xml
index 9d75b178..ff11ffb6 100644
--- a/tests/dictionaries/10load_leadership_name/00-base.xml
+++ b/tests/dictionaries/10load_leadership_name/00-base.xml
@@ -1,29 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
-<rougail version="0.9">
-    <variables>
-        <family name='general'>
-            <variable name='mode_conteneur_actif' type='string' description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name='general1'>
-            <variable name='leader' type='string' description="leader" multi="True"/>
-            <variable name='follower1' type='string' description="follower1"/>
-            <variable name='follower2' type='string' description="follower2"/>
-        </family>
-    </variables>
-    <constraints>
-        <fill name='calc_val'>
-            <param name='valeur'>valfill</param>
- 	    <target>follower1</target>
-        </fill>
-        <fill name='calc_val'>
-            <param type='variable'>follower1</param>
- 	    <target>follower2</target>
-        </fill>
-        <group leader='leader' name="other_name">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-    </constraints>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="general1">
+      <family name="other_name" description="other_name" leadership="True">
+        <variable name="leader" type="string" description="leader" multi="True"/>
+        <variable name="follower1" type="string" description="follower1"/>
+        <variable name="follower2" type="string" description="follower2"/>
+      </family>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valfill</param>
+      <target>follower1</target>
+    </fill>
+    <fill name="calc_val">
+      <param type="variable">follower1</param>
+      <target>follower2</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/10load_leadership_submulti/00-base.xml b/tests/dictionaries/10load_leadership_submulti/00-base.xml
index 35dca241..ccf0a7c8 100644
--- a/tests/dictionaries/10load_leadership_submulti/00-base.xml
+++ b/tests/dictionaries/10load_leadership_submulti/00-base.xml
@@ -1,30 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="general1">
-            <variable name="leader" type="string" description="leader" multi="True"/>
-            <variable name="follower1" type="string" description="follower1"/>
-            <variable name="follower2" type="string" description="follower2" multi="True"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param name="valeur">valfill</param>
- 	    <target>follower1</target>
-        </fill>
-        <fill name="calc_val">
-            <param type="variable">follower1</param>
- 	    <target>follower2</target>
-        </fill>
-        <group leader="leader">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="general1">
+      <family name="leader" description="leader" leadership="True">
+        <variable name="leader" type="string" description="leader" multi="True"/>
+        <variable name="follower1" type="string" description="follower1"/>
+        <variable name="follower2" type="string" description="follower2" multi="True"/>
+      </family>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valfill</param>
+      <target>follower1</target>
+    </fill>
+    <fill name="calc_val">
+      <param type="variable">follower1</param>
+      <target>follower2</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/10load_mandatoryifin/00-base.xml b/tests/dictionaries/10load_mandatoryifin/00-base.xml
index 1ba37c14..4aed495d 100644
--- a/tests/dictionaries/10load_mandatoryifin/00-base.xml
+++ b/tests/dictionaries/10load_mandatoryifin/00-base.xml
@@ -1,26 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="condition" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="mandatory_if_in" source="condition">
-            <param>oui</param>
-            <target type="variable">mode_conteneur_actif</target>
-            <target type="variable">mode_conteneur_actif2</target>
-        </condition>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="mandatory_if_in" source="condition">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10load_mandatoryifnotin_noexist/00-base.xml b/tests/dictionaries/10load_mandatoryifnotin_noexist/00-base.xml
index 36588ca9..781f5e9a 100644
--- a/tests/dictionaries/10load_mandatoryifnotin_noexist/00-base.xml
+++ b/tests/dictionaries/10load_mandatoryifnotin_noexist/00-base.xml
@@ -1,36 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.9">
-
-    <variables>
-        <family name='general'>
-            <variable name='condition' type='string' description="No change">
-                <value>tous</value>
-            </variable>
-            <variable name='mode_conteneur_actif' type='string' description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name='mode_conteneur_actif2' type='string' description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_enum">
-            <param>tous</param>
-            <param>authentifié</param>
-            <param>aucun</param>
-            <target>condition</target>
-        </check>
-        <condition name='mandatory_if_not_in' source='condition'>
-            <param>oui</param>
-            <param>non</param>
-            <target type='variable'>mode_conteneur_actif</target>
-            <target type='variable'>mode_conteneur_actif2</target>
-        </condition>
-    </constraints>
-
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>tous</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>tous</param>
+      <param>authentifié</param>
+      <param>aucun</param>
+      <target>condition</target>
+    </check>
+    <condition name="mandatory_if_not_in" source="condition">
+      <param>oui</param>
+      <param>non</param>
+      <target type="variable">mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10load_multivalue/00-base.xml b/tests/dictionaries/10load_multivalue/00-base.xml
index 938a8ac9..1f092d5b 100644
--- a/tests/dictionaries/10load_multivalue/00-base.xml
+++ b/tests/dictionaries/10load_multivalue/00-base.xml
@@ -1,13 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True" multi="True">
-                <value>non</value>
-                <value>oui</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True" multi="True">
+        <value>non</value>
+        <value>oui</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10valid_enum_accent/00-base.xml b/tests/dictionaries/10valid_enum_accent/00-base.xml
index f9982b36..3c5808bc 100644
--- a/tests/dictionaries/10valid_enum_accent/00-base.xml
+++ b/tests/dictionaries/10valid_enum_accent/00-base.xml
@@ -1,27 +1,24 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general" mode="expert">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="enumfam" mode="expert">
-            <variable name="enumvar" type="string" description="multi" help="bla bla bla">
-                <value>c</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_enum">
-            <param>a</param>
-            <param>b</param>
-            <param>c</param>
-            <param>é</param>
-            <target>enumvar</target>
-        </check>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="enumfam" mode="expert">
+      <variable name="enumvar" type="string" description="multi" help="bla bla bla">
+        <value>c</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>a</param>
+      <param>b</param>
+      <param>c</param>
+      <param>é</param>
+      <target>enumvar</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10valid_enum_base/00-base.xml b/tests/dictionaries/10valid_enum_base/00-base.xml
index 307b21ce..7b48372f 100644
--- a/tests/dictionaries/10valid_enum_base/00-base.xml
+++ b/tests/dictionaries/10valid_enum_base/00-base.xml
@@ -1,26 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general" mode="expert">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="enumfam" mode="expert">
-            <variable name="enumvar" type="string" description="multi" help="bla bla bla">
-                <value>c</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_enum">
-            <param>a</param>
-            <param>b</param>
-            <param>c</param>
-            <target>enumvar</target>
-        </check>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="enumfam" mode="expert">
+      <variable name="enumvar" type="string" description="multi" help="bla bla bla">
+        <value>c</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>a</param>
+      <param>b</param>
+      <param>c</param>
+      <target>enumvar</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10valid_enum_base_no_mandatory/00-base.xml b/tests/dictionaries/10valid_enum_base_no_mandatory/00-base.xml
index 275d9f18..7e7b6157 100644
--- a/tests/dictionaries/10valid_enum_base_no_mandatory/00-base.xml
+++ b/tests/dictionaries/10valid_enum_base_no_mandatory/00-base.xml
@@ -1,26 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general" mode="expert">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="enumfam" mode="expert">
-            <variable name="enumvar" mandatory="False">
-                <value>c</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_enum">
-            <param>a</param>
-            <param>b</param>
-            <param>c</param>
-            <target>enumvar</target>
-        </check>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="enumfam" mode="expert">
+      <variable name="enumvar" mandatory="False">
+        <value>c</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>a</param>
+      <param>b</param>
+      <param>c</param>
+      <target>enumvar</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10valid_enum_base_redefine/00-base.xml b/tests/dictionaries/10valid_enum_base_redefine/00-base.xml
index 45f6e437..8df93848 100644
--- a/tests/dictionaries/10valid_enum_base_redefine/00-base.xml
+++ b/tests/dictionaries/10valid_enum_base_redefine/00-base.xml
@@ -1,35 +1,32 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general" mode="expert">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="enumfam" mode="expert">
-            <variable name="enumvar2" type="string" description="multi">
-                <value>c</value>
-            </variable>
-            <variable name="enumvar" type="string" description="multi" help="bla bla bla">
-                <value>c</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_enum">
-            <param>a</param>
-            <param>b</param>
-            <param>c</param>
-            <target>enumvar</target>
-        </check>
-        <check name="valid_enum">
-            <param>a</param>
-            <param>b</param>
-            <param>c</param>
-            <target>enumvar2</target>
-        </check>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="enumfam" mode="expert">
+      <variable name="enumvar2" type="string" description="multi">
+        <value>c</value>
+      </variable>
+      <variable name="enumvar" type="string" description="multi" help="bla bla bla">
+        <value>c</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>a</param>
+      <param>b</param>
+      <param>c</param>
+      <target>enumvar</target>
+    </check>
+    <check name="valid_enum">
+      <param>a</param>
+      <param>b</param>
+      <param>c</param>
+      <target>enumvar2</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10valid_enum_base_redefine/01-base.xml b/tests/dictionaries/10valid_enum_base_redefine/01-base.xml
index 9d572c95..9dc00d56 100644
--- a/tests/dictionaries/10valid_enum_base_redefine/01-base.xml
+++ b/tests/dictionaries/10valid_enum_base_redefine/01-base.xml
@@ -1,20 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="enumfam" mode="expert">
-            <variable name="enumvar" redefine="True" remove_check="True">
-                <value>c</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_enum">
-            <param>a</param>
-            <param>c</param>
-            <target>enumvar</target>
-        </check>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="enumfam" mode="expert">
+      <variable name="enumvar" redefine="True" remove_check="True">
+        <value>c</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>a</param>
+      <param>c</param>
+      <target>enumvar</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10valid_enum_leader/00-base.xml b/tests/dictionaries/10valid_enum_leader/00-base.xml
index c90911fe..55d2edd1 100644
--- a/tests/dictionaries/10valid_enum_leader/00-base.xml
+++ b/tests/dictionaries/10valid_enum_leader/00-base.xml
@@ -1,28 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="leader" type="string" description="leader" multi="True"/>
-            <variable name="follower1" type="string" description="follower1"/>
-            <variable name="follower2" type="string" description="follower2"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_enum">
-            <param>a</param>
-            <param>b</param>
-            <param>c</param>
-            <target>follower1</target>
-        </check>
-        <group leader="leader">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <family name="leader" description="leader" leadership="True">
+        <variable name="leader" type="string" description="leader" multi="True"/>
+        <variable name="follower1" type="string" description="follower1"/>
+        <variable name="follower2" type="string" description="follower2"/>
+      </family>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>a</param>
+      <param>b</param>
+      <param>c</param>
+      <target>follower1</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10valid_enum_mandatory/00-base.xml b/tests/dictionaries/10valid_enum_mandatory/00-base.xml
index 595c9149..b7e96ff0 100644
--- a/tests/dictionaries/10valid_enum_mandatory/00-base.xml
+++ b/tests/dictionaries/10valid_enum_mandatory/00-base.xml
@@ -1,25 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <services/>
-    <variables>
-        <family name="general" mode="expert">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="enumfam" mode="expert">
-            <variable name="enumvar" type="string" description="multi" mandatory="True"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_enum">
-            <param>a</param>
-            <param>b</param>
-            <param>c</param>
-            <target>enumvar</target>
-        </check>
-    </constraints>
+<rougail version="0.10">
+  <services/>
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="enumfam" mode="expert">
+      <variable name="enumvar" type="string" description="multi" mandatory="True"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>a</param>
+      <param>b</param>
+      <param>c</param>
+      <target>enumvar</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10valid_enum_multi/00-base.xml b/tests/dictionaries/10valid_enum_multi/00-base.xml
index 8e75b7ba..54be44d1 100644
--- a/tests/dictionaries/10valid_enum_multi/00-base.xml
+++ b/tests/dictionaries/10valid_enum_multi/00-base.xml
@@ -1,22 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="multi" type="string" description="multi" multi="True"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_enum">
-            <param>a</param>
-            <param>b</param>
-            <param>c</param>
-            <target>multi</target>
-        </check>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="multi" type="string" description="multi" multi="True"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>a</param>
+      <param>b</param>
+      <param>c</param>
+      <target>multi</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10valid_enum_none/00-base.xml b/tests/dictionaries/10valid_enum_none/00-base.xml
index 289af701..b010e124 100644
--- a/tests/dictionaries/10valid_enum_none/00-base.xml
+++ b/tests/dictionaries/10valid_enum_none/00-base.xml
@@ -1,26 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general" mode="expert">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="enumfam" mode="expert">
-            <variable name="enumvar" type="string" description="multi" help="bla bla bla" mandatory="False">
-                <value>b</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_enum">
-            <param>a</param>
-            <param>b</param>
-            <param></param>
-            <target>enumvar</target>
-        </check>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="enumfam" mode="expert">
+      <variable name="enumvar" type="string" description="multi" help="bla bla bla" mandatory="False">
+        <value>b</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>a</param>
+      <param>b</param>
+      <param/>
+      <target>enumvar</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10valid_enum_number/00-base.xml b/tests/dictionaries/10valid_enum_number/00-base.xml
index 58d54d99..331b0df3 100644
--- a/tests/dictionaries/10valid_enum_number/00-base.xml
+++ b/tests/dictionaries/10valid_enum_number/00-base.xml
@@ -1,25 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general" mode="expert">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="enumfam" mode="expert">
-            <variable name="enumvar" type="number" description="enumvar" help="bla bla bla"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_enum">
-            <param>1</param>
-            <param>2</param>
-            <param>3</param>
-            <target>enumvar</target>
-        </check>
-    </constraints>
-
+<rougail version="0.10">
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="enumfam" mode="expert">
+      <variable name="enumvar" type="number" description="enumvar" help="bla bla bla"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>1</param>
+      <param>2</param>
+      <param>3</param>
+      <target>enumvar</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10valid_enum_numberdefault/00-base.xml b/tests/dictionaries/10valid_enum_numberdefault/00-base.xml
index 3975516d..698f4d91 100644
--- a/tests/dictionaries/10valid_enum_numberdefault/00-base.xml
+++ b/tests/dictionaries/10valid_enum_numberdefault/00-base.xml
@@ -1,26 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general" mode="expert">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="enumfam" mode="expert">
-            <variable name="enumvar" type="number" description="enumvar" help="bla bla bla">
-                <value>3</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_enum">
-            <param>1</param>
-            <param>2</param>
-            <param>3</param>
-            <target>enumvar</target>
-        </check>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="enumfam" mode="expert">
+      <variable name="enumvar" type="number" description="enumvar" help="bla bla bla">
+        <value>3</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>1</param>
+      <param>2</param>
+      <param>3</param>
+      <target>enumvar</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10valid_enum_param_empty/00-base.xml b/tests/dictionaries/10valid_enum_param_empty/00-base.xml
index 1e2cd8ed..bf3393de 100644
--- a/tests/dictionaries/10valid_enum_param_empty/00-base.xml
+++ b/tests/dictionaries/10valid_enum_param_empty/00-base.xml
@@ -1,22 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general" mode="expert">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="enumfam" mode="expert">
-            <variable name="enumvar" type="string" description="multi" help="bla bla bla"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_enum">
-            <param type='nil'></param>
-            <target>enumvar</target>
-        </check>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="enumfam" mode="expert">
+      <variable name="enumvar" type="string" description="multi" help="bla bla bla"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param type="nil"/>
+      <target>enumvar</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10valid_enum_param_empty2/00-base.xml b/tests/dictionaries/10valid_enum_param_empty2/00-base.xml
index 2bfd69bf..bf3393de 100644
--- a/tests/dictionaries/10valid_enum_param_empty2/00-base.xml
+++ b/tests/dictionaries/10valid_enum_param_empty2/00-base.xml
@@ -1,22 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general" mode="expert">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="enumfam" mode="expert">
-            <variable name="enumvar" type="string" description="multi" help="bla bla bla"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_enum">
-            <param type='nil'/>
-            <target>enumvar</target>
-        </check>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="enumfam" mode="expert">
+      <variable name="enumvar" type="string" description="multi" help="bla bla bla"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param type="nil"/>
+      <target>enumvar</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10valid_enum_quote/00-base.xml b/tests/dictionaries/10valid_enum_quote/00-base.xml
index 1614931b..c8502381 100644
--- a/tests/dictionaries/10valid_enum_quote/00-base.xml
+++ b/tests/dictionaries/10valid_enum_quote/00-base.xml
@@ -1,24 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general" mode="expert">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="enumfam" mode="expert">
-            <variable name="enumvar" type="string" description="multi" help="bla bla bla"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_enum">
-            <param>quote'</param>
-            <param>quote"</param>
-            <param>quote"'</param>
-            <target>enumvar</target>
-        </check>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="enumfam" mode="expert">
+      <variable name="enumvar" type="string" description="multi" help="bla bla bla"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>quote'</param>
+      <param>quote"</param>
+      <param>quote"'</param>
+      <target>enumvar</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10valid_enum_value/00-base.xml b/tests/dictionaries/10valid_enum_value/00-base.xml
index a55be036..978e4842 100644
--- a/tests/dictionaries/10valid_enum_value/00-base.xml
+++ b/tests/dictionaries/10valid_enum_value/00-base.xml
@@ -1,21 +1,18 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>b</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_enum">
-            <param>a</param>
-            <param>b</param>
-            <param>c</param>
-            <target>mode_conteneur_actif</target>
-        </check>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>b</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>a</param>
+      <param>b</param>
+      <param>c</param>
+      <target>mode_conteneur_actif</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/11disabled_if_in_filelist/00-base.xml b/tests/dictionaries/11disabled_if_in_filelist/00-base.xml
index 8a0fb898..5f15500e 100644
--- a/tests/dictionaries/11disabled_if_in_filelist/00-base.xml
+++ b/tests/dictionaries/11disabled_if_in_filelist/00-base.xml
@@ -1,32 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-
-    <services>
-        <service name="test">
-            <file filelist="afilllist">/etc/file</file>
-        </service>
-    </services>
-
-    <variables>
-        <family name="general">
-            <variable name="condition" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="boolean" description="No change"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_in" source="condition">
-            <param>oui</param>
-            <target type="variable">mode_conteneur_actif</target>
-            <target type="variable">mode_conteneur_actif2</target>
-            <target type="filelist">afilllist</target>
-        </condition>
-    </constraints>
+<rougail version="0.10">
+  <services>
+    <service name="test">
+      <file filelist="afilllist">/etc/file</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="boolean" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+      <target type="filelist">afilllist</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/11disabled_if_in_filelist_boolean/00-base.xml b/tests/dictionaries/11disabled_if_in_filelist_boolean/00-base.xml
index 1898469e..cb9c4bc1 100644
--- a/tests/dictionaries/11disabled_if_in_filelist_boolean/00-base.xml
+++ b/tests/dictionaries/11disabled_if_in_filelist_boolean/00-base.xml
@@ -1,22 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <services>
-        <service name="test">
-            <file filelist="afilllist">/tmp/file1</file>
-        </service>
-    </services>
-    <variables>
-        <family name="general">
-            <variable name="condition" type="boolean"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_in" source="condition">
-            <param type="boolean">True</param>
-            <target type="filelist">afilllist</target>
-        </condition>
-    </constraints>
+<rougail version="0.10">
+  <services>
+    <service name="test">
+      <file filelist="afilllist">/tmp/file1</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="condition" type="boolean"/>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param type="boolean">True</param>
+      <target type="filelist">afilllist</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/11disabled_if_in_filelist_boolean2/00-base.xml b/tests/dictionaries/11disabled_if_in_filelist_boolean2/00-base.xml
index b7868809..8b58617a 100644
--- a/tests/dictionaries/11disabled_if_in_filelist_boolean2/00-base.xml
+++ b/tests/dictionaries/11disabled_if_in_filelist_boolean2/00-base.xml
@@ -1,24 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <services>
-        <service name="test">
-            <file filelist="afilllist">/tmp/file1</file>
-        </service>
-    </services>
-    <variables>
-        <family name="general">
-            <variable name="condition" type="boolean">
-                <value>False</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_in" source="condition">
-            <param>True</param>
-            <target type="filelist">afilllist</target>
-        </condition>
-    </constraints>
+<rougail version="0.10">
+  <services>
+    <service name="test">
+      <file filelist="afilllist">/tmp/file1</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="condition" type="boolean">
+        <value>False</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>True</param>
+      <target type="filelist">afilllist</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/11disabled_if_in_filelist_disabled/00-base.xml b/tests/dictionaries/11disabled_if_in_filelist_disabled/00-base.xml
index 950d9a77..93676cb6 100644
--- a/tests/dictionaries/11disabled_if_in_filelist_disabled/00-base.xml
+++ b/tests/dictionaries/11disabled_if_in_filelist_disabled/00-base.xml
@@ -1,34 +1,29 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-
-    <services>
-        <service name="test">
-            <file filelist="afilllist">/etc/file</file>
-        </service>
-    </services>
-
-    <variables>
-        <family name="general">
-            <variable name="condition" type="string" description="No change">
-                <value>oui</value>
-            </variable>
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_in" source="condition">
-            <param>oui</param>
-            <target type="variable">mode_conteneur_actif</target>
-            <target type="variable">mode_conteneur_actif2</target>
-            <target type="filelist">afilllist</target>
-        </condition>
-    </constraints>
+<rougail version="0.10">
+  <services>
+    <service name="test">
+      <file filelist="afilllist">/etc/file</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>oui</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+      <target type="filelist">afilllist</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/11disabled_if_in_filelist_multi/00-base.xml b/tests/dictionaries/11disabled_if_in_filelist_multi/00-base.xml
index fdca7b2a..9e1d3cde 100644
--- a/tests/dictionaries/11disabled_if_in_filelist_multi/00-base.xml
+++ b/tests/dictionaries/11disabled_if_in_filelist_multi/00-base.xml
@@ -1,35 +1,30 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-
-    <services>
-        <service name="test">
-            <file filelist="afilllist">/tmp/file1</file>
-            <file filelist="afilllist">/tmp/file2</file>
-        </service>
-    </services>
-
-    <variables>
-        <family name="general">
-            <variable name="condition" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_in" source="condition">
-            <param>oui</param>
-            <target type="variable">mode_conteneur_actif</target>
-            <target type="variable">mode_conteneur_actif2</target>
-            <target type="filelist">afilllist</target>
-        </condition>
-    </constraints>
+<rougail version="0.10">
+  <services>
+    <service name="test">
+      <file filelist="afilllist">/tmp/file1</file>
+      <file filelist="afilllist">/tmp/file2</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+      <target type="filelist">afilllist</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/11disabledifin_filelist_notexist/00-base.xml b/tests/dictionaries/11disabledifin_filelist_notexist/00-base.xml
index ccc7fa12..f99b3022 100644
--- a/tests/dictionaries/11disabledifin_filelist_notexist/00-base.xml
+++ b/tests/dictionaries/11disabledifin_filelist_notexist/00-base.xml
@@ -1,32 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-
-    <services>
-        <service name="test">
-            <file filelist="afilllist">/tmp/file</file>
-        </service>
-    </services>
-
-    <variables>
-        <family name="general">
-            <variable name="condition" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_not_in" source="condition">
-            <param>unpossible</param>
-            <target type="filelist">afilllist</target>
-        </condition>
-    </constraints>
+<rougail version="0.10">
+  <services>
+    <service name="test">
+      <file filelist="afilllist">/tmp/file</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_not_in" source="condition">
+      <param>unpossible</param>
+      <target type="filelist">afilllist</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/11disabledifnotin_filelist_notexist/00-base.xml b/tests/dictionaries/11disabledifnotin_filelist_notexist/00-base.xml
index ce128737..f99b3022 100644
--- a/tests/dictionaries/11disabledifnotin_filelist_notexist/00-base.xml
+++ b/tests/dictionaries/11disabledifnotin_filelist_notexist/00-base.xml
@@ -1,31 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-
-    <services>
-        <service name="test">
-            <file filelist="afilllist">/tmp/file</file>
-        </service>
-    </services>
-    <variables>
-        <family name="general">
-            <variable name="condition" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_not_in" source="condition">
-            <param>unpossible</param>
-            <target type="filelist">afilllist</target>
-        </condition>
-    </constraints>
+<rougail version="0.10">
+  <services>
+    <service name="test">
+      <file filelist="afilllist">/tmp/file</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_not_in" source="condition">
+      <param>unpossible</param>
+      <target type="filelist">afilllist</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/00-base.xml b/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/00-base.xml
index fe5b9ef6..0e7d86f1 100644
--- a/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/00-base.xml
+++ b/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/00-base.xml
@@ -1,36 +1,31 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-
-    <services>
-        <service name="test">
-            <file filelist="afilllist">/tmp/file</file>
-        </service>
-    </services>
-
-    <variables>
-        <family name="general">
-            <variable name="condition" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_not_in" source="condition">
-            <param>unpossible</param>
-            <target type="filelist">afilllist</target>
-        </condition>
-        <condition name="disabled_if_not_in" source="mode_conteneur_actif2">
-            <param>oui</param>
-            <target type="filelist">afilllist</target>
-        </condition>
-    </constraints>
+<rougail version="0.10">
+  <services>
+    <service name="test">
+      <file filelist="afilllist">/tmp/file</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_not_in" source="condition">
+      <param>unpossible</param>
+      <target type="filelist">afilllist</target>
+    </condition>
+    <condition name="disabled_if_not_in" source="mode_conteneur_actif2">
+      <param>oui</param>
+      <target type="filelist">afilllist</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/00-base.xml b/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/00-base.xml
index 0f614bfa..819aee0e 100644
--- a/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/00-base.xml
+++ b/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/00-base.xml
@@ -1,35 +1,32 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-
-    <services>
-        <service name="test">
-            <file filelist="afilllist">/tmp/file</file>
-        </service>
-    </services>
-
-    <variables>
-        <family name="general">
-            <variable name="condition" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_enum">
-            <param>non</param>
-            <param>statique</param>
-	    <target>condition</target>
-        </check>
-        <condition name="disabled_if_not_in" source="condition">
-            <param>statique</param>
-            <target type="filelist">afilllist</target>
-        </condition>
-    </constraints>
+<rougail version="0.10">
+  <services>
+    <service name="test">
+      <file filelist="afilllist">/tmp/file</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>non</param>
+      <param>statique</param>
+      <target>condition</target>
+    </check>
+    <condition name="disabled_if_not_in" source="condition">
+      <param>statique</param>
+      <target type="filelist">afilllist</target>
+    </condition>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/11multi_disabled_if_in_filelist/00-base.xml b/tests/dictionaries/11multi_disabled_if_in_filelist/00-base.xml
index 71af616d..2c6dcef1 100644
--- a/tests/dictionaries/11multi_disabled_if_in_filelist/00-base.xml
+++ b/tests/dictionaries/11multi_disabled_if_in_filelist/00-base.xml
@@ -1,33 +1,28 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-
-    <services>
-        <service name="test">
-            <file filelist="afilllist">/tmp/file1</file>
-        </service>
-    </services>
-
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="condition" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_in" source="activer_clam" optional="True">
-            <param>non</param>
-            <target type="filelist">afilllist</target>
-        </condition>
-        <condition name="disabled_if_in" source="condition">
-            <param>non</param>
-            <target type="filelist">afilllist</target>
-        </condition>
-    </constraints>
+<rougail version="0.10">
+  <services>
+    <service name="test">
+      <file filelist="afilllist">/tmp/file1</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="activer_clam" optional="True">
+      <param>non</param>
+      <target type="filelist">afilllist</target>
+    </condition>
+    <condition name="disabled_if_in" source="condition">
+      <param>non</param>
+      <target type="filelist">afilllist</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/11valid_enum_function/00-base.xml b/tests/dictionaries/11valid_enum_function/00-base.xml
index 81bbe2fa..52eea8d9 100644
--- a/tests/dictionaries/11valid_enum_function/00-base.xml
+++ b/tests/dictionaries/11valid_enum_function/00-base.xml
@@ -1,20 +1,18 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="var" type="number" description="New variable">
-                <value>9</value>
-            </variable>
-        </family>
-    </variables>
-    <constraints>
-        <check name="valid_enum">
-            <param type="function">trange</param>
-            <param type="number">0</param>
-            <param type="number">10</param>
-            <target>var</target>
-        </check>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="var" type="number" description="New variable">
+        <value>9</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param type="function">trange</param>
+      <param type="number">0</param>
+      <param type="number">10</param>
+      <target>var</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/11valid_enum_variable/00-base.xml b/tests/dictionaries/11valid_enum_variable/00-base.xml
index 046adf76..ed7f6d89 100644
--- a/tests/dictionaries/11valid_enum_variable/00-base.xml
+++ b/tests/dictionaries/11valid_enum_variable/00-base.xml
@@ -1,23 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>a</value>
-            </variable>
-            <variable name="var" type="string" description="New variable" multi="True">
-                <value>a</value>
-                <value>b</value>
-                <value>c</value>
-            </variable>
-        </family>
-    </variables>
-    <constraints>
-        <check name="valid_enum">
-            <param type="variable">var</param>
-            <target>mode_conteneur_actif</target>
-        </check>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>a</value>
+      </variable>
+      <variable name="var" type="string" description="New variable" multi="True">
+        <value>a</value>
+        <value>b</value>
+        <value>c</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param type="variable">var</param>
+      <target>mode_conteneur_actif</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/20family_append/00-base.xml b/tests/dictionaries/20family_append/00-base.xml
index 0e6d4337..1b623d24 100644
--- a/tests/dictionaries/20family_append/00-base.xml
+++ b/tests/dictionaries/20family_append/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/20family_append/01-base.xml b/tests/dictionaries/20family_append/01-base.xml
index ce4a2ad3..82a942d6 100644
--- a/tests/dictionaries/20family_append/01-base.xml
+++ b/tests/dictionaries/20family_append/01-base.xml
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif1" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif1" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/20family_dynamic/00-base.xml b/tests/dictionaries/20family_dynamic/00-base.xml
index 243f828a..dcae232b 100644
--- a/tests/dictionaries/20family_dynamic/00-base.xml
+++ b/tests/dictionaries/20family_dynamic/00-base.xml
@@ -1,15 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.9">
-    <variables>
-        <family name='general'>
-            <variable name='varname' type='string' description="No change" multi="True">
-                <value>val1</value>
-                <value>val2</value>
-            </variable>
-        </family>
-        <family name='dyn' dynamic="varname">
-            <variable name='vardyn' type='string' description="No change"/>
-        </family>
-    </variables>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="varname" type="string" description="No change" multi="True">
+        <value>val1</value>
+        <value>val2</value>
+      </variable>
+    </family>
+    <family name="dyn" dynamic="varname">
+      <variable name="vardyn" type="string" description="No change"/>
+    </family>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/20family_dynamic_calc/00-base.xml b/tests/dictionaries/20family_dynamic_calc/00-base.xml
index 74053acb..d99e5990 100644
--- a/tests/dictionaries/20family_dynamic_calc/00-base.xml
+++ b/tests/dictionaries/20family_dynamic_calc/00-base.xml
@@ -1,26 +1,25 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.9">
-    <variables>
-        <family name='general'>
-            <variable name='varname' type='string' description="No change" multi="True">
-                <value>val1</value>
-                <value>val2</value>
-            </variable>
-        </family>
-        <family name='dyn' dynamic="varname">
-            <variable name='vardyn' type='string' description="No change">
-                <value>val</value>
-            </variable>
-        </family>
-        <family name='new'>
-            <variable name='newvar' type='string' description="No change"/>
-        </family>
-    </variables>
-    <constraints>
-        <fill name="calc_val">
-            <param type="variable">vardynval1</param>
- 	    <target>newvar</target>
-        </fill>
-    </constraints>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="varname" type="string" description="No change" multi="True">
+        <value>val1</value>
+        <value>val2</value>
+      </variable>
+    </family>
+    <family name="dyn" dynamic="varname">
+      <variable name="vardyn" type="string" description="No change">
+        <value>val</value>
+      </variable>
+    </family>
+    <family name="new">
+      <variable name="newvar" type="string" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="variable">vardynval1</param>
+      <target>newvar</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/20family_dynamic_calc2/00-base.xml b/tests/dictionaries/20family_dynamic_calc2/00-base.xml
index e12821b2..ee0aa2f6 100644
--- a/tests/dictionaries/20family_dynamic_calc2/00-base.xml
+++ b/tests/dictionaries/20family_dynamic_calc2/00-base.xml
@@ -1,26 +1,25 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.9">
-    <variables>
-        <family name='general'>
-            <variable name='varname' type='string' description="No change" multi="True">
-                <value>val1</value>
-                <value>val2</value>
-            </variable>
-        </family>
-        <family name='dyn' dynamic="varname">
-            <variable name='vardyn' type='string' description="No change">
-                <value>val</value>
-            </variable>
-        </family>
-        <family name='new'>
-            <variable name='newvar' type='string' description="No change"/>
-        </family>
-    </variables>
-    <constraints>
-        <condition name="hidden_if_in" source="newvar">
-            <param>non</param>
-            <target type="family">dyn</target>
-        </condition>
-    </constraints>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="varname" type="string" description="No change" multi="True">
+        <value>val1</value>
+        <value>val2</value>
+      </variable>
+    </family>
+    <family name="dyn" dynamic="varname">
+      <variable name="vardyn" type="string" description="No change">
+        <value>val</value>
+      </variable>
+    </family>
+    <family name="new">
+      <variable name="newvar" type="string" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="hidden_if_in" source="newvar">
+      <param>non</param>
+      <target type="family">dyn</target>
+    </condition>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/20family_dynamic_calc_suffix/00-base.xml b/tests/dictionaries/20family_dynamic_calc_suffix/00-base.xml
index 123a6ed5..50975fb7 100644
--- a/tests/dictionaries/20family_dynamic_calc_suffix/00-base.xml
+++ b/tests/dictionaries/20family_dynamic_calc_suffix/00-base.xml
@@ -1,26 +1,25 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.9">
-    <variables>
-        <family name='general'>
-            <variable name='varname' type='string' description="No change" multi="True">
-                <value>val1</value>
-                <value>val2</value>
-            </variable>
-        </family>
-        <family name='dyn' dynamic="varname">
-            <variable name='vardyn' type='string' description="No change">
-                <value>val</value>
-            </variable>
-        </family>
-        <family name='new'>
-            <variable name='newvar' type='string' description="No change"/>
-        </family>
-    </variables>
-    <constraints>
-        <fill name="calc_val">
-            <param type="suffix"/>
-	    <target>vardyn</target>
-        </fill>
-    </constraints>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="varname" type="string" description="No change" multi="True">
+        <value>val1</value>
+        <value>val2</value>
+      </variable>
+    </family>
+    <family name="dyn" dynamic="varname">
+      <variable name="vardyn" type="string" description="No change">
+        <value>val</value>
+      </variable>
+    </family>
+    <family name="new">
+      <variable name="newvar" type="string" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="suffix"/>
+      <target>vardyn</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/20family_dynamic_description/00-base.xml b/tests/dictionaries/20family_dynamic_description/00-base.xml
index a342a028..f9e96c21 100644
--- a/tests/dictionaries/20family_dynamic_description/00-base.xml
+++ b/tests/dictionaries/20family_dynamic_description/00-base.xml
@@ -1,15 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.9">
-    <variables>
-        <family name='general'>
-            <variable name='varname' type='string' description="No change" multi="True">
-                <value>val1</value>
-                <value>val2</value>
-            </variable>
-        </family>
-        <family name='dyn' description='Dyn ' dynamic="varname">
-            <variable name='vardyn' type='string' description="No change"/>
-        </family>
-    </variables>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="varname" type="string" description="No change" multi="True">
+        <value>val1</value>
+        <value>val2</value>
+      </variable>
+    </family>
+    <family name="dyn" description="Dyn " dynamic="varname">
+      <variable name="vardyn" type="string" description="No change"/>
+    </family>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/20family_dynamic_number/00-base.xml b/tests/dictionaries/20family_dynamic_number/00-base.xml
index d13b3552..158d63ee 100644
--- a/tests/dictionaries/20family_dynamic_number/00-base.xml
+++ b/tests/dictionaries/20family_dynamic_number/00-base.xml
@@ -1,26 +1,25 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.9">
-    <variables>
-        <family name='general'>
-            <variable name='varname' type='number' description="No change" multi="True">
-                <value>1</value>
-                <value>2</value>
-            </variable>
-        </family>
-        <family name='dyn' dynamic="varname">
-            <variable name='vardyn' type='string' description="No change">
-                <value>val</value>
-            </variable>
-        </family>
-        <family name='new'>
-            <variable name='newvar' type='string' description="No change"/>
-        </family>
-    </variables>
-    <constraints>
-        <fill name="calc_val">
-            <param type="variable">vardyn1</param>
-	    <target>newvar</target>
-        </fill>
-    </constraints>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="varname" type="number" description="No change" multi="True">
+        <value>1</value>
+        <value>2</value>
+      </variable>
+    </family>
+    <family name="dyn" dynamic="varname">
+      <variable name="vardyn" type="string" description="No change">
+        <value>val</value>
+      </variable>
+    </family>
+    <family name="new">
+      <variable name="newvar" type="string" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="variable">vardyn1</param>
+      <target>newvar</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/20family_empty/00-base.xml b/tests/dictionaries/20family_empty/00-base.xml
index ee74f399..5fbe1a4e 100644
--- a/tests/dictionaries/20family_empty/00-base.xml
+++ b/tests/dictionaries/20family_empty/00-base.xml
@@ -1,13 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" mode="basic">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="general2" help="family"/>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" mode="basic">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="general2" help="family"/>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/20family_hidden/00-base.xml b/tests/dictionaries/20family_hidden/00-base.xml
index 0e6d4337..1b623d24 100644
--- a/tests/dictionaries/20family_hidden/00-base.xml
+++ b/tests/dictionaries/20family_hidden/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/20family_hidden/01-base.xml b/tests/dictionaries/20family_hidden/01-base.xml
index f8ae611f..a4199c2c 100644
--- a/tests/dictionaries/20family_hidden/01-base.xml
+++ b/tests/dictionaries/20family_hidden/01-base.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general" hidden="True"/>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general" hidden="True"/>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/20family_mode/00-base.xml b/tests/dictionaries/20family_mode/00-base.xml
index 20053c69..fd89ec64 100644
--- a/tests/dictionaries/20family_mode/00-base.xml
+++ b/tests/dictionaries/20family_mode/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" mode="basic">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" mode="basic">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/20family_modeleadership/00-base.xml b/tests/dictionaries/20family_modeleadership/00-base.xml
index 890996b4..1587f257 100644
--- a/tests/dictionaries/20family_modeleadership/00-base.xml
+++ b/tests/dictionaries/20family_modeleadership/00-base.xml
@@ -1,22 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="leader" type="string" description="leader" multi="True"/>
-            <variable name="follower1" type="string" description="follower1"/>
-            <variable name="follower2" type="string" description="follower2" mode="basic"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <group leader="leader">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <family name="leader" description="leader" leadership="True">
+        <variable name="leader" type="string" description="leader" multi="True"/>
+        <variable name="follower1" type="string" description="follower1"/>
+        <variable name="follower2" type="string" description="follower2" mode="basic"/>
+      </family>
+    </family>
+  </variables>
+  <constraints/>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/20notemplating/00-base.xml b/tests/dictionaries/20notemplating/00-base.xml
index 67637a50..9208cd1d 100644
--- a/tests/dictionaries/20notemplating/00-base.xml
+++ b/tests/dictionaries/20notemplating/00-base.xml
@@ -1,19 +1,15 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-
-    <services>
-        <service name="test">
-            <file engine="none">/etc/file</file>
-        </service>
-    </services>
-
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <services>
+    <service name="test">
+      <file engine="none">/etc/file</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/20override/00-base.xml b/tests/dictionaries/20override/00-base.xml
index 010e2021..9a4092af 100644
--- a/tests/dictionaries/20override/00-base.xml
+++ b/tests/dictionaries/20override/00-base.xml
@@ -1,22 +1,18 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-
-    <services>
-        <service name="test">
-            <override/>
-        </service>
-        <service name="test2">
-            <override engine="jinja2"/>
-        </service>
-    </services>
-
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <services>
+    <service name="test">
+      <override/>
+    </service>
+    <service name="test2">
+      <override engine="jinja2"/>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/20override_no_templating/00-base.xml b/tests/dictionaries/20override_no_templating/00-base.xml
index ed5be665..1804060c 100644
--- a/tests/dictionaries/20override_no_templating/00-base.xml
+++ b/tests/dictionaries/20override_no_templating/00-base.xml
@@ -1,19 +1,15 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-
-    <services>
-        <service name="test">
-            <override engine="none"/>
-        </service>
-    </services>
-
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <services>
+    <service name="test">
+      <override engine="none"/>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/20override_source/00-base.xml b/tests/dictionaries/20override_source/00-base.xml
index 50ada9d0..826d9e37 100644
--- a/tests/dictionaries/20override_source/00-base.xml
+++ b/tests/dictionaries/20override_source/00-base.xml
@@ -1,19 +1,15 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-
-    <services>
-        <service name="test">
-            <override source="test2.service"/>
-        </service>
-    </services>
-
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <services>
+    <service name="test">
+      <override source="test2.service"/>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/21family_empty/00-base.xml b/tests/dictionaries/21family_empty/00-base.xml
index 64d577b0..b4ade21f 100644
--- a/tests/dictionaries/21family_empty/00-base.xml
+++ b/tests/dictionaries/21family_empty/00-base.xml
@@ -1,14 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="general1">
         </family>
-        <family name="general1">
-        </family>
-    </variables>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/30mandatory_withoutvalue/00-base.xml b/tests/dictionaries/30mandatory_withoutvalue/00-base.xml
index 301f4e9f..5b12cded 100644
--- a/tests/dictionaries/30mandatory_withoutvalue/00-base.xml
+++ b/tests/dictionaries/30mandatory_withoutvalue/00-base.xml
@@ -1,10 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" mandatory="True"/>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" mandatory="True"/>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/30mandatory_withoutvaluecalc/00-base.xml b/tests/dictionaries/30mandatory_withoutvaluecalc/00-base.xml
index cff37ba5..824ee0f9 100644
--- a/tests/dictionaries/30mandatory_withoutvaluecalc/00-base.xml
+++ b/tests/dictionaries/30mandatory_withoutvaluecalc/00-base.xml
@@ -1,16 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True"/>
-        </family>
-    </variables>
-    <constraints>
-        <fill name="calc_val">
-            <param>value</param>
-            <target>mode_conteneur_actif</target>
-        </fill>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param>value</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/30mandatory_withvalue/00-base.xml b/tests/dictionaries/30mandatory_withvalue/00-base.xml
index 8cb1d841..9c5e2427 100644
--- a/tests/dictionaries/30mandatory_withvalue/00-base.xml
+++ b/tests/dictionaries/30mandatory_withvalue/00-base.xml
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>value</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>value</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/30mandatory_withvaluecalc/00-base.xml b/tests/dictionaries/30mandatory_withvaluecalc/00-base.xml
index 49605379..4480774b 100644
--- a/tests/dictionaries/30mandatory_withvaluecalc/00-base.xml
+++ b/tests/dictionaries/30mandatory_withvaluecalc/00-base.xml
@@ -1,14 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change"/>
-        </family>
-    </variables>
-    <constraints>
-        <fill name="calc_val">
-            <param>value</param>
-            <target>mode_conteneur_actif</target>
-        </fill>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param>value</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/40condition_base/00-base.xml b/tests/dictionaries/40condition_base/00-base.xml
index 3136dfdb..5116ca99 100644
--- a/tests/dictionaries/40condition_base/00-base.xml
+++ b/tests/dictionaries/40condition_base/00-base.xml
@@ -1,29 +1,26 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="condition" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif1" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition optional="True" name="disabled_if_in" source="condition">
-            <param>oui</param>
-            <target type="variable">mode_conteneur_actif1</target>
-            <target type="variable" optional="True">mode_conteneur_actif2</target>
-        </condition>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition optional="True" name="disabled_if_in" source="condition">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif1</target>
+      <target type="variable" optional="True">mode_conteneur_actif2</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/40condition_base_add/00-base.xml b/tests/dictionaries/40condition_base_add/00-base.xml
index 3136dfdb..5116ca99 100644
--- a/tests/dictionaries/40condition_base_add/00-base.xml
+++ b/tests/dictionaries/40condition_base_add/00-base.xml
@@ -1,29 +1,26 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="condition" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif1" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition optional="True" name="disabled_if_in" source="condition">
-            <param>oui</param>
-            <target type="variable">mode_conteneur_actif1</target>
-            <target type="variable" optional="True">mode_conteneur_actif2</target>
-        </condition>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition optional="True" name="disabled_if_in" source="condition">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif1</target>
+      <target type="variable" optional="True">mode_conteneur_actif2</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/40condition_base_add/01-base.xml b/tests/dictionaries/40condition_base_add/01-base.xml
index 3218d12b..c7b3c65e 100644
--- a/tests/dictionaries/40condition_base_add/01-base.xml
+++ b/tests/dictionaries/40condition_base_add/01-base.xml
@@ -1,19 +1,15 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="condition" redefine="True" remove_condition="True"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition optional="True" name="disabled_if_in" source="condition">
-            <param>oui</param>
-            <target type="variable">mode_conteneur_actif1</target>
-            <target type="variable" optional="True">mode_conteneur_actif2</target>
-        </condition>
-    </constraints>
-
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="condition" redefine="True" remove_condition="True"/>
+    </family>
+  </variables>
+  <constraints>
+    <condition optional="True" name="disabled_if_in" source="condition">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif1</target>
+      <target type="variable" optional="True">mode_conteneur_actif2</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/40condition_fallback/00-base.xml b/tests/dictionaries/40condition_fallback/00-base.xml
index 8c7ae0ba..94ff4cc1 100644
--- a/tests/dictionaries/40condition_fallback/00-base.xml
+++ b/tests/dictionaries/40condition_fallback/00-base.xml
@@ -1,32 +1,29 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif1" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="disabled_family">
-            <variable name="mode_conteneur_actif3" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition optional="True" name="disabled_if_in" source="condition">
-            <param>oui</param>
-            <target type="variable">mode_conteneur_actif1</target>
-            <target type="variable" optional="True">mode_conteneur_actif2</target>
-            <target type="family">disabled_family</target>
-        </condition>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="disabled_family">
+      <variable name="mode_conteneur_actif3" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition optional="True" name="disabled_if_in" source="condition">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif1</target>
+      <target type="variable" optional="True">mode_conteneur_actif2</target>
+      <target type="family">disabled_family</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/40condition_optional/00-base.xml b/tests/dictionaries/40condition_optional/00-base.xml
index 99522be3..ed408f6a 100644
--- a/tests/dictionaries/40condition_optional/00-base.xml
+++ b/tests/dictionaries/40condition_optional/00-base.xml
@@ -1,26 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="condition" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif1" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition optional="True" name="disabled_if_in" source="condition">
-            <param>oui</param>
-            <target type="variable">mode_conteneur_actif1</target>
-            <target type="variable" optional="True">mode_conteneur_actif2</target>
-        </condition>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition optional="True" name="disabled_if_in" source="condition">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif1</target>
+      <target type="variable" optional="True">mode_conteneur_actif2</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/40condition_optional_empty/00-base.xml b/tests/dictionaries/40condition_optional_empty/00-base.xml
index da22f00b..99c10ad6 100644
--- a/tests/dictionaries/40condition_optional_empty/00-base.xml
+++ b/tests/dictionaries/40condition_optional_empty/00-base.xml
@@ -1,25 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="condition" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif1" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition optional="True" name="disabled_if_in" source="condition">
-            <param>oui</param>
-            <target type="variable" optional="True">mode_conteneur_actif2</target>
-        </condition>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition optional="True" name="disabled_if_in" source="condition">
+      <param>oui</param>
+      <target type="variable" optional="True">mode_conteneur_actif2</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/40condition_optional_family/00-base.xml b/tests/dictionaries/40condition_optional_family/00-base.xml
index 880841b0..43de38b6 100644
--- a/tests/dictionaries/40condition_optional_family/00-base.xml
+++ b/tests/dictionaries/40condition_optional_family/00-base.xml
@@ -1,19 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <variable name="condition" type="boolean"/>
-        <family name="general">
-            <variable name="my_variable"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_in" source="condition">
-            <param>True</param>
-            <target type="family" optional="True">general</target>
-            <target type="family" optional="True">general2</target>
-        </condition>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <variable name="condition" type="boolean"/>
+    <family name="general">
+      <variable name="my_variable"/>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>True</param>
+      <target type="family" optional="True">general</target>
+      <target type="family" optional="True">general2</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/40empty_param/00_base.xml b/tests/dictionaries/40empty_param/00_base.xml
index 155081f5..3593fc22 100644
--- a/tests/dictionaries/40empty_param/00_base.xml
+++ b/tests/dictionaries/40empty_param/00_base.xml
@@ -1,22 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <services/>
-
-    <variables>
-        <family name="proxy_authentifie" description="proxy authentifié">
-            <variable name="toto1" type="port" description="Port d'écoute du proxy" mode="expert">
+<rougail version="0.10">
+  <services/>
+  <variables>
+    <family name="proxy_authentifie" description="proxy authentifié">
+      <variable name="toto1" type="port" description="Port d'écoute du proxy" mode="expert">
             </variable>
-            <variable name="toto2" type="port" description="Port d'écoute du proxy NTLM" mode="expert">
-                <value>3127</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_multi_condition">
-	    <param type='nil'/>
-            <target>toto1</target>
-        </fill>
-    </constraints>
-
+      <variable name="toto2" type="port" description="Port d'écoute du proxy NTLM" mode="expert">
+        <value>3127</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_multi_condition">
+      <param type="nil"/>
+      <target>toto1</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/40empty_param2/00_base.xml b/tests/dictionaries/40empty_param2/00_base.xml
index dd301fda..ad8ad7bc 100644
--- a/tests/dictionaries/40empty_param2/00_base.xml
+++ b/tests/dictionaries/40empty_param2/00_base.xml
@@ -1,22 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <services/>
-
-    <variables>
-        <family name="proxy_authentifie" description="proxy authentifié">
-            <variable name="toto1" type="port" description="Port d'écoute du proxy" mode="expert">
+<rougail version="0.10">
+  <services/>
+  <variables>
+    <family name="proxy_authentifie" description="proxy authentifié">
+      <variable name="toto1" type="port" description="Port d'écoute du proxy" mode="expert">
             </variable>
-            <variable name="toto2" type="port" description="Port d'écoute du proxy NTLM" mode="expert">
-                <value>3127</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_multi_condition">
-	    <param name="value" type='nil'/>
-	    <target>toto1</target>
-        </fill>
-    </constraints>
-
+      <variable name="toto2" type="port" description="Port d'écoute du proxy NTLM" mode="expert">
+        <value>3127</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_multi_condition">
+      <param name="value" type="nil"/>
+      <target>toto1</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/40hidden_if_in_group_fallback/00-base.xml b/tests/dictionaries/40hidden_if_in_group_fallback/00-base.xml
index 8fad142b..11fd9018 100644
--- a/tests/dictionaries/40hidden_if_in_group_fallback/00-base.xml
+++ b/tests/dictionaries/40hidden_if_in_group_fallback/00-base.xml
@@ -1,28 +1,24 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif1" type="string" description="No change" multi="True">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition optional="True" name="hidden_if_in" source="condition">
-            <param>oui</param>
-            <target type="variable">mode_conteneur_actif1</target>
-        </condition>
-        <group leader="mode_conteneur_actif1">
-            <follower>mode_conteneur_actif2</follower>
-        </group>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <family name="mode_conteneur_actif1" description="No change" leadership="True">
+        <variable name="mode_conteneur_actif1" type="string" description="No change" multi="True">
+          <value>non</value>
+        </variable>
+        <variable name="mode_conteneur_actif2" type="string" description="No change">
+          <value>non</value>
+        </variable>
+      </family>
+    </family>
+  </variables>
+  <constraints>
+    <condition optional="True" name="hidden_if_in" source="condition">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif1</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/40ifin_leadership/00-base.xml b/tests/dictionaries/40ifin_leadership/00-base.xml
index f2c75550..bd22f01d 100644
--- a/tests/dictionaries/40ifin_leadership/00-base.xml
+++ b/tests/dictionaries/40ifin_leadership/00-base.xml
@@ -1,27 +1,24 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="condition" type="string" description="condition">
-                <value>oui</value>
-            </variable>
-            <variable name="leader" type="string" description="leader" multi="True"/>
-            <variable name="follower1" type="string" description="follower1"/>
-            <variable name="follower2" type="string" description="follower2"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <group leader="leader">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-        <condition name="disabled_if_in" source="condition">
-            <param>oui</param>
-            <target type="variable">follower1</target>
-        </condition>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="condition" type="string" description="condition">
+        <value>oui</value>
+      </variable>
+      <family name="leader" description="leader" leadership="True">
+        <variable name="leader" type="string" description="leader" multi="True"/>
+        <variable name="follower1" type="string" description="follower1"/>
+        <variable name="follower2" type="string" description="follower2"/>
+      </family>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>oui</param>
+      <target type="variable">follower1</target>
+    </condition>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/40ifin_leadershipauto/00-base.xml b/tests/dictionaries/40ifin_leadershipauto/00-base.xml
index 326da930..71ec860c 100644
--- a/tests/dictionaries/40ifin_leadershipauto/00-base.xml
+++ b/tests/dictionaries/40ifin_leadershipauto/00-base.xml
@@ -1,37 +1,35 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <services>
-        <service name='test'>
-            <file>/etc/mailname</file>
-        </service>
-    </services>
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="condition" type="string" description="condition">
-                <value>oui</value>
-            </variable>
-            <variable name="leader" type="string" description="leader" multi="True">
-                <value>a</value>
-            </variable>
-            <variable name="follower1" type="string" description="follower1" hidden="True"/>
-            <variable name="follower2" type="string" description="follower2"/>
-        </family>
-    </variables>
-    <constraints>
-        <group leader="leader">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-        <fill name="calc_val">
-            <param name="valeur">valfill</param>
-	    <target>follower1</target>
-        </fill>
-        <condition name="disabled_if_in" source="condition">
-            <param>oui</param>
-            <target type="variable">follower1</target>
-        </condition>
-    </constraints>
+<rougail version="0.10">
+  <services>
+    <service name="test">
+      <file>/etc/mailname</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="condition" type="string" description="condition">
+        <value>oui</value>
+      </variable>
+      <family name="leader" description="leader" leadership="True">
+        <variable name="leader" type="string" description="leader" multi="True">
+          <value>a</value>
+        </variable>
+        <variable name="follower1" type="string" description="follower1" hidden="True"/>
+        <variable name="follower2" type="string" description="follower2"/>
+      </family>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valfill</param>
+      <target>follower1</target>
+    </fill>
+    <condition name="disabled_if_in" source="condition">
+      <param>oui</param>
+      <target type="variable">follower1</target>
+    </condition>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/40ifin_leadershipauto_follower/00-base.xml b/tests/dictionaries/40ifin_leadershipauto_follower/00-base.xml
index b7db4590..cc748bbc 100644
--- a/tests/dictionaries/40ifin_leadershipauto_follower/00-base.xml
+++ b/tests/dictionaries/40ifin_leadershipauto_follower/00-base.xml
@@ -1,39 +1,37 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <services>
-        <service name='test'>
-            <file>/etc/mailname</file>
-            <file engine="jinja2">/etc/mailname2</file>
-        </service>
-    </services>
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="condition" type="string" description="condition">
-                <value>oui</value>
-            </variable>
-            <variable name="leader" type="string" description="leader" multi="True">
-                <value>a</value>
-                <value>b</value>
-            </variable>
-            <variable name="follower1" type="string" description="follower1"/>
-            <variable name="follower2" type="string" description="follower2"/>
-        </family>
-    </variables>
-    <constraints>
-        <group leader="leader">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-	<fill name="calc_val">
-            <param name="valeur">valfill</param>
-	    <target>follower1</target>
-        </fill>
-        <condition name="disabled_if_in" source="leader">
-            <param>a</param>
-            <target type="variable">follower1</target>
-        </condition>
-    </constraints>
+<rougail version="0.10">
+  <services>
+    <service name="test">
+      <file>/etc/mailname</file>
+      <file engine="jinja2">/etc/mailname2</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="condition" type="string" description="condition">
+        <value>oui</value>
+      </variable>
+      <family name="leader" description="leader" leadership="True">
+        <variable name="leader" type="string" description="leader" multi="True">
+          <value>a</value>
+          <value>b</value>
+        </variable>
+        <variable name="follower1" type="string" description="follower1"/>
+        <variable name="follower2" type="string" description="follower2"/>
+      </family>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valfill</param>
+      <target>follower1</target>
+    </fill>
+    <condition name="disabled_if_in" source="leader">
+      <param>a</param>
+      <target type="variable">follower1</target>
+    </condition>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/40ifin_multi/00-base.xml b/tests/dictionaries/40ifin_multi/00-base.xml
index a4a6d391..cf8956d4 100644
--- a/tests/dictionaries/40ifin_multi/00-base.xml
+++ b/tests/dictionaries/40ifin_multi/00-base.xml
@@ -1,31 +1,28 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="general2" hidden="True">
-            <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif3" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_in" source="mode_conteneur_actif">
-            <param>oui</param>
-            <target type="variable">mode_conteneur_actif3</target>
-        </condition>
-        <condition name="disabled_if_in" source="mode_conteneur_actif2">
-            <param>oui</param>
-            <target type="variable">mode_conteneur_actif3</target>
-        </condition>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="general2" hidden="True">
+      <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif3" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="mode_conteneur_actif">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif3</target>
+    </condition>
+    <condition name="disabled_if_in" source="mode_conteneur_actif2">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif3</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/40ifin_multi2/00-base.xml b/tests/dictionaries/40ifin_multi2/00-base.xml
index 498b2c08..0a10db95 100644
--- a/tests/dictionaries/40ifin_multi2/00-base.xml
+++ b/tests/dictionaries/40ifin_multi2/00-base.xml
@@ -1,31 +1,28 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="general2" hidden="True">
-            <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
-                <value>oui</value>
-            </variable>
-            <variable name="mode_conteneur_actif3" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_in" source="mode_conteneur_actif">
-            <param>oui</param>
-            <target type="variable">mode_conteneur_actif3</target>
-        </condition>
-        <condition name="disabled_if_in" source="mode_conteneur_actif2">
-            <param>oui</param>
-            <target type="variable">mode_conteneur_actif3</target>
-        </condition>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="general2" hidden="True">
+      <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
+        <value>oui</value>
+      </variable>
+      <variable name="mode_conteneur_actif3" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="mode_conteneur_actif">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif3</target>
+    </condition>
+    <condition name="disabled_if_in" source="mode_conteneur_actif2">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif3</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/40ifin_validenum/00-base.xml b/tests/dictionaries/40ifin_validenum/00-base.xml
index 5311ee9d..3fc52d08 100644
--- a/tests/dictionaries/40ifin_validenum/00-base.xml
+++ b/tests/dictionaries/40ifin_validenum/00-base.xml
@@ -1,34 +1,32 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="general2" hidden="True">
-            <variable name="mode_conteneur_actif2" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif3" type="string" description="No change"/>
-        </family>
-    </variables>
-    <constraints>
-        <check name="valid_enum">
-            <param>a</param>
-            <param>b</param>
-            <param>c</param>
-            <target>mode_conteneur_actif3</target>
-        </check>
-        <condition name="disabled_if_in" source="mode_conteneur_actif3">
-            <param>d</param>
-            <target type="variable">mode_conteneur_actif</target>
-        </condition>
-        <condition name="disabled_if_not_in" source="mode_conteneur_actif3">
-            <param>d</param>
-            <target type="variable">mode_conteneur_actif2</target>
-        </condition>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="general2" hidden="True">
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif3" type="string" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>a</param>
+      <param>b</param>
+      <param>c</param>
+      <target>mode_conteneur_actif3</target>
+    </check>
+    <condition name="disabled_if_in" source="mode_conteneur_actif3">
+      <param>d</param>
+      <target type="variable">mode_conteneur_actif</target>
+    </condition>
+    <condition name="disabled_if_not_in" source="mode_conteneur_actif3">
+      <param>d</param>
+      <target type="variable">mode_conteneur_actif2</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/45extra_without_family/00-base.xml b/tests/dictionaries/45extra_without_family/00-base.xml
index 5a64ea26..5996f6a6 100644
--- a/tests/dictionaries/45extra_without_family/00-base.xml
+++ b/tests/dictionaries/45extra_without_family/00-base.xml
@@ -1,15 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <services>
-        <service name="test">
-            <file>/etc/file</file>
-        </service>
-    </services>
-    <variables>
-        <variable name="my_var">
-            <value>rougail</value>
-        </variable>
-    </variables>
+<rougail version="0.10">
+  <services>
+    <service name="test">
+      <file>/etc/file</file>
+    </service>
+  </services>
+  <variables>
+    <variable name="my_var">
+      <value>rougail</value>
+    </variable>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/45extra_without_family/extra_dirs/extra/00-base.xml b/tests/dictionaries/45extra_without_family/extra_dirs/extra/00-base.xml
index 120d11a2..314c2d3a 100644
--- a/tests/dictionaries/45extra_without_family/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/45extra_without_family/extra_dirs/extra/00-base.xml
@@ -1,13 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.9">
-    <variables>
-        <variable name="my_var"/>
-    </variables>
-    <constraints>
-        <fill name='calc_multi_condition'>
-            <param>non</param>
-            <target>extra.my_var</target>
-        </fill>
-    </constraints>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <variables>
+    <variable name="my_var"/>
+  </variables>
+  <constraints>
+    <fill name="calc_multi_condition">
+      <param>non</param>
+      <target>extra.my_var</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/45multi_family/00-base.xml b/tests/dictionaries/45multi_family/00-base.xml
index dfe14720..79a3eb1b 100644
--- a/tests/dictionaries/45multi_family/00-base.xml
+++ b/tests/dictionaries/45multi_family/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="base">
-            <family name="subfamily">
-                <variable name="variable"/>
-            </family>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="base">
+      <family name="subfamily">
+        <variable name="variable"/>
+      </family>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/45multi_family_basic/00-base.xml b/tests/dictionaries/45multi_family_basic/00-base.xml
index 8b009a15..49af9854 100644
--- a/tests/dictionaries/45multi_family_basic/00-base.xml
+++ b/tests/dictionaries/45multi_family_basic/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="base">
-            <family name="subfamily">
-                <variable name="variable" mode="basic"/>
-            </family>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="base">
+      <family name="subfamily">
+        <variable name="variable" mode="basic"/>
+      </family>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/45multi_family_expert/00-base.xml b/tests/dictionaries/45multi_family_expert/00-base.xml
index 72c06f5e..35f954bf 100644
--- a/tests/dictionaries/45multi_family_expert/00-base.xml
+++ b/tests/dictionaries/45multi_family_expert/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="base" mode="expert">
-            <family name="subfamily">
-                <variable name="variable"/>
-            </family>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="base" mode="expert">
+      <family name="subfamily">
+        <variable name="variable"/>
+      </family>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/45multi_family_order/00-base.xml b/tests/dictionaries/45multi_family_order/00-base.xml
index cd0c86e4..2c8f8eeb 100644
--- a/tests/dictionaries/45multi_family_order/00-base.xml
+++ b/tests/dictionaries/45multi_family_order/00-base.xml
@@ -1,15 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <variable name="variable1"/>
-        <family name="base">
-            <variable name="variable2"/>
-            <family name="subfamily">
-                <variable name="variable3"/>
-            </family>
-            <variable name="variable4"/>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <variable name="variable1"/>
+    <family name="base">
+      <variable name="variable2"/>
+      <family name="subfamily">
+        <variable name="variable3"/>
+      </family>
+      <variable name="variable4"/>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/45without_family/00-base.xml b/tests/dictionaries/45without_family/00-base.xml
index f35c3861..b9c3b7dd 100644
--- a/tests/dictionaries/45without_family/00-base.xml
+++ b/tests/dictionaries/45without_family/00-base.xml
@@ -1,8 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <variable name="variable"/>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <variable name="variable"/>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/50exists_exists/00-base.xml b/tests/dictionaries/50exists_exists/00-base.xml
index 10cb29e4..c4eb6749 100644
--- a/tests/dictionaries/50exists_exists/00-base.xml
+++ b/tests/dictionaries/50exists_exists/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Description" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Description" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/50exists_exists/01-base.xml b/tests/dictionaries/50exists_exists/01-base.xml
index 00c05dad..e5e2013a 100644
--- a/tests/dictionaries/50exists_exists/01-base.xml
+++ b/tests/dictionaries/50exists_exists/01-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="New description" exists="False">
-                <value>oui</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="New description" exists="False">
+        <value>oui</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/50redefine_description/00-base.xml b/tests/dictionaries/50redefine_description/00-base.xml
index 9ea33030..210875c0 100644
--- a/tests/dictionaries/50redefine_description/00-base.xml
+++ b/tests/dictionaries/50redefine_description/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/50redefine_description/01-redefine.xml b/tests/dictionaries/50redefine_description/01-redefine.xml
index 0ee2789b..6983ceea 100644
--- a/tests/dictionaries/50redefine_description/01-redefine.xml
+++ b/tests/dictionaries/50redefine_description/01-redefine.xml
@@ -1,10 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" redefine="True" description="Redefined"/>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" redefine="True" description="Redefined"/>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/51exists_nonexists/00-base.xml b/tests/dictionaries/51exists_nonexists/00-base.xml
index 68826787..f3648466 100644
--- a/tests/dictionaries/51exists_nonexists/00-base.xml
+++ b/tests/dictionaries/51exists_nonexists/00-base.xml
@@ -1,15 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Description">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif1" type="string" description="Description" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Description">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="Description" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/51exists_nonexists/01-base.xml b/tests/dictionaries/51exists_nonexists/01-base.xml
index fd4dd26d..221e7e6a 100644
--- a/tests/dictionaries/51exists_nonexists/01-base.xml
+++ b/tests/dictionaries/51exists_nonexists/01-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif2" type="string" description="New description" exists="False">
-                <value>oui</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif2" type="string" description="New description" exists="False">
+        <value>oui</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/51exists_redefine/00-base.xml b/tests/dictionaries/51exists_redefine/00-base.xml
index 10cb29e4..c4eb6749 100644
--- a/tests/dictionaries/51exists_redefine/00-base.xml
+++ b/tests/dictionaries/51exists_redefine/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Description" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Description" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/51exists_redefine/01-base.xml b/tests/dictionaries/51exists_redefine/01-base.xml
index 73028b97..6da6ec58 100644
--- a/tests/dictionaries/51exists_redefine/01-base.xml
+++ b/tests/dictionaries/51exists_redefine/01-base.xml
@@ -1,15 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" redefine="True" exists="True">
-                <value>oui</value>
-            </variable>
-            <variable name="mode_conteneur_actif1" redefine="True" exists="True">
-                <value>oui</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" redefine="True" exists="True">
+        <value>oui</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" redefine="True" exists="True">
+        <value>oui</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/51redefine_auto/00-base.xml b/tests/dictionaries/51redefine_auto/00-base.xml
index 9155e418..4e1ec84c 100644
--- a/tests/dictionaries/51redefine_auto/00-base.xml
+++ b/tests/dictionaries/51redefine_auto/00-base.xml
@@ -1,19 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param name="valeur">non</param>
-            <target>mode_conteneur_actif</target>
-        </fill>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">non</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/51redefine_auto/01-base.xml b/tests/dictionaries/51redefine_auto/01-base.xml
index c45f1e0a..a0f8ec9d 100644
--- a/tests/dictionaries/51redefine_auto/01-base.xml
+++ b/tests/dictionaries/51redefine_auto/01-base.xml
@@ -1,15 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" redefine="True"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="concat">
-            <param name="valeur">non</param>
-            <target>mode_conteneur_actif</target>
-        </fill>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" redefine="True"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="concat">
+      <param name="valeur">non</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/51redefine_autofill/00-base.xml b/tests/dictionaries/51redefine_autofill/00-base.xml
index e34cc1cb..da431cf7 100644
--- a/tests/dictionaries/51redefine_autofill/00-base.xml
+++ b/tests/dictionaries/51redefine_autofill/00-base.xml
@@ -1,19 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param name="valeur">oui</param>
-            <target>mode_conteneur_actif</target>
-        </fill>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">oui</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/51redefine_autofill/01-base.xml b/tests/dictionaries/51redefine_autofill/01-base.xml
index 741e0d31..d49c297d 100644
--- a/tests/dictionaries/51redefine_autofill/01-base.xml
+++ b/tests/dictionaries/51redefine_autofill/01-base.xml
@@ -1,15 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" redefine="True" hidden="False"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="concat">
-            <param name="valeur">non</param>
-            <target>mode_conteneur_actif</target>
-        </fill>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" redefine="True" hidden="False"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="concat">
+      <param name="valeur">non</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/51redefine_family/00-base.xml b/tests/dictionaries/51redefine_family/00-base.xml
index 5eeb4f94..1ad57e1a 100644
--- a/tests/dictionaries/51redefine_family/00-base.xml
+++ b/tests/dictionaries/51redefine_family/00-base.xml
@@ -1,24 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="general2" hidden="True">
-            <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_in" source="mode_conteneur_actif">
-            <param>oui</param>
-            <target type="family">general2</target>
-        </condition>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="general2" hidden="True">
+      <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="mode_conteneur_actif">
+      <param>oui</param>
+      <target type="family">general2</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/51redefine_family/01-base.xml b/tests/dictionaries/51redefine_family/01-base.xml
index a7d68103..60d44472 100644
--- a/tests/dictionaries/51redefine_family/01-base.xml
+++ b/tests/dictionaries/51redefine_family/01-base.xml
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" redefine="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" redefine="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/51redefine_fill/00-base.xml b/tests/dictionaries/51redefine_fill/00-base.xml
index e34cc1cb..da431cf7 100644
--- a/tests/dictionaries/51redefine_fill/00-base.xml
+++ b/tests/dictionaries/51redefine_fill/00-base.xml
@@ -1,19 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param name="valeur">oui</param>
-            <target>mode_conteneur_actif</target>
-        </fill>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">oui</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/51redefine_fill/01-base.xml b/tests/dictionaries/51redefine_fill/01-base.xml
index c45f1e0a..a0f8ec9d 100644
--- a/tests/dictionaries/51redefine_fill/01-base.xml
+++ b/tests/dictionaries/51redefine_fill/01-base.xml
@@ -1,15 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" redefine="True"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="concat">
-            <param name="valeur">non</param>
-            <target>mode_conteneur_actif</target>
-        </fill>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" redefine="True"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="concat">
+      <param name="valeur">non</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/51redefine_fillauto/00-base.xml b/tests/dictionaries/51redefine_fillauto/00-base.xml
index 75cf7960..99a545f6 100644
--- a/tests/dictionaries/51redefine_fillauto/00-base.xml
+++ b/tests/dictionaries/51redefine_fillauto/00-base.xml
@@ -1,19 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param name="valeur">oui</param>
-            <target>mode_conteneur_actif</target>
-        </fill>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">oui</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/51redefine_fillauto/01-base.xml b/tests/dictionaries/51redefine_fillauto/01-base.xml
index 6e85da2f..c58ca38d 100644
--- a/tests/dictionaries/51redefine_fillauto/01-base.xml
+++ b/tests/dictionaries/51redefine_fillauto/01-base.xml
@@ -1,15 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" redefine="True" hidden="True"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="concat">
-            <param name="valeur">non</param>
-            <target>mode_conteneur_actif</target>
-        </fill>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" redefine="True" hidden="True"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="concat">
+      <param name="valeur">non</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/51redefine_help/00-base.xml b/tests/dictionaries/51redefine_help/00-base.xml
index 7d3c5409..be229ae7 100644
--- a/tests/dictionaries/51redefine_help/00-base.xml
+++ b/tests/dictionaries/51redefine_help/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general" help="redefine help family">
-            <variable name="mode_conteneur_actif" type="string" description="redefine help" hidden="True" help="redefine help">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general" help="redefine help family">
+      <variable name="mode_conteneur_actif" type="string" description="redefine help" hidden="True" help="redefine help">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/51redefine_help/01-base.xml b/tests/dictionaries/51redefine_help/01-base.xml
index 9a3aab1e..93a3aefe 100644
--- a/tests/dictionaries/51redefine_help/01-base.xml
+++ b/tests/dictionaries/51redefine_help/01-base.xml
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general" help="redefine help family ok">
-            <variable name="mode_conteneur_actif" redefine="True" hidden="True" help="redefine help ok">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general" help="redefine help family ok">
+      <variable name="mode_conteneur_actif" redefine="True" hidden="True" help="redefine help ok">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/51redefine_hidden/00-base.xml b/tests/dictionaries/51redefine_hidden/00-base.xml
index 4708db54..9817d707 100644
--- a/tests/dictionaries/51redefine_hidden/00-base.xml
+++ b/tests/dictionaries/51redefine_hidden/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Redefine hidden">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Redefine hidden">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/51redefine_hidden/01-redefine.xml b/tests/dictionaries/51redefine_hidden/01-redefine.xml
index 07359c71..87efadfb 100644
--- a/tests/dictionaries/51redefine_hidden/01-redefine.xml
+++ b/tests/dictionaries/51redefine_hidden/01-redefine.xml
@@ -1,10 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" redefine="True" hidden="True"/>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" redefine="True" hidden="True"/>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/51redefine_multi/00-base.xml b/tests/dictionaries/51redefine_multi/00-base.xml
index 9ea33030..210875c0 100644
--- a/tests/dictionaries/51redefine_multi/00-base.xml
+++ b/tests/dictionaries/51redefine_multi/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/51redefine_multi/01-redefine.xml b/tests/dictionaries/51redefine_multi/01-redefine.xml
index fee1b09c..b8ef4a86 100644
--- a/tests/dictionaries/51redefine_multi/01-redefine.xml
+++ b/tests/dictionaries/51redefine_multi/01-redefine.xml
@@ -1,10 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" redefine="True" multi="True"/>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" redefine="True" multi="True"/>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/51redefine_remove_check/00-base.xml b/tests/dictionaries/51redefine_remove_check/00-base.xml
index d6301851..12f9652c 100644
--- a/tests/dictionaries/51redefine_remove_check/00-base.xml
+++ b/tests/dictionaries/51redefine_remove_check/00-base.xml
@@ -1,19 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_enum">
-            <param>a</param>
-            <param>b</param>
-            <param>c</param>
-            <target>mode_conteneur_actif</target>
-        </check>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>a</param>
+      <param>b</param>
+      <param>c</param>
+      <target>mode_conteneur_actif</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/51redefine_remove_check/01-base.xml b/tests/dictionaries/51redefine_remove_check/01-base.xml
index 1d0aa09e..f092eaff 100644
--- a/tests/dictionaries/51redefine_remove_check/01-base.xml
+++ b/tests/dictionaries/51redefine_remove_check/01-base.xml
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" redefine="True" remove_check="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" redefine="True" remove_check="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/51redefine_remove_condition/00-base.xml b/tests/dictionaries/51redefine_remove_condition/00-base.xml
index ff3f67bd..20771d5d 100644
--- a/tests/dictionaries/51redefine_remove_condition/00-base.xml
+++ b/tests/dictionaries/51redefine_remove_condition/00-base.xml
@@ -1,29 +1,26 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="condition" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif1" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_in" source="condition">
-            <param>oui</param>
-            <target type="variable">mode_conteneur_actif1</target>
-            <target type="variable">mode_conteneur_actif2</target>
-        </condition>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif1</target>
+      <target type="variable">mode_conteneur_actif2</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/51redefine_remove_condition/01-base.xml b/tests/dictionaries/51redefine_remove_condition/01-base.xml
index be01a6ec..a7251ff5 100644
--- a/tests/dictionaries/51redefine_remove_condition/01-base.xml
+++ b/tests/dictionaries/51redefine_remove_condition/01-base.xml
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="condition" redefine="True" remove_condition="True"/>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="condition" redefine="True" remove_condition="True"/>
+    </family>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/51redefine_removecondition_nonautofreeze/00-base.xml b/tests/dictionaries/51redefine_removecondition_nonautofreeze/00-base.xml
index 3b1f3b45..f983b0d0 100644
--- a/tests/dictionaries/51redefine_removecondition_nonautofreeze/00-base.xml
+++ b/tests/dictionaries/51redefine_removecondition_nonautofreeze/00-base.xml
@@ -1,30 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <variable name="my_var" auto_freeze="True">
-            <value>no</value>
-        </variable>
-        <variable name="condition">
-            <value>no</value>
-        </variable>
-        <variable name="my_var1" hidden="True">
-            <value>no</value>
-        </variable>
-        <variable name="my_var2">
-            <value>no</value>
-        </variable>
-        <variable name="server_deployed" type="boolean" hidden="True">
-            <value>False</value>
-        </variable>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_in" source="condition">
-            <param>yes</param>
-            <target type="variable">my_var1</target>
-            <target type="variable">my_var2</target>
-        </condition>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <variable name="my_var" auto_freeze="True">
+      <value>no</value>
+    </variable>
+    <variable name="condition">
+      <value>no</value>
+    </variable>
+    <variable name="my_var1" hidden="True">
+      <value>no</value>
+    </variable>
+    <variable name="my_var2">
+      <value>no</value>
+    </variable>
+    <variable name="server_deployed" type="boolean" hidden="True">
+      <value>False</value>
+    </variable>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>yes</param>
+      <target type="variable">my_var1</target>
+      <target type="variable">my_var2</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/51redefine_removecondition_nonautofreeze/01-base.xml b/tests/dictionaries/51redefine_removecondition_nonautofreeze/01-base.xml
index e9ee2115..138dccf5 100644
--- a/tests/dictionaries/51redefine_removecondition_nonautofreeze/01-base.xml
+++ b/tests/dictionaries/51redefine_removecondition_nonautofreeze/01-base.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <variable name="condition" redefine="True" remove_condition="True"/>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <variable name="condition" redefine="True" remove_condition="True"/>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/51redefine_type/00-base.xml b/tests/dictionaries/51redefine_type/00-base.xml
index 9ea33030..210875c0 100644
--- a/tests/dictionaries/51redefine_type/00-base.xml
+++ b/tests/dictionaries/51redefine_type/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/51redefine_type/01-redefine.xml b/tests/dictionaries/51redefine_type/01-redefine.xml
index 930995cc..2c49a5b5 100644
--- a/tests/dictionaries/51redefine_type/01-redefine.xml
+++ b/tests/dictionaries/51redefine_type/01-redefine.xml
@@ -1,10 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" redefine="True" type="number"/>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" redefine="True" type="number"/>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/51redefine_validenum/00-base.xml b/tests/dictionaries/51redefine_validenum/00-base.xml
index b2933fe2..2e2720f2 100644
--- a/tests/dictionaries/51redefine_validenum/00-base.xml
+++ b/tests/dictionaries/51redefine_validenum/00-base.xml
@@ -1,18 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True"/>
-        </family>
-    </variables>
-    <constraints>
-        <check name="valid_enum">
-            <param>a</param>
-            <param>b</param>
-            <param>c</param>
-            <target>mode_conteneur_actif</target>
-        </check>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>a</param>
+      <param>b</param>
+      <param>c</param>
+      <target>mode_conteneur_actif</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/51redefine_validenum/01-redefine.xml b/tests/dictionaries/51redefine_validenum/01-redefine.xml
index fce1d510..c8610c32 100644
--- a/tests/dictionaries/51redefine_validenum/01-redefine.xml
+++ b/tests/dictionaries/51redefine_validenum/01-redefine.xml
@@ -1,17 +1,15 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" redefine="True" remove_check="True"/>
-        </family>
-    </variables>
-    <constraints>
-        <check name="valid_enum">
-            <param>a</param>
-            <param>b</param>
-            <target>mode_conteneur_actif</target>
-        </check>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" redefine="True" remove_check="True"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>a</param>
+      <param>b</param>
+      <target>mode_conteneur_actif</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/51redefine_value/00-base.xml b/tests/dictionaries/51redefine_value/00-base.xml
index 305b1d08..a1fad14f 100644
--- a/tests/dictionaries/51redefine_value/00-base.xml
+++ b/tests/dictionaries/51redefine_value/00-base.xml
@@ -1,15 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Redefine value">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif1" type="string" description="Redefine value" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Redefine value">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="Redefine value" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/51redefine_value/01-redefine.xml b/tests/dictionaries/51redefine_value/01-redefine.xml
index 2d384c41..0ce435be 100644
--- a/tests/dictionaries/51redefine_value/01-redefine.xml
+++ b/tests/dictionaries/51redefine_value/01-redefine.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif1" redefine="True">
-                <value>oui</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif1" redefine="True">
+        <value>oui</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/51remove_fill/00-base.xml b/tests/dictionaries/51remove_fill/00-base.xml
index 725d6f15..1c504605 100644
--- a/tests/dictionaries/51remove_fill/00-base.xml
+++ b/tests/dictionaries/51remove_fill/00-base.xml
@@ -1,22 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>oui</value>
-            </variable>
-            <variable name="mode_conteneur_actif1" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param type="variable">mode_conteneur_actif1</param>
-            <target>mode_conteneur_actif</target>
-        </fill>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>oui</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="variable">mode_conteneur_actif1</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/51remove_fill/01-base.xml b/tests/dictionaries/51remove_fill/01-base.xml
index f607fb19..88d820af 100644
--- a/tests/dictionaries/51remove_fill/01-base.xml
+++ b/tests/dictionaries/51remove_fill/01-base.xml
@@ -1,10 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" redefine="True" remove_fill="True"/>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" redefine="True" remove_fill="True"/>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/52exists_redefine/00-base.xml b/tests/dictionaries/52exists_redefine/00-base.xml
index 39bc3a7b..8f66f70b 100644
--- a/tests/dictionaries/52exists_redefine/00-base.xml
+++ b/tests/dictionaries/52exists_redefine/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Description" hidden="True">
-                <value>oui</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Description" hidden="True">
+        <value>oui</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/52exists_redefine/01-base.xml b/tests/dictionaries/52exists_redefine/01-base.xml
index 1dbe1da7..8ad4e861 100644
--- a/tests/dictionaries/52exists_redefine/01-base.xml
+++ b/tests/dictionaries/52exists_redefine/01-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" description="New description" exists="False" redefine="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" description="New description" exists="False" redefine="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/60action_external/00-base.xml b/tests/dictionaries/60action_external/00-base.xml
index 46d87131..f0576995 100644
--- a/tests/dictionaries/60action_external/00-base.xml
+++ b/tests/dictionaries/60action_external/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general" description="général">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/60action_external/extra_dirs/extra/00-base.xml b/tests/dictionaries/60action_external/extra_dirs/extra/00-base.xml
index f547fc6e..f95a3843 100644
--- a/tests/dictionaries/60action_external/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/60action_external/extra_dirs/extra/00-base.xml
@@ -1,18 +1,19 @@
-<rougail version="0.9">
-    <variables>
-        <family name="test">	
-            <variable name="delay" type="number" description="délai en minutes avant lancement">
-                <value>0</value>
-            </variable>
-            <variable name="calc_url" type="web_address" description="domain" hidden="True">
-                <value>0</value>
-            </variable>
-        </family>
-    </variables>
-    <constraints>
-        <fill name="calc_val">
-            <param>http://localhost/</param>
-            <target>extra.test.calc_url</target>
-        </fill>
-    </constraints>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <variables>
+    <family name="test">
+      <variable name="delay" type="number" description="délai en minutes avant lancement">
+        <value>0</value>
+      </variable>
+      <variable name="calc_url" type="web_address" description="domain" hidden="True">
+        <value>0</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param>http://localhost/</param>
+      <target>extra.test.calc_url</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/60extra_externalspacecondition/00-base.xml b/tests/dictionaries/60extra_externalspacecondition/00-base.xml
index a525e91a..4eb8ae63 100644
--- a/tests/dictionaries/60extra_externalspacecondition/00-base.xml
+++ b/tests/dictionaries/60extra_externalspacecondition/00-base.xml
@@ -1,18 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general" description="général">
-            <variable name="my_var" auto_freeze="True">
-                <value>no</value>
-            </variable>
-            <variable name="my_var1" hidden="True">
-                <value>no</value>
-            </variable>
-            <variable name="server_deployed" type="boolean" hidden="True">
-                <value>False</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general" description="général">
+      <variable name="my_var" auto_freeze="True">
+        <value>no</value>
+      </variable>
+      <variable name="my_var1" hidden="True">
+        <value>no</value>
+      </variable>
+      <variable name="server_deployed" type="boolean" hidden="True">
+        <value>False</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/60extra_externalspacecondition/extra_dirs/extra/00-base.xml b/tests/dictionaries/60extra_externalspacecondition/extra_dirs/extra/00-base.xml
index 26e4174a..bd53c1ba 100644
--- a/tests/dictionaries/60extra_externalspacecondition/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/60extra_externalspacecondition/extra_dirs/extra/00-base.xml
@@ -1,15 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.9">
-    <variables>
-        <family name='ejabberd'>
-            <variable name="description" type="string">
-                <value>Exportation de la base de ejabberd</value>
-            </variable>
-            <variable name="day" type="schedule"></variable>
-            <variable name="mode" type="schedulemod">
-                <value>pre</value>
-            </variable>
-        </family>
-    </variables>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <variables>
+    <family name="ejabberd">
+      <variable name="description" type="string">
+        <value>Exportation de la base de ejabberd</value>
+      </variable>
+      <variable name="day" type="schedule"/>
+      <variable name="mode" type="schedulemod">
+        <value>pre</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/60extra_externalspacecondition/extra_dirs/extra1/00-base.xml b/tests/dictionaries/60extra_externalspacecondition/extra_dirs/extra1/00-base.xml
index 87424efa..5eb7b87e 100644
--- a/tests/dictionaries/60extra_externalspacecondition/extra_dirs/extra1/00-base.xml
+++ b/tests/dictionaries/60extra_externalspacecondition/extra_dirs/extra1/00-base.xml
@@ -1,17 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.9">
-    <variables>
-        <family name='external'>
-            <variable name="description" type="string">
-                <value>test</value>
-            </variable>
-        </family>
-    </variables>
-    <constraints>
-        <condition name ='disabled_if_in' source='extra.ejabberd.description'>
-            <param>non</param>
-            <target type='family'>extra1.external</target>
-        </condition>
-    </constraints>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <variables>
+    <family name="external">
+      <variable name="description" type="string">
+        <value>test</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="extra.ejabberd.description">
+      <param>non</param>
+      <target type="family">extra1.external</target>
+    </condition>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/60extra_group/00-base.xml b/tests/dictionaries/60extra_group/00-base.xml
index 268c2024..e6f1ef4e 100644
--- a/tests/dictionaries/60extra_group/00-base.xml
+++ b/tests/dictionaries/60extra_group/00-base.xml
@@ -1,19 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <services>
-        <service name='test'>
-            <file>/etc/mailname</file>
-            <file engine="jinja2">/etc/mailname2</file>
-        </service>
-    </services>
-    <variables>
-        <family name="general" description="général">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <services>
+    <service name="test">
+      <file>/etc/mailname</file>
+      <file engine="jinja2">/etc/mailname2</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/60extra_group/extra_dirs/extra/00-base.xml b/tests/dictionaries/60extra_group/extra_dirs/extra/00-base.xml
index 080fdf12..ee7f931f 100644
--- a/tests/dictionaries/60extra_group/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/60extra_group/extra_dirs/extra/00-base.xml
@@ -1,19 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.9">
-    <variables>
-        <family name='ejabberd'>
-            <variable name="description" type="string" multi="True">
-                <value>test</value>
-            </variable>
-            <variable name="mode" type="string">
-                <value>pre</value>
-            </variable>
-        </family>
-    </variables>
-    <constraints>
-        <group leader="extra.ejabberd.description">
-            <follower>mode</follower>
-        </group>
-    </constraints>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <variables>
+    <family name="ejabberd">
+      <family name="description" description="description" leadership="True">
+        <variable name="description" type="string" multi="True">
+          <value>test</value>
+        </variable>
+        <variable name="mode" type="string">
+          <value>pre</value>
+        </variable>
+      </family>
+    </family>
+  </variables>
+  <constraints/>
 </rougail>
diff --git a/tests/dictionaries/60extra_group_name/00-base.xml b/tests/dictionaries/60extra_group_name/00-base.xml
index 268c2024..e6f1ef4e 100644
--- a/tests/dictionaries/60extra_group_name/00-base.xml
+++ b/tests/dictionaries/60extra_group_name/00-base.xml
@@ -1,19 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <services>
-        <service name='test'>
-            <file>/etc/mailname</file>
-            <file engine="jinja2">/etc/mailname2</file>
-        </service>
-    </services>
-    <variables>
-        <family name="general" description="général">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <services>
+    <service name="test">
+      <file>/etc/mailname</file>
+      <file engine="jinja2">/etc/mailname2</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/60extra_group_name/extra_dirs/extra/00-base.xml b/tests/dictionaries/60extra_group_name/extra_dirs/extra/00-base.xml
index 6a507abe..0a2a87ef 100644
--- a/tests/dictionaries/60extra_group_name/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/60extra_group_name/extra_dirs/extra/00-base.xml
@@ -1,19 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.9">
-    <variables>
-        <family name='ejabberd'>
-            <variable name="description" type="string" multi="True">
-                <value>test</value>
-            </variable>
-            <variable name="mode" type="string">
-                <value>pre</value>
-            </variable>
-        </family>
-    </variables>
-    <constraints>
-        <group leader="extra.ejabberd.description" name="new_name">
-            <follower>mode</follower>
-        </group>
-    </constraints>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <variables>
+    <family name="ejabberd">
+      <family name="new_name" description="new_name" leadership="True">
+        <variable name="description" type="string" multi="True">
+          <value>test</value>
+        </variable>
+        <variable name="mode" type="string">
+          <value>pre</value>
+        </variable>
+      </family>
+    </family>
+  </variables>
+  <constraints/>
 </rougail>
diff --git a/tests/dictionaries/60extra_help/00-base.xml b/tests/dictionaries/60extra_help/00-base.xml
index d8156c27..1aebf03a 100644
--- a/tests/dictionaries/60extra_help/00-base.xml
+++ b/tests/dictionaries/60extra_help/00-base.xml
@@ -1,22 +1,18 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-
-    <services>
-        <service name='test'>
-            <file>/etc/mailname</file>
-        </service>
-    </services>
-
-    <variables>
-        <family name="general" description="général">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <services>
+    <service name="test">
+      <file>/etc/mailname</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/60extra_help/extra_dirs/extra/00-base.xml b/tests/dictionaries/60extra_help/extra_dirs/extra/00-base.xml
index e49575c3..7ed073cc 100644
--- a/tests/dictionaries/60extra_help/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/60extra_help/extra_dirs/extra/00-base.xml
@@ -1,24 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.9">
-    <variables>
-        <family name='ejabberd'>
-            <variable name="description" type="string">
-                <value>Exportation de la base de ejabberd</value>
-            </variable>
-            <variable name="day" type="schedule" help="Test help"></variable>
-            <variable name="mode" type="schedulemod">
-                <value>pre</value>
-            </variable>
-        </family>
-    </variables>
-    <constraints>
-        <fill name='calc_multi_condition'>
-            <param>non</param>
-            <param type='variable' name='condition_1' propertyerror='False'>activer_ejabberd</param>
-            <param name='match'>none</param>
-            <param name='mismatch'>daily</param>
-	    <target>extra.ejabberd.day</target>
-        </fill>
-    </constraints>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <variables>
+    <family name="ejabberd">
+      <variable name="description" type="string">
+        <value>Exportation de la base de ejabberd</value>
+      </variable>
+      <variable name="day" type="schedule" help="Test help"/>
+      <variable name="mode" type="schedulemod">
+        <value>pre</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_multi_condition">
+      <param>non</param>
+      <param type="variable" name="condition_1" propertyerror="False">activer_ejabberd</param>
+      <param name="match">none</param>
+      <param name="mismatch">daily</param>
+      <target>extra.ejabberd.day</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/60extra_load/00-base.xml b/tests/dictionaries/60extra_load/00-base.xml
index 32dae3d3..cb25aa75 100644
--- a/tests/dictionaries/60extra_load/00-base.xml
+++ b/tests/dictionaries/60extra_load/00-base.xml
@@ -1,15 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general" description="général">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/60extra_load/extra_dirs/extra/00-base.xml b/tests/dictionaries/60extra_load/extra_dirs/extra/00-base.xml
index ac0557b0..3b736941 100644
--- a/tests/dictionaries/60extra_load/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/60extra_load/extra_dirs/extra/00-base.xml
@@ -1,24 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.9">
-    <variables>
-        <family name='ejabberd'>
-            <variable name="description" type="string">
-                <value>Exportation de la base de ejabberd</value>
-            </variable>
-            <variable name="day" type="schedule"></variable>
-            <variable name="mode" type="schedulemod">
-                <value>pre</value>
-            </variable>
-        </family>
-    </variables>
-    <constraints>
-        <fill name='calc_multi_condition'>
-            <param>non</param>
-            <param type='variable' name='condition_1' propertyerror='False'>activer_ejabberd</param>
-            <param name='match'>none</param>
-            <param name='mismatch'>daily</param>
-	    <target>extra.ejabberd.day</target>
-        </fill>
-    </constraints>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <variables>
+    <family name="ejabberd">
+      <variable name="description" type="string">
+        <value>Exportation de la base de ejabberd</value>
+      </variable>
+      <variable name="day" type="schedule"/>
+      <variable name="mode" type="schedulemod">
+        <value>pre</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_multi_condition">
+      <param>non</param>
+      <param type="variable" name="condition_1" propertyerror="False">activer_ejabberd</param>
+      <param name="match">none</param>
+      <param name="mismatch">daily</param>
+      <target>extra.ejabberd.day</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/60extra_mandatory/00-base.xml b/tests/dictionaries/60extra_mandatory/00-base.xml
index 32dae3d3..cb25aa75 100644
--- a/tests/dictionaries/60extra_mandatory/00-base.xml
+++ b/tests/dictionaries/60extra_mandatory/00-base.xml
@@ -1,15 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general" description="général">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/60extra_mandatory/extra_dirs/extra/00-base.xml b/tests/dictionaries/60extra_mandatory/extra_dirs/extra/00-base.xml
index c1429053..32b7a5e6 100644
--- a/tests/dictionaries/60extra_mandatory/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/60extra_mandatory/extra_dirs/extra/00-base.xml
@@ -1,23 +1,22 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.9">
-    <variables>
-        <family name='ejabberd'>
-            <variable name="description" type="string">
-                <value>Exportation de la base de ejabberd</value>
-            </variable>
-	    <variable name="day" type="schedule" mandatory="True"/>
-	    <variable name="mode" type="schedulemod" mandatory="True"/>
-	    <variable name="var1" type="string" mandatory="True"/>
-        </family>
-    </variables>
-    <constraints>
-        <fill name='calc_multi_condition'>
-            <param>non</param>
-            <param type='variable' name='condition_1' propertyerror='False'>activer_ejabberd</param>
-            <param name='match'>none</param>
-            <param name='mismatch'>daily</param>
-	    <target>extra.ejabberd.day</target>
-        </fill>
-    </constraints>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <variables>
+    <family name="ejabberd">
+      <variable name="description" type="string">
+        <value>Exportation de la base de ejabberd</value>
+      </variable>
+      <variable name="day" type="schedule" mandatory="True"/>
+      <variable name="mode" type="schedulemod" mandatory="True"/>
+      <variable name="var1" type="string" mandatory="True"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_multi_condition">
+      <param>non</param>
+      <param type="variable" name="condition_1" propertyerror="False">activer_ejabberd</param>
+      <param name="match">none</param>
+      <param name="mismatch">daily</param>
+      <target>extra.ejabberd.day</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/60extra_name_family/00-base.xml b/tests/dictionaries/60extra_name_family/00-base.xml
index 5f321110..16883f23 100644
--- a/tests/dictionaries/60extra_name_family/00-base.xml
+++ b/tests/dictionaries/60extra_name_family/00-base.xml
@@ -1,15 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="extra">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="extra">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/60extra_name_family/extra_dirs/extra/00-base.xml b/tests/dictionaries/60extra_name_family/extra_dirs/extra/00-base.xml
index ac0557b0..3b736941 100644
--- a/tests/dictionaries/60extra_name_family/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/60extra_name_family/extra_dirs/extra/00-base.xml
@@ -1,24 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.9">
-    <variables>
-        <family name='ejabberd'>
-            <variable name="description" type="string">
-                <value>Exportation de la base de ejabberd</value>
-            </variable>
-            <variable name="day" type="schedule"></variable>
-            <variable name="mode" type="schedulemod">
-                <value>pre</value>
-            </variable>
-        </family>
-    </variables>
-    <constraints>
-        <fill name='calc_multi_condition'>
-            <param>non</param>
-            <param type='variable' name='condition_1' propertyerror='False'>activer_ejabberd</param>
-            <param name='match'>none</param>
-            <param name='mismatch'>daily</param>
-	    <target>extra.ejabberd.day</target>
-        </fill>
-    </constraints>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <variables>
+    <family name="ejabberd">
+      <variable name="description" type="string">
+        <value>Exportation de la base de ejabberd</value>
+      </variable>
+      <variable name="day" type="schedule"/>
+      <variable name="mode" type="schedulemod">
+        <value>pre</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_multi_condition">
+      <param>non</param>
+      <param type="variable" name="condition_1" propertyerror="False">activer_ejabberd</param>
+      <param name="match">none</param>
+      <param name="mismatch">daily</param>
+      <target>extra.ejabberd.day</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/60extra_no_condition/00-base.xml b/tests/dictionaries/60extra_no_condition/00-base.xml
index 4e809b8b..3d6dcbc2 100644
--- a/tests/dictionaries/60extra_no_condition/00-base.xml
+++ b/tests/dictionaries/60extra_no_condition/00-base.xml
@@ -1,18 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general" description="général">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="module_instancie" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="module_instancie" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/60extra_no_condition/extra_dirs/extra/00-base.xml b/tests/dictionaries/60extra_no_condition/extra_dirs/extra/00-base.xml
index 26e4174a..bd53c1ba 100644
--- a/tests/dictionaries/60extra_no_condition/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/60extra_no_condition/extra_dirs/extra/00-base.xml
@@ -1,15 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.9">
-    <variables>
-        <family name='ejabberd'>
-            <variable name="description" type="string">
-                <value>Exportation de la base de ejabberd</value>
-            </variable>
-            <variable name="day" type="schedule"></variable>
-            <variable name="mode" type="schedulemod">
-                <value>pre</value>
-            </variable>
-        </family>
-    </variables>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <variables>
+    <family name="ejabberd">
+      <variable name="description" type="string">
+        <value>Exportation de la base de ejabberd</value>
+      </variable>
+      <variable name="day" type="schedule"/>
+      <variable name="mode" type="schedulemod">
+        <value>pre</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/60extra_redefine/00-base.xml b/tests/dictionaries/60extra_redefine/00-base.xml
index 32dae3d3..cb25aa75 100644
--- a/tests/dictionaries/60extra_redefine/00-base.xml
+++ b/tests/dictionaries/60extra_redefine/00-base.xml
@@ -1,15 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general" description="général">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/60extra_redefine/extra_dirs/extra/00-base.xml b/tests/dictionaries/60extra_redefine/extra_dirs/extra/00-base.xml
index ac0557b0..3b736941 100644
--- a/tests/dictionaries/60extra_redefine/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/60extra_redefine/extra_dirs/extra/00-base.xml
@@ -1,24 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.9">
-    <variables>
-        <family name='ejabberd'>
-            <variable name="description" type="string">
-                <value>Exportation de la base de ejabberd</value>
-            </variable>
-            <variable name="day" type="schedule"></variable>
-            <variable name="mode" type="schedulemod">
-                <value>pre</value>
-            </variable>
-        </family>
-    </variables>
-    <constraints>
-        <fill name='calc_multi_condition'>
-            <param>non</param>
-            <param type='variable' name='condition_1' propertyerror='False'>activer_ejabberd</param>
-            <param name='match'>none</param>
-            <param name='mismatch'>daily</param>
-	    <target>extra.ejabberd.day</target>
-        </fill>
-    </constraints>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <variables>
+    <family name="ejabberd">
+      <variable name="description" type="string">
+        <value>Exportation de la base de ejabberd</value>
+      </variable>
+      <variable name="day" type="schedule"/>
+      <variable name="mode" type="schedulemod">
+        <value>pre</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_multi_condition">
+      <param>non</param>
+      <param type="variable" name="condition_1" propertyerror="False">activer_ejabberd</param>
+      <param name="match">none</param>
+      <param name="mismatch">daily</param>
+      <target>extra.ejabberd.day</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/60extra_redefine/extra_dirs/extra/01-redefine.xml b/tests/dictionaries/60extra_redefine/extra_dirs/extra/01-redefine.xml
index e1760cca..2107f5be 100644
--- a/tests/dictionaries/60extra_redefine/extra_dirs/extra/01-redefine.xml
+++ b/tests/dictionaries/60extra_redefine/extra_dirs/extra/01-redefine.xml
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.9">
-    <variables>
-        <family name='ejabberd'>
-	    <variable name="description" redefine="True" hidden="True"/>
-        </family>
-    </variables>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <variables>
+    <family name="ejabberd">
+      <variable name="description" redefine="True" hidden="True"/>
+    </family>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/60extra_variable_name_extra/00-base.xml b/tests/dictionaries/60extra_variable_name_extra/00-base.xml
index 32dae3d3..cb25aa75 100644
--- a/tests/dictionaries/60extra_variable_name_extra/00-base.xml
+++ b/tests/dictionaries/60extra_variable_name_extra/00-base.xml
@@ -1,15 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general" description="général">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/60extra_variable_name_extra/extra_dirs/extra/00-base.xml b/tests/dictionaries/60extra_variable_name_extra/extra_dirs/extra/00-base.xml
index 0ba12c01..93528ce5 100644
--- a/tests/dictionaries/60extra_variable_name_extra/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/60extra_variable_name_extra/extra_dirs/extra/00-base.xml
@@ -1,7 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.9">
-    <variables>
-        <variable name="extra"/>
-    </variables>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <variables>
+    <variable name="extra"/>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/60familyaction/00-base.xml b/tests/dictionaries/60familyaction/00-base.xml
index 46d87131..f0576995 100644
--- a/tests/dictionaries/60familyaction/00-base.xml
+++ b/tests/dictionaries/60familyaction/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general" description="général">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/60familyaction/extra_dirs/extra/00-base.xml b/tests/dictionaries/60familyaction/extra_dirs/extra/00-base.xml
index 03e2ed73..102f3af8 100644
--- a/tests/dictionaries/60familyaction/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/60familyaction/extra_dirs/extra/00-base.xml
@@ -1,9 +1,10 @@
-<rougail version="0.9">
-    <variables>
-        <family name="test">	
-            <variable name="delay" type="number" description="délai en minutes avant lancement">
-                <value>0</value>
-            </variable>
-        </family>
-    </variables>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <variables>
+    <family name="test">
+      <variable name="delay" type="number" description="délai en minutes avant lancement">
+        <value>0</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/60familyaction_mandatory/00-base.xml b/tests/dictionaries/60familyaction_mandatory/00-base.xml
index 46d87131..f0576995 100644
--- a/tests/dictionaries/60familyaction_mandatory/00-base.xml
+++ b/tests/dictionaries/60familyaction_mandatory/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general" description="général">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/60familyaction_mandatory/60familyaction/00-base.xml b/tests/dictionaries/60familyaction_mandatory/60familyaction/00-base.xml
deleted file mode 100644
index a0fadc41..00000000
--- a/tests/dictionaries/60familyaction_mandatory/60familyaction/00-base.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.9">
-
-    <files/>
-    <containers/>
-
-    <variables>
-        <family name='général'>
-            <variable name='mode_conteneur_actif' type='string' description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
-</rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/60familyaction_mandatory/60familyaction/extra_dirs/extra/00-base.xml b/tests/dictionaries/60familyaction_mandatory/60familyaction/extra_dirs/extra/00-base.xml
deleted file mode 100644
index 8fd67dfd..00000000
--- a/tests/dictionaries/60familyaction_mandatory/60familyaction/extra_dirs/extra/00-base.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<creole>
-    <family_action name="systeme"
-                   description="Liste des actions pour gérer le système EOLE"
-                   color="#ddc9e6"
-                   image="system.svg">
-       <action type="form"
-           title="Reconfigure"
-           description="Reconfigurer le serveur"
-           image="backup.svg">
-            <input>Reconfigurer</input>
-            <profile>ead_admin</profile>
-            <ewtapp>ead</ewtapp>
-            <tag>reconfigure</tag>
-       </action>
-    </family_action>
-    <variables>
-        <family name="test">	
-            <variable name="delay" type="number" description="délai en minutes avant lancement">
-                <value>0</value>
-            </variable>
-        </family>
-    </variables>
-    <constraints>
-    </constraints>
-    <help/>
-</creole>
diff --git a/tests/dictionaries/60familyaction_mandatory/60familyaction/result/00-base.xml b/tests/dictionaries/60familyaction_mandatory/60familyaction/result/00-base.xml
deleted file mode 100644
index acac9480..00000000
--- a/tests/dictionaries/60familyaction_mandatory/60familyaction/result/00-base.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-  <family name="actions" hidden="False" doc="actions">
-    <family hidden="False" doc="systeme" name="systeme">
-      <family doc="" hidden="False" name="action0">
-        <variable doc="" multi="False" name="description" type="string">
-          <value>Reconfigurer le serveur</value>
-        </variable>
-        <variable doc="" multi="True" name="ewtapp" type="string">
-          <value>ead</value>
-        </variable>
-        <variable doc="" multi="False" name="image" type="string">
-          <value>backup.svg</value>
-        </variable>
-        <variable doc="" multi="True" name="input" type="string">
-          <value>Reconfigurer</value>
-        </variable>
-        <variable doc="" multi="False" name="name" type="string">
-          <value>extra</value>
-        </variable>
-        <variable doc="" multi="True" name="profile" type="string">
-          <value>ead_admin</value>
-        </variable>
-        <variable doc="" multi="True" name="tag" type="string">
-          <value>reconfigure</value>
-        </variable>
-        <variable doc="" multi="False" name="title" type="string">
-          <value>Reconfigure</value>
-        </variable>
-        <variable doc="" multi="False" name="type" type="choice">
-          <choice>form</choice>
-          <choice>custom</choice>
-          <choice>external</choice>
-          <value>form</value>
-        </variable>
-        <variable doc="" multi="False" name="activate" type="boolean">
-          <value>True</value>
-        </variable>
-      </family>
-      <variable doc="" multi="False" name="name" type="string">
-        <value>systeme</value>
-      </variable>
-      <variable doc="" multi="False" name="color" type="string">
-        <value>#ddc9e6</value>
-      </variable>
-      <variable doc="" multi="False" name="image" type="string">
-        <value>system.svg</value>
-      </variable>
-      <variable doc="" multi="False" name="description" type="string">
-        <value>Liste des actions pour gérer le système EOLE</value>
-      </variable>
-    </family>
-  </family>
-  <constraints/>
-  <family name="containers">
-    <family name="containers">
-      <family name="container0" doc="" hidden="False">
-        <variable doc="" multi="False" name="group" type="string">
-          <value>root</value>
-        </variable>
-        <variable doc="" multi="False" name="name" type="string">
-          <value>root</value>
-        </variable>
-        <variable doc="" multi="False" name="container_group" type="string">
-          <value>root</value>
-        </variable>
-        <variable doc="" multi="False" name="real_container" type="string">
-          <value>root</value>
-        </variable>
-        <variable doc="" multi="False" name="id" type="number">
-          <value>1</value>
-        </variable>
-        <variable multi="False" name="ip" opt="creole.containers.container_ip_root" type="symlink"/>
-        <variable multi="False" name="path" opt="creole.containers.container_path_root" type="symlink"/>
-      </family>
-    </family>
-    <family doc="" hidden="False" name="network">
-      <variable multi="False" name="adresse_ip_br0" opt="creole.containers.adresse_ip_br0" type="symlink">
-        <property>expert</property>
-      </variable>
-      <variable multi="False" name="adresse_netmask_br0" opt="creole.containers.adresse_netmask_br0" type="symlink">
-        <property>expert</property>
-      </variable>
-      <variable multi="False" name="adresse_network_br0" opt="creole.containers.adresse_network_br0" type="symlink">
-        <property>expert</property>
-      </variable>
-      <variable multi="False" name="adresse_broadcast_br0" opt="creole.containers.adresse_broadcast_br0" type="symlink">
-        <property>expert</property>
-      </variable>
-    </family>
-    <family doc="" hidden="False" name="services"/>
-    <family doc="" hidden="False" name="service_accesss"/>
-    <family doc="" hidden="False" name="service_restrictions"/>
-    <family doc="" hidden="False" name="interfaces"/>
-    <family doc="" hidden="False" name="packages"/>
-    <family doc="" hidden="False" name="files"/>
-    <family doc="" hidden="False" name="disknods"/>
-    <family doc="" hidden="False" name="hosts"/>
-    <family doc="" hidden="False" name="fstabs"/>
-  </family>
-  <help/>
-  <family doc="" name="creole">
-    <family doc="Containers informations" hidden="True" icon="puzzle-piece" mode="normal" name="containers">
-      <variable doc="Bridge IP address" multi="False" name="adresse_ip_br0" type="string">
-        <value>127.0.0.1</value>
-      </variable>
-      <variable doc="Bridge IP subnet mask" multi="False" name="adresse_netmask_br0" type="string">
-        <value>255.0.0.0</value>
-      </variable>
-      <variable doc="Bridge IP network_br0 address" multi="False" name="adresse_network_br0" type="string">
-        <value>127.0.0.0</value>
-      </variable>
-      <variable doc="Bridge broadcast IP address" multi="False" name="adresse_broadcast_br0" type="string">
-        <value>127.255.255.255</value>
-      </variable>
-      <variable doc="Path of container root" multi="False" name="container_path_root" type="string">
-        <value></value>
-      </variable>
-      <variable doc="IP address of container root" multi="False" name="container_ip_root" type="string">
-        <value>127.0.0.1</value>
-      </variable>
-      <variable doc="Group name of container root" multi="False" name="container_name_root" type="string">
-        <value>root</value>
-      </variable>
-      <variable doc="Path of container root" multi="False" name="adresse_ip_root" type="string">
-        <property>force_default_on_freeze</property>
-        <property>frozen</property>
-        <value>localhost</value>
-      </variable>
-    </family>
-    <family hidden="False" mode="basic" doc="général" name="general">
-      <variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice">
-        <choice>oui</choice>
-        <choice>non</choice>
-        <property>force_default_on_freeze</property>
-        <property>frozen</property>
-        <property>hidden</property>
-        <property>mandatory</property>
-        <property>normal</property>
-        <value>non</value>
-      </variable>
-    </family>
-  </family>
-  <family doc="" name="extra">
-    <family hidden="False" mode="basic" doc="test" name="test">
-      <variable doc="délai en minutes avant lancement" multi="False" name="delay" type="number">
-        <property>mandatory</property>
-        <property>normal</property>
-        <value>0</value>
-      </variable>
-    </family>
-  </family>
-</rougail>
diff --git a/tests/dictionaries/60familyaction_mandatory/extra_dirs/extra/00-base.xml b/tests/dictionaries/60familyaction_mandatory/extra_dirs/extra/00-base.xml
index 1692f0fc..5a123419 100644
--- a/tests/dictionaries/60familyaction_mandatory/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/60familyaction_mandatory/extra_dirs/extra/00-base.xml
@@ -1,10 +1,11 @@
-<rougail version="0.9">
-    <variables>
-        <family name="test">	
-            <variable name="delay" type="number" description="délai en minutes avant lancement">
-                <value>0</value>
-            </variable>
-            <variable name="day" type="number" description="day avant lancement" mandatory="True"/>
-        </family>
-    </variables>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <variables>
+    <family name="test">
+      <variable name="delay" type="number" description="délai en minutes avant lancement">
+        <value>0</value>
+      </variable>
+      <variable name="day" type="number" description="day avant lancement" mandatory="True"/>
+    </family>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/61extra_auto_freeze/00-base.xml b/tests/dictionaries/61extra_auto_freeze/00-base.xml
index a41f67c6..a57a2b06 100644
--- a/tests/dictionaries/61extra_auto_freeze/00-base.xml
+++ b/tests/dictionaries/61extra_auto_freeze/00-base.xml
@@ -1,13 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general" description="général">
-            <variable name="server_deployed" type="boolean" description="No change"/>
-            <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general" description="général">
+      <variable name="server_deployed" type="boolean" description="No change"/>
+      <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/61extra_auto_freeze/extra_dirs/extra/00-base.xml b/tests/dictionaries/61extra_auto_freeze/extra_dirs/extra/00-base.xml
index 1c1559f5..86263ece 100644
--- a/tests/dictionaries/61extra_auto_freeze/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/61extra_auto_freeze/extra_dirs/extra/00-base.xml
@@ -1,11 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.9">
-    <variables>
-        <family name='ejabberd'>
-            <variable name="mode" type="string" auto_freeze="True">
-                <value>pre</value>
-            </variable>
-        </family>
-    </variables>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <variables>
+    <family name="ejabberd">
+      <variable name="mode" type="string" auto_freeze="True">
+        <value>pre</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/61extra_dyn/00-base.xml b/tests/dictionaries/61extra_dyn/00-base.xml
index 81f68781..aeb83427 100644
--- a/tests/dictionaries/61extra_dyn/00-base.xml
+++ b/tests/dictionaries/61extra_dyn/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general" description="général">
-            <variable name="varname" type="string" description="No change" multi="True">
-                <value>a</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general" description="général">
+      <variable name="varname" type="string" description="No change" multi="True">
+        <value>a</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/61extra_dyn/extra_dirs/extra/00-base.xml b/tests/dictionaries/61extra_dyn/extra_dirs/extra/00-base.xml
index e60a1bd8..60f3f9e0 100644
--- a/tests/dictionaries/61extra_dyn/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/61extra_dyn/extra_dirs/extra/00-base.xml
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.9">
-    <variables>
-        <family name='ejabberd' dynamic="varname">
-            <variable name="mode" type="string"/>
-        </family>
-    </variables>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <variables>
+    <family name="ejabberd" dynamic="varname">
+      <variable name="mode" type="string"/>
+    </family>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/61extra_dyn_extra/00-base.xml b/tests/dictionaries/61extra_dyn_extra/00-base.xml
index 81f68781..aeb83427 100644
--- a/tests/dictionaries/61extra_dyn_extra/00-base.xml
+++ b/tests/dictionaries/61extra_dyn_extra/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general" description="général">
-            <variable name="varname" type="string" description="No change" multi="True">
-                <value>a</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general" description="général">
+      <variable name="varname" type="string" description="No change" multi="True">
+        <value>a</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/61extra_dyn_extra/extra_dirs/extra/00-base.xml b/tests/dictionaries/61extra_dyn_extra/extra_dirs/extra/00-base.xml
index eb77f2df..ec77ed41 100644
--- a/tests/dictionaries/61extra_dyn_extra/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/61extra_dyn_extra/extra_dirs/extra/00-base.xml
@@ -1,14 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.9">
-    <variables>
-        <family name="general" description="général">
-            <variable name="varname" type="string" description="No change" multi="True">
-                <value>a</value>
-            </variable>
-        </family>
-        <family name='ejabberd' dynamic="extra.general.varname">
-            <variable name="mode" type="string"/>
-        </family>
-    </variables>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <variables>
+    <family name="general" description="général">
+      <variable name="varname" type="string" description="No change" multi="True">
+        <value>a</value>
+      </variable>
+    </family>
+    <family name="ejabberd" dynamic="extra.general.varname">
+      <variable name="mode" type="string"/>
+    </family>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/70container_files/00-base.xml b/tests/dictionaries/70container_files/00-base.xml
index 182a35e7..b8baf5cf 100644
--- a/tests/dictionaries/70container_files/00-base.xml
+++ b/tests/dictionaries/70container_files/00-base.xml
@@ -1,18 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<rougail version="0.9">
-    <services> 
-        <service name='test'>
-            <file>/etc/mailname</file>
-            <file>/rougail.conf</file>
-        </service>
-    </services>
-    <variables>
-        <family name="general" description="général">
-            <variable name='mode_conteneur_actif' type='string' description="No change" hidden="True">
-                <value>oui</value>
-            </variable>
-        </family>
-    </variables>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <services>
+    <service name="test">
+      <file>/etc/mailname</file>
+      <file>/rougail.conf</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>oui</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/70container_files_symlink_multi/00-base.xml b/tests/dictionaries/70container_files_symlink_multi/00-base.xml
index 94c9cb9d..3f3e683f 100644
--- a/tests/dictionaries/70container_files_symlink_multi/00-base.xml
+++ b/tests/dictionaries/70container_files_symlink_multi/00-base.xml
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
-<rougail version="0.9">
-    <services> 
-        <service name='test'>
-            <file file_type="variable" source="mailname">file_name</file>
-            <file file_type="variable" source="mailname2" engine="jinja2">file_name2</file>
-        </service>
-    </services>
-    <variables>
-        <variable name='file_name' type='filename' multi='True'>
-            <value>/etc/mailname</value>
-            <value>/etc/mailname2</value>
-        </variable>
-        <variable name='file_name2' type='filename' multi='True'>
-            <value>/etc/mailname3</value>
-            <value>/etc/mailname4</value>
-        </variable>
-    </variables>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <services>
+    <service name="test">
+      <file file_type="variable" source="mailname">file_name</file>
+      <file file_type="variable" source="mailname2" engine="jinja2">file_name2</file>
+    </service>
+  </services>
+  <variables>
+    <variable name="file_name" type="filename" multi="True">
+      <value>/etc/mailname</value>
+      <value>/etc/mailname2</value>
+    </variable>
+    <variable name="file_name2" type="filename" multi="True">
+      <value>/etc/mailname3</value>
+      <value>/etc/mailname4</value>
+    </variable>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/70container_files_symlink_multi_variable/00-base.xml b/tests/dictionaries/70container_files_symlink_multi_variable/00-base.xml
index 4e29e1bf..c8dd10de 100644
--- a/tests/dictionaries/70container_files_symlink_multi_variable/00-base.xml
+++ b/tests/dictionaries/70container_files_symlink_multi_variable/00-base.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
-<rougail version="0.9">
-    <services> 
-        <service name='test'>
-            <file file_type="variable" source="mailname" variable="var">file_name</file>
-            <file file_type="variable" source="mailname2" variable="var" engine="jinja2">file_name2</file>
-        </service>
-    </services>
-    <variables>
-        <variable name='file_name' type='filename' multi='True'>
-            <value>/etc/mailname</value>
-            <value>/etc/mailname2</value>
-        </variable>
-        <variable name='file_name2' type='filename' multi='True'>
-            <value>/etc/mailname3</value>
-            <value>/etc/mailname4</value>
-        </variable>
-        <variable name='var' type='string' multi='True'>
-            <value>mailname</value>
-            <value>mailname2</value>
-        </variable>
-    </variables>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <services>
+    <service name="test">
+      <file file_type="variable" source="mailname" variable="var">file_name</file>
+      <file file_type="variable" source="mailname2" variable="var" engine="jinja2">file_name2</file>
+    </service>
+  </services>
+  <variables>
+    <variable name="file_name" type="filename" multi="True">
+      <value>/etc/mailname</value>
+      <value>/etc/mailname2</value>
+    </variable>
+    <variable name="file_name2" type="filename" multi="True">
+      <value>/etc/mailname3</value>
+      <value>/etc/mailname4</value>
+    </variable>
+    <variable name="var" type="string" multi="True">
+      <value>mailname</value>
+      <value>mailname2</value>
+    </variable>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/70container_files_symlink_variable/00-base.xml b/tests/dictionaries/70container_files_symlink_variable/00-base.xml
index e765c5cc..81839f49 100644
--- a/tests/dictionaries/70container_files_symlink_variable/00-base.xml
+++ b/tests/dictionaries/70container_files_symlink_variable/00-base.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<rougail version="0.9">
-    <services> 
-        <service name='test'>
-            <file file_type="variable" source="mailname" variable="var">file_name</file>
-        </service>
-    </services>
-    <variables>
-        <variable name='file_name' type='filename'>
-            <value>/etc/mailname</value>
-        </variable>
-        <variable name='var' type='string'>
-            <value>mailname</value>
-        </variable>
-    </variables>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <services>
+    <service name="test">
+      <file file_type="variable" source="mailname" variable="var">file_name</file>
+    </service>
+  </services>
+  <variables>
+    <variable name="file_name" type="filename">
+      <value>/etc/mailname</value>
+    </variable>
+    <variable name="var" type="string">
+      <value>mailname</value>
+    </variable>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/70container_files_twice/00-base.xml b/tests/dictionaries/70container_files_twice/00-base.xml
index 3e49ccf9..1dcabe6b 100644
--- a/tests/dictionaries/70container_files_twice/00-base.xml
+++ b/tests/dictionaries/70container_files_twice/00-base.xml
@@ -1,19 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
-<rougail version="0.9">
-    <services> 
-        <service name='test'>
-            <file>/etc/mailname</file>
-            <file>/etc/eole/mailname</file>
-            <file>/rougail.conf</file>
-        </service>
-    </services>
-    <variables>
-        <family name="general" description="général">
-            <variable name='mode_conteneur_actif' type='string' description="No change" hidden="True">
-                <value>oui</value>
-            </variable>
-        </family>
-    </variables>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <services>
+    <service name="test">
+      <file>/etc/mailname</file>
+      <file>/etc/eole/mailname</file>
+      <file>/rougail.conf</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>oui</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/70container_filesmulti/00-base.xml b/tests/dictionaries/70container_filesmulti/00-base.xml
index aa0e9ec6..d73f577e 100644
--- a/tests/dictionaries/70container_filesmulti/00-base.xml
+++ b/tests/dictionaries/70container_filesmulti/00-base.xml
@@ -1,18 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<rougail version="0.9">
-    <services> 
-        <service name='test'>
-            <file>/etc/mailname</file>
-            <file>/etc/mailname2</file>
-        </service>
-    </services>
-    <variables>
-        <family name="general" description="général">
-            <variable name='mode_conteneur_actif' type='string' description="No change" hidden="True">
-                <value>oui</value>
-            </variable>
-        </family>
-    </variables>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <services>
+    <service name="test">
+      <file>/etc/mailname</file>
+      <file>/etc/mailname2</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>oui</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/70container_filesredefine/00-base.xml b/tests/dictionaries/70container_filesredefine/00-base.xml
index 33b6a9c4..d250f365 100644
--- a/tests/dictionaries/70container_filesredefine/00-base.xml
+++ b/tests/dictionaries/70container_filesredefine/00-base.xml
@@ -1,17 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<rougail version="0.9">
-    <services> 
-        <service name='test'>
-            <file>/etc/mailname</file>
-        </service>
-    </services>
-    <variables>
-        <family name="general" description="général">
-            <variable name='mode_conteneur_actif' type='string' description="No change" hidden="True">
-                <value>oui</value>
-            </variable>
-        </family>
-    </variables>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <services>
+    <service name="test">
+      <file>/etc/mailname</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>oui</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/70container_filesredefine/01-base.xml b/tests/dictionaries/70container_filesredefine/01-base.xml
index dd33c357..e1e69ee6 100644
--- a/tests/dictionaries/70container_filesredefine/01-base.xml
+++ b/tests/dictionaries/70container_filesredefine/01-base.xml
@@ -1,12 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.9">
-    <services> 
-        <service name='test'>
-            <file source="mailname.new" redefine="True">/etc/mailname</file>
-        </service>
-    </services>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <services>
+    <service name="test">
+      <file source="mailname.new" redefine="True">/etc/mailname</file>
+    </service>
+  </services>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
-
diff --git a/tests/dictionaries/70container_new/00-base.xml b/tests/dictionaries/70container_new/00-base.xml
index 1c386e7a..e3d040f4 100644
--- a/tests/dictionaries/70container_new/00-base.xml
+++ b/tests/dictionaries/70container_new/00-base.xml
@@ -1,16 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
-<rougail version="0.9">
-    <services> 
-        <service name='test'>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <services>
+    <service name="test">
         </service>
-    </services>
-    <variables>
-        <family name="general" description="général">
-            <variable name='mode_conteneur_actif' type='string' description="No change" hidden="True">
-                <value>oui</value>
-            </variable>
-        </family>
-    </variables>
+  </services>
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>oui</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/70container_newnocont/00-base.xml b/tests/dictionaries/70container_newnocont/00-base.xml
index d3a94b62..7f9eecc7 100644
--- a/tests/dictionaries/70container_newnocont/00-base.xml
+++ b/tests/dictionaries/70container_newnocont/00-base.xml
@@ -1,16 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
-<rougail version="0.9">
-    <services> 
-        <service name='test'>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <services>
+    <service name="test">
         </service>
-    </services>
-    <variables>
-        <family name="general" description="général">
-            <variable name='mode_conteneur_actif' type='string' description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  </services>
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/70container_newwithip/00-base.xml b/tests/dictionaries/70container_newwithip/00-base.xml
index 309151e6..4819e070 100644
--- a/tests/dictionaries/70container_newwithip/00-base.xml
+++ b/tests/dictionaries/70container_newwithip/00-base.xml
@@ -1,17 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<rougail version="0.9">
-    <services> 
-        <service name='test'>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <services>
+    <service name="test">
         </service>
-    </services>
-    <variables>
-        <family name="general" description="général">
-            <variable name='mode_conteneur_actif' type='string' description="No change" hidden="True">
-                <value>oui</value>
-            </variable>
-            <variable name='adresse_ip_test' type='ip' description="No change"/>
-        </family>
-    </variables>
+  </services>
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>oui</value>
+      </variable>
+      <variable name="adresse_ip_test" type="ip" description="No change"/>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/70container_save/00-base.xml b/tests/dictionaries/70container_save/00-base.xml
index e4f3b05c..8afda0e1 100644
--- a/tests/dictionaries/70container_save/00-base.xml
+++ b/tests/dictionaries/70container_save/00-base.xml
@@ -1,13 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.9">
-    <variables>
-        <family name="general" description="général">
-            <variable name='mode_conteneur_actif' type='string' description="No change" hidden="True">
-                <value>oui</value>
-            </variable>
-        </family>
-    </variables>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>oui</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/70service_base/00-base.xml b/tests/dictionaries/70service_base/00-base.xml
index e8475d9e..4fb22836 100644
--- a/tests/dictionaries/70service_base/00-base.xml
+++ b/tests/dictionaries/70service_base/00-base.xml
@@ -1,18 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.9">
-
-    <services>
-        <service name='testsrv'>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <services>
+    <service name="testsrv">
         </service>
-    </services>
-    <variables>
-        <family name="general" description="général">
-            <variable name='mode_conteneur_actif' type='string' description="No change" hidden="True">
-                <value>oui</value>
-            </variable>
-        </family>
-    </variables>
+  </services>
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>oui</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/70service_not_managed/00-base.xml b/tests/dictionaries/70service_not_managed/00-base.xml
index 8b00831f..5b6ec7af 100644
--- a/tests/dictionaries/70service_not_managed/00-base.xml
+++ b/tests/dictionaries/70service_not_managed/00-base.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
-<rougail version="0.9">
-    <services> 
-        <service name='test' manage="False">
-            <file>/tmp/test</file>
-        </service>
-    </services>
-    <variables>
-        <variable name='var' type='string'>
-            <value>mailname</value>
-        </variable>
-    </variables>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <services>
+    <service name="test" manage="False">
+      <file>/tmp/test</file>
+    </service>
+  </services>
+  <variables>
+    <variable name="var" type="string">
+      <value>mailname</value>
+    </variable>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/70service_servicelist/00-base.xml b/tests/dictionaries/70service_servicelist/00-base.xml
index e06cbe6b..f5c68ced 100644
--- a/tests/dictionaries/70service_servicelist/00-base.xml
+++ b/tests/dictionaries/70service_servicelist/00-base.xml
@@ -1,22 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.9">
-
-    <services>
-        <service name='test' servicelist="test">
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <services>
+    <service name="test" servicelist="test">
         </service>
-    </services>
-    <variables>
-        <variable name="condition">
-            <value>no</value>
-        </variable>
-    </variables>
-    <constraints>
-        <condition name="disabled_if_in" source="condition">
-            <param>yes</param>
-            <target type="servicelist">test</target>
-        </condition>
-    </constraints>
+  </services>
+  <variables>
+    <variable name="condition">
+      <value>no</value>
+    </variable>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>yes</param>
+      <target type="servicelist">test</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/70service_servicelist_disabled_if_in/00-base.xml b/tests/dictionaries/70service_servicelist_disabled_if_in/00-base.xml
index 0e21a232..be734f9f 100644
--- a/tests/dictionaries/70service_servicelist_disabled_if_in/00-base.xml
+++ b/tests/dictionaries/70service_servicelist_disabled_if_in/00-base.xml
@@ -1,29 +1,25 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.9">
-
-    <services>
-        <service name='test' servicelist="test">
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <services>
+    <service name="test" servicelist="test">
         </service>
-    </services>
-    <variables>
-        <variable name="condition1">
-            <value>no</value>
-        </variable>
-        <variable name="condition2">
-            <value>no</value>
-        </variable>
-    </variables>
-    <constraints>
-        <condition name="disabled_if_in" source="condition1">
-            <param>no</param>
-            <target>condition2</target>
-        </condition>
-        <condition name="disabled_if_in" source="condition2">
-            <param>yes</param>
-            <target type="servicelist">test</target>
-        </condition>
-    </constraints>
+  </services>
+  <variables>
+    <variable name="condition1">
+      <value>no</value>
+    </variable>
+    <variable name="condition2">
+      <value>no</value>
+    </variable>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition1">
+      <param>no</param>
+      <target>condition2</target>
+    </condition>
+    <condition name="disabled_if_in" source="condition2">
+      <param>yes</param>
+      <target type="servicelist">test</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/70service_servicelist_file/00-base.xml b/tests/dictionaries/70service_servicelist_file/00-base.xml
index 8136e01d..0abb2195 100644
--- a/tests/dictionaries/70service_servicelist_file/00-base.xml
+++ b/tests/dictionaries/70service_servicelist_file/00-base.xml
@@ -1,24 +1,22 @@
-<?xml version="1.0" encoding="utf-8"?>
-<rougail version="0.9">
-    <services>
-        <service name='test' servicelist="test">
-            <file>/etc/file</file>
-        </service>
-    </services>
-    <variables>
-        <variable name="condition">
-            <value>no</value>
-        </variable>
-        <variable name="nut_monitor_host" type="ip" mandatory='True'>
-            <value>192.168.0.1</value>
-        </variable>
-    </variables>
-    <constraints>
-        <condition name="disabled_if_in" source="condition">
-            <param>no</param>
-            <target type="servicelist">test</target>
-        </condition>
-    </constraints>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <services>
+    <service name="test" servicelist="test">
+      <file>/etc/file</file>
+    </service>
+  </services>
+  <variables>
+    <variable name="condition">
+      <value>no</value>
+    </variable>
+    <variable name="nut_monitor_host" type="ip" mandatory="True">
+      <value>192.168.0.1</value>
+    </variable>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>no</param>
+      <target type="servicelist">test</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/70service_servicelist_ip/00-base.xml b/tests/dictionaries/70service_servicelist_ip/00-base.xml
index 0eee58a5..ce9f0c17 100644
--- a/tests/dictionaries/70service_servicelist_ip/00-base.xml
+++ b/tests/dictionaries/70service_servicelist_ip/00-base.xml
@@ -1,24 +1,22 @@
-<?xml version="1.0" encoding="utf-8"?>
-<rougail version="0.9">
-    <services>
-        <service name='test' servicelist="test">
-            <ip>nut_monitor_host</ip>
-        </service>
-    </services>
-    <variables>
-        <variable name="condition">
-            <value>no</value>
-        </variable>
-        <variable name="nut_monitor_host" type="ip" mandatory='True'>
-            <value>192.168.0.1</value>
-        </variable>
-    </variables>
-    <constraints>
-        <condition name="disabled_if_in" source="condition">
-            <param>no</param>
-            <target type="servicelist">test</target>
-        </condition>
-    </constraints>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <services>
+    <service name="test" servicelist="test">
+      <ip>nut_monitor_host</ip>
+    </service>
+  </services>
+  <variables>
+    <variable name="condition">
+      <value>no</value>
+    </variable>
+    <variable name="nut_monitor_host" type="ip" mandatory="True">
+      <value>192.168.0.1</value>
+    </variable>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>no</param>
+      <target type="servicelist">test</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/70service_servicelist_not_managed/00-base.xml b/tests/dictionaries/70service_servicelist_not_managed/00-base.xml
index f9fc0eb5..d88b8284 100644
--- a/tests/dictionaries/70service_servicelist_not_managed/00-base.xml
+++ b/tests/dictionaries/70service_servicelist_not_managed/00-base.xml
@@ -1,22 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.9">
-
-    <services>
-        <service name='test' servicelist="test" manage="False">
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <services>
+    <service name="test" servicelist="test" manage="False">
         </service>
-    </services>
-    <variables>
-        <variable name="condition">
-            <value>no</value>
-        </variable>
-    </variables>
-    <constraints>
-        <condition name="disabled_if_in" source="condition">
-            <param>yes</param>
-            <target type="servicelist">test</target>
-        </condition>
-    </constraints>
+  </services>
+  <variables>
+    <variable name="condition">
+      <value>no</value>
+    </variable>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>yes</param>
+      <target type="servicelist">test</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/70services_ip/00-base.xml b/tests/dictionaries/70services_ip/00-base.xml
index 6c06e3c6..b328913b 100644
--- a/tests/dictionaries/70services_ip/00-base.xml
+++ b/tests/dictionaries/70services_ip/00-base.xml
@@ -1,18 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.9">
-
-    <services>
-        <service name='nut'>
-            <ip>nut_monitor_host</ip>
-        </service>
-    </services>
-
-    <variables>
-        <variable name="nut_monitor_host" type="ip" mandatory='True'>
-            <value>192.168.0.1</value>
-        </variable>
-    </variables>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <services>
+    <service name="nut">
+      <ip>nut_monitor_host</ip>
+    </service>
+  </services>
+  <variables>
+    <variable name="nut_monitor_host" type="ip" mandatory="True">
+      <value>192.168.0.1</value>
+    </variable>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/70services_ip_cidr/00-base.xml b/tests/dictionaries/70services_ip_cidr/00-base.xml
index 079b8bb1..bef6238d 100644
--- a/tests/dictionaries/70services_ip_cidr/00-base.xml
+++ b/tests/dictionaries/70services_ip_cidr/00-base.xml
@@ -1,15 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
-<rougail version="0.9">
-    <services>
-        <service name='nut'>
-            <ip>nut_monitor_host</ip>
-        </service>
-    </services>
-    <variables>
-        <variable name="nut_monitor_host" type="network_cidr" mandatory='True'>
-            <value>192.168.0.0/24</value>
-        </variable>
-    </variables>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <services>
+    <service name="nut">
+      <ip>nut_monitor_host</ip>
+    </service>
+  </services>
+  <variables>
+    <variable name="nut_monitor_host" type="network_cidr" mandatory="True">
+      <value>192.168.0.0/24</value>
+    </variable>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/70services_ip_disabled/00-base.xml b/tests/dictionaries/70services_ip_disabled/00-base.xml
index 6167071b..428aaea9 100644
--- a/tests/dictionaries/70services_ip_disabled/00-base.xml
+++ b/tests/dictionaries/70services_ip_disabled/00-base.xml
@@ -1,18 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.9">
-
-    <services>
-        <service name='nut'>
-            <ip>nut_monitor_host</ip>
-        </service>
-    </services>
-
-    <variables>
-        <variable name="nut_monitor_host" type="ip" mandatory='True' disabled="True">
-            <value>192.168.0.1</value>
-        </variable>
-    </variables>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <services>
+    <service name="nut">
+      <ip>nut_monitor_host</ip>
+    </service>
+  </services>
+  <variables>
+    <variable name="nut_monitor_host" type="ip" mandatory="True" disabled="True">
+      <value>192.168.0.1</value>
+    </variable>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/70services_ip_iplist/00-base.xml b/tests/dictionaries/70services_ip_iplist/00-base.xml
index 7e6bcd5a..422d44e0 100644
--- a/tests/dictionaries/70services_ip_iplist/00-base.xml
+++ b/tests/dictionaries/70services_ip_iplist/00-base.xml
@@ -1,27 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.9">
-    <services>
-        <service name='nut'>
-            <ip iplist="example">nut_monitor_host</ip>
-        </service>
-    </services>
-    <variables>
-        <variable name="condition">
-            <value>no</value>
-        </variable>
-        <variable name="nut_monitor_host" type="network_cidr" mandatory='True'>
-            <value>192.168.0.0/24</value>
-        </variable>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_in" source="condition">
-            <param>yes</param>
-            <target type="iplist">example</target>
-            <target>nut_monitor_host</target>
-        </condition>
-    </constraints>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <services>
+    <service name="nut">
+      <ip iplist="example">nut_monitor_host</ip>
+    </service>
+  </services>
+  <variables>
+    <variable name="condition">
+      <value>no</value>
+    </variable>
+    <variable name="nut_monitor_host" type="network_cidr" mandatory="True">
+      <value>192.168.0.0/24</value>
+    </variable>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>yes</param>
+      <target type="iplist">example</target>
+      <target>nut_monitor_host</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/70services_ip_iplist2/00-base.xml b/tests/dictionaries/70services_ip_iplist2/00-base.xml
index f8376053..487f4bff 100644
--- a/tests/dictionaries/70services_ip_iplist2/00-base.xml
+++ b/tests/dictionaries/70services_ip_iplist2/00-base.xml
@@ -1,26 +1,22 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.9">
-    <services>
-        <service name='nut'>
-            <ip iplist="example">nut_monitor_host</ip>
-        </service>
-    </services>
-    <variables>
-        <variable name="condition">
-            <value>yes</value>
-        </variable>
-        <variable name="nut_monitor_host" type="network_cidr" mandatory='True'>
-            <value>192.168.0.0/24</value>
-        </variable>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_in" source="condition">
-            <param>yes</param>
-            <target type="iplist">example</target>
-        </condition>
-    </constraints>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <services>
+    <service name="nut">
+      <ip iplist="example">nut_monitor_host</ip>
+    </service>
+  </services>
+  <variables>
+    <variable name="condition">
+      <value>yes</value>
+    </variable>
+    <variable name="nut_monitor_host" type="network_cidr" mandatory="True">
+      <value>192.168.0.0/24</value>
+    </variable>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>yes</param>
+      <target type="iplist">example</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/70services_ip_leadership/00-base.xml b/tests/dictionaries/70services_ip_leadership/00-base.xml
index db5f119e..d1f3fafd 100644
--- a/tests/dictionaries/70services_ip_leadership/00-base.xml
+++ b/tests/dictionaries/70services_ip_leadership/00-base.xml
@@ -1,25 +1,21 @@
-<?xml version="1.0" encoding="utf-8"?>
-<rougail version="0.9">
-    <services>
-        <service name='ntp'>
-            <ip netmask='nut_monitor_netmask'>nut_monitor_host</ip>
-        </service>
-    </services>
-    <variables>
-        <family name="general" description="général">
-            <variable name="nut_monitor_netmask" type="netmask" mandatory='True' multi="True">
-                <value>255.255.255.0</value>
-            </variable>
-            <variable name="nut_monitor_host" type="network" mandatory='True'>
-                <value>192.168.1.0</value>
-            </variable>
-        </family>
-    </variables>
-    <constraints>
-        <group leader="nut_monitor_netmask">
-            <follower>nut_monitor_host</follower>
-        </group>
-    </constraints>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <services>
+    <service name="ntp">
+      <ip netmask="nut_monitor_netmask">nut_monitor_host</ip>
+    </service>
+  </services>
+  <variables>
+    <family name="general" description="général">
+      <family name="nut_monitor_netmask" description="nut_monitor_netmask" leadership="True">
+        <variable name="nut_monitor_netmask" type="netmask" mandatory="True" multi="True">
+          <value>255.255.255.0</value>
+        </variable>
+        <variable name="nut_monitor_host" type="network" mandatory="True">
+          <value>192.168.1.0</value>
+        </variable>
+      </family>
+    </family>
+  </variables>
+  <constraints/>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/70services_ip_multi/00-base.xml b/tests/dictionaries/70services_ip_multi/00-base.xml
index a3b5735b..f5a96d31 100644
--- a/tests/dictionaries/70services_ip_multi/00-base.xml
+++ b/tests/dictionaries/70services_ip_multi/00-base.xml
@@ -1,19 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.9">
-
-    <services>
-        <service name='nut'>
-            <ip>nut_monitor_host</ip>
-        </service>
-    </services>
-
-    <variables>
-        <variable name="nut_monitor_host" type="ip" mandatory='True' multi="True">
-            <value>192.168.0.1</value>
-            <value>192.168.0.2</value>
-        </variable>
-    </variables>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <services>
+    <service name="nut">
+      <ip>nut_monitor_host</ip>
+    </service>
+  </services>
+  <variables>
+    <variable name="nut_monitor_host" type="ip" mandatory="True" multi="True">
+      <value>192.168.0.1</value>
+      <value>192.168.0.2</value>
+    </variable>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/70services_ip_network/00-base.xml b/tests/dictionaries/70services_ip_network/00-base.xml
index ebe0e8dd..fcdc7c03 100644
--- a/tests/dictionaries/70services_ip_network/00-base.xml
+++ b/tests/dictionaries/70services_ip_network/00-base.xml
@@ -1,21 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.9">
-
-    <services>
-        <service name='nut'>
-            <ip netmask='nut_monitor_netmask'>nut_monitor_host</ip>
-        </service>
-    </services>
-
-    <variables>
-        <variable name="nut_monitor_netmask" type="netmask" mandatory='True'>
-            <value>255.255.255.0</value>
-        </variable>
-        <variable name="nut_monitor_host" type="network" mandatory='True'>
-            <value>192.168.0.0</value>
-        </variable>
-    </variables>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <services>
+    <service name="nut">
+      <ip netmask="nut_monitor_netmask">nut_monitor_host</ip>
+    </service>
+  </services>
+  <variables>
+    <variable name="nut_monitor_netmask" type="netmask" mandatory="True">
+      <value>255.255.255.0</value>
+    </variable>
+    <variable name="nut_monitor_host" type="network" mandatory="True">
+      <value>192.168.0.0</value>
+    </variable>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/70services_ip_not_mandatory/00-base.xml b/tests/dictionaries/70services_ip_not_mandatory/00-base.xml
index 2f243aee..e8457157 100644
--- a/tests/dictionaries/70services_ip_not_mandatory/00-base.xml
+++ b/tests/dictionaries/70services_ip_not_mandatory/00-base.xml
@@ -1,14 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.9">
-    <services>
-        <service name='nut'>
-            <ip>nut_monitor_host</ip>
-        </service>
-    </services>
-    <variables>
-        <variable name="nut_monitor_host" type="ip"/>
-    </variables>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <services>
+    <service name="nut">
+      <ip>nut_monitor_host</ip>
+    </service>
+  </services>
+  <variables>
+    <variable name="nut_monitor_host" type="ip"/>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/70services_ip_twice/00-base.xml b/tests/dictionaries/70services_ip_twice/00-base.xml
index 16d6c77c..d2b332a2 100644
--- a/tests/dictionaries/70services_ip_twice/00-base.xml
+++ b/tests/dictionaries/70services_ip_twice/00-base.xml
@@ -1,22 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.9">
-
-    <services>
-        <service name='nut'>
-            <ip>nut_monitor_host</ip>
-            <ip>nut_monitor_host2</ip>
-        </service>
-    </services>
-
-    <variables>
-        <variable name="nut_monitor_host" type="ip" mandatory='True'>
-            <value>192.168.0.1</value>
-        </variable>
-        <variable name="nut_monitor_host2" type="ip" mandatory='True'>
-            <value>192.168.0.2</value>
-        </variable>
-    </variables>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <services>
+    <service name="nut">
+      <ip>nut_monitor_host</ip>
+      <ip>nut_monitor_host2</ip>
+    </service>
+  </services>
+  <variables>
+    <variable name="nut_monitor_host" type="ip" mandatory="True">
+      <value>192.168.0.1</value>
+    </variable>
+    <variable name="nut_monitor_host2" type="ip" mandatory="True">
+      <value>192.168.0.2</value>
+    </variable>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80auto_family/00-base.xml b/tests/dictionaries/80auto_family/00-base.xml
index 3a4dcc7e..96029ea9 100644
--- a/tests/dictionaries/80auto_family/00-base.xml
+++ b/tests/dictionaries/80auto_family/00-base.xml
@@ -1,18 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="variable" type="string" description="No change">
-                <value>no</value>
-            </variable>
-        </family>
-    </variables>
-    <constraints>
-        <fill name="calc_val">
-            <param>oui</param>
-            <target type="family">general</target>
-        </fill>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="variable" type="string" description="No change">
+        <value>no</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param>oui</param>
+      <target type="family">general</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80check_unknown/00-base.xml b/tests/dictionaries/80check_unknown/00-base.xml
index 56c314c1..61d0401a 100644
--- a/tests/dictionaries/80check_unknown/00-base.xml
+++ b/tests/dictionaries/80check_unknown/00-base.xml
@@ -1,21 +1,18 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>b</value>
-            </variable>
-            <variable name="int" type="number" description="No change"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="unknown">
-            <param name="mini">0</param>
-            <param name="maxi">100</param>
-            <target>int</target>
-        </check>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>b</value>
+      </variable>
+      <variable name="int" type="number" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="unknown">
+      <param name="mini">0</param>
+      <param name="maxi">100</param>
+      <target>int</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80check_unknown_var/00-base.xml b/tests/dictionaries/80check_unknown_var/00-base.xml
index 0ee17772..7b2ef8c3 100644
--- a/tests/dictionaries/80check_unknown_var/00-base.xml
+++ b/tests/dictionaries/80check_unknown_var/00-base.xml
@@ -1,20 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>b</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_differ">
-            <param type="variable">int3</param>
-            <target>mode_conteneur_actif</target>
-        </check>
-
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>b</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_differ">
+      <param type="variable">int3</param>
+      <target>mode_conteneur_actif</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80check_without_target/00-base.xml b/tests/dictionaries/80check_without_target/00-base.xml
index 32dbf847..d6a1432a 100644
--- a/tests/dictionaries/80check_without_target/00-base.xml
+++ b/tests/dictionaries/80check_without_target/00-base.xml
@@ -1,20 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>b</value>
-            </variable>
-            <variable name="int" type="number" description="No change"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_entier">
-            <param name="mini">0</param>
-            <param name="maxi">100</param>
-        </check>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>b</value>
+      </variable>
+      <variable name="int" type="number" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_entier">
+      <param name="mini">0</param>
+      <param name="maxi">100</param>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80condition_itself/00-base.xml b/tests/dictionaries/80condition_itself/00-base.xml
index cec7d54f..96ab5816 100644
--- a/tests/dictionaries/80condition_itself/00-base.xml
+++ b/tests/dictionaries/80condition_itself/00-base.xml
@@ -1,16 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="test">
-            <variable name="replicationtype" description="replicationType"/>
-        </family>
-    </variables>
-    <constraints>
-        <condition name="disabled_if_in" source="replicationtype">
-            <param>leader-leader</param>
-            <target type="variable">replicationType</target>
-        </condition>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="test">
+      <variable name="replicationtype" description="replicationType"/>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="replicationtype">
+      <param>leader-leader</param>
+      <target type="variable">replicationType</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80condition_not_exists_error/00-base.xml b/tests/dictionaries/80condition_not_exists_error/00-base.xml
index 68ee4856..3131b3a0 100644
--- a/tests/dictionaries/80condition_not_exists_error/00-base.xml
+++ b/tests/dictionaries/80condition_not_exists_error/00-base.xml
@@ -1,19 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="condition" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="hidden_if_in" source="condition">
-            <param>oui</param>
-            <target type="family">notexists</target>
-        </condition>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="hidden_if_in" source="condition">
+      <param>oui</param>
+      <target type="family">notexists</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80condition_not_exists_error_var/00-base.xml b/tests/dictionaries/80condition_not_exists_error_var/00-base.xml
index 0780b037..55ed490f 100644
--- a/tests/dictionaries/80condition_not_exists_error_var/00-base.xml
+++ b/tests/dictionaries/80condition_not_exists_error_var/00-base.xml
@@ -1,19 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="condition" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="hidden_if_in" source="condition">
-            <param>oui</param>
-            <target>notexists</target>
-        </condition>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="hidden_if_in" source="condition">
+      <param>oui</param>
+      <target>notexists</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80condition_without_target/00-base.xml b/tests/dictionaries/80condition_without_target/00-base.xml
index cea03270..86606934 100644
--- a/tests/dictionaries/80condition_without_target/00-base.xml
+++ b/tests/dictionaries/80condition_without_target/00-base.xml
@@ -1,27 +1,24 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="condition" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif1" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition optional="True" name="disabled_if_in" source="condition">
-            <param>oui</param>
-        </condition>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition optional="True" name="disabled_if_in" source="condition">
+      <param>oui</param>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80container_files_symlink_without_source/00-base.xml b/tests/dictionaries/80container_files_symlink_without_source/00-base.xml
index 2b582d74..cbedd8e8 100644
--- a/tests/dictionaries/80container_files_symlink_without_source/00-base.xml
+++ b/tests/dictionaries/80container_files_symlink_without_source/00-base.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
-<rougail version="0.9">
-    <services> 
-        <service name='test'>
-            <file file_type="variable">file_name</file>
-        </service>
-    </services>
-    <variables>
-        <family name='general' description="général">
-            <variable name='mode_conteneur_actif' type='string' description="No change" hidden="True">
-                <value>oui</value>
-            </variable>
-            <variable name='file_name' type='string'>
-                <value>/etc/mailname</value>
-            </variable>
-        </family>
-    </variables>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <services>
+    <service name="test">
+      <file file_type="variable">file_name</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>oui</value>
+      </variable>
+      <variable name="file_name" type="string">
+        <value>/etc/mailname</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/80container_filesredefine_error/00-base.xml b/tests/dictionaries/80container_filesredefine_error/00-base.xml
index 2bdfa029..d250f365 100644
--- a/tests/dictionaries/80container_filesredefine_error/00-base.xml
+++ b/tests/dictionaries/80container_filesredefine_error/00-base.xml
@@ -1,17 +1,15 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <services> 
-        <service name="test">
-            <file>/etc/mailname</file>
-        </service>
-    </services>
-    <variables>
-        <family name='general' description="général">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>oui</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <services>
+    <service name="test">
+      <file>/etc/mailname</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>oui</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80container_filesredefine_error/01-base.xml b/tests/dictionaries/80container_filesredefine_error/01-base.xml
index da88e950..ea1eb7ab 100644
--- a/tests/dictionaries/80container_filesredefine_error/01-base.xml
+++ b/tests/dictionaries/80container_filesredefine_error/01-base.xml
@@ -1,10 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <services> 
-        <service name="test">
-            <file source="mailname.new">/etc/mailname</file>
-        </service>
-    </services>
+<rougail version="0.10">
+  <services>
+    <service name="test">
+      <file source="mailname.new">/etc/mailname</file>
+    </service>
+  </services>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80empty_param_number/00_base.xml b/tests/dictionaries/80empty_param_number/00_base.xml
index ec51ecd9..9b684e2e 100644
--- a/tests/dictionaries/80empty_param_number/00_base.xml
+++ b/tests/dictionaries/80empty_param_number/00_base.xml
@@ -1,19 +1,18 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="toto1" type="port" description="Port d'écoute du proxy" mode="expert">
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="toto1" type="port" description="Port d'écoute du proxy" mode="expert">
             </variable>
-            <variable name="toto2" type="port" description="Port d'écoute du proxy NTLM" mode="expert">
-                <value>3127</value>
-            </variable>
-        </family>
-    </variables>
-    <constraints>
-        <fill name="calc_multi_condition">
-	    <param name="value" type="number"/>
-	    <target>toto1</target>
-        </fill>
-    </constraints>
-
+      <variable name="toto2" type="port" description="Port d'écoute du proxy NTLM" mode="expert">
+        <value>3127</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_multi_condition">
+      <param name="value" type="number"/>
+      <target>toto1</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/80empty_typeeole_eole/00_base.xml b/tests/dictionaries/80empty_typeeole_eole/00_base.xml
index 306c2d0b..19d149b0 100644
--- a/tests/dictionaries/80empty_typeeole_eole/00_base.xml
+++ b/tests/dictionaries/80empty_typeeole_eole/00_base.xml
@@ -1,25 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <services/>
-
-    <variables>
-        <family name="general">
-            <variable name="toto1" type="port" description="Port d'écoute du proxy" mode="expert">
+<rougail version="0.10">
+  <services/>
+  <variables>
+    <family name="general">
+      <variable name="toto1" type="port" description="Port d'écoute du proxy" mode="expert">
             </variable>
-            <variable name="toto2" type="port" description="Port d'écoute du proxy NTLM" mode="expert">
-                <value>3127</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_multi_condition">
-            <param>non</param>
-            <param type="variable" name="condition_1" propertyerror="True"/>
-            <param name="match">3128</param>
-            <param name="mismatch" type="variable" propertyerror="True">toto2</param>
-	    <target>toto1</target>
-        </fill>
-    </constraints>
-
+      <variable name="toto2" type="port" description="Port d'écoute du proxy NTLM" mode="expert">
+        <value>3127</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_multi_condition">
+      <param>non</param>
+      <param type="variable" name="condition_1" propertyerror="True"/>
+      <param name="match">3128</param>
+      <param name="mismatch" type="variable" propertyerror="True">toto2</param>
+      <target>toto1</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/80empty_typeeole_number/00_base.xml b/tests/dictionaries/80empty_typeeole_number/00_base.xml
index 41cc206a..a17fc023 100644
--- a/tests/dictionaries/80empty_typeeole_number/00_base.xml
+++ b/tests/dictionaries/80empty_typeeole_number/00_base.xml
@@ -1,19 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <variable name="toto1" type="port" description="Port d'écoute du proxy" mode="expert">
+<rougail version="0.10">
+  <variables>
+    <variable name="toto1" type="port" description="Port d'écoute du proxy" mode="expert">
         </variable>
-        <variable name="toto2" type="port" description="Port d'écoute du proxy NTLM" mode="expert">
-            <value>3127</value>
-        </variable>
-    </variables>
-    <constraints>
-        <fill name="calc_multi_condition">
-            <param>non</param>
-            <param type="number" name="condition_2" propertyerror="True"/>
-            <param name="match">3128</param>
-            <param name="mismatch" type="variable" propertyerror="True">toto2</param>
-            <target>toto1</target>
-        </fill>
-    </constraints>
+    <variable name="toto2" type="port" description="Port d'écoute du proxy NTLM" mode="expert">
+      <value>3127</value>
+    </variable>
+  </variables>
+  <constraints>
+    <fill name="calc_multi_condition">
+      <param>non</param>
+      <param type="number" name="condition_2" propertyerror="True"/>
+      <param name="match">3128</param>
+      <param name="mismatch" type="variable" propertyerror="True">toto2</param>
+      <target>toto1</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/80extra_externalspaceauto/00-base.xml b/tests/dictionaries/80extra_externalspaceauto/00-base.xml
index 0217e0ff..187a814a 100644
--- a/tests/dictionaries/80extra_externalspaceauto/00-base.xml
+++ b/tests/dictionaries/80extra_externalspaceauto/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general" description="général">
-            <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general" description="général">
+      <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80extra_externalspaceauto/extra_dirs/extra/00-base.xml b/tests/dictionaries/80extra_externalspaceauto/extra_dirs/extra/00-base.xml
index 2f0455bf..68a5efc4 100644
--- a/tests/dictionaries/80extra_externalspaceauto/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/80extra_externalspaceauto/extra_dirs/extra/00-base.xml
@@ -1,17 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.9">
-    <variables>
-        <family name='ejabberd'>
-            <variable name="description" type="string">
-                <value>Exportation de la base de ejabberd</value>
-            </variable>
-            <variable name="day" type="schedule"></variable>
-            <variable name="mode" type="schedulemod">
-                <value>pre</value>
-            </variable>
-        </family>
-    </variables>
-    <constraints>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <variables>
+    <family name="ejabberd">
+      <variable name="description" type="string">
+        <value>Exportation de la base de ejabberd</value>
+      </variable>
+      <variable name="day" type="schedule"/>
+      <variable name="mode" type="schedulemod">
+        <value>pre</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
     </constraints>
 </rougail>
diff --git a/tests/dictionaries/80extra_externalspaceauto/extra_dirs/extra1/00-base.xml b/tests/dictionaries/80extra_externalspaceauto/extra_dirs/extra1/00-base.xml
index a45c3442..1236d17d 100644
--- a/tests/dictionaries/80extra_externalspaceauto/extra_dirs/extra1/00-base.xml
+++ b/tests/dictionaries/80extra_externalspaceauto/extra_dirs/extra1/00-base.xml
@@ -1,20 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.9">
-    <variables>
-        <family name='external'>
-            <variable name="description" type="string">
-                <value>test</value>
-            </variable>
-        </family>
-    </variables>
-    <constraints>
-        <fill name='calc_multi_condition'>
-            <param>non</param>
-            <param type='variable' name='condition_1'>extra.ejabberd.day</param>
-            <param name='match'>none</param>
-            <param name='mismatch'>daily</param>
-	    <target>extra1.external.description</target>
-        </fill>
-    </constraints>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <variables>
+    <family name="external">
+      <variable name="description" type="string">
+        <value>test</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_multi_condition">
+      <param>non</param>
+      <param type="variable" name="condition_1">extra.ejabberd.day</param>
+      <param name="match">none</param>
+      <param name="mismatch">daily</param>
+      <target>extra1.external.description</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/80extra_externalspacecondition2/00-base.xml b/tests/dictionaries/80extra_externalspacecondition2/00-base.xml
index 0217e0ff..187a814a 100644
--- a/tests/dictionaries/80extra_externalspacecondition2/00-base.xml
+++ b/tests/dictionaries/80extra_externalspacecondition2/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general" description="général">
-            <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general" description="général">
+      <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80extra_externalspacecondition2/extra_dirs/extra/00-base.xml b/tests/dictionaries/80extra_externalspacecondition2/extra_dirs/extra/00-base.xml
index 2f0455bf..68a5efc4 100644
--- a/tests/dictionaries/80extra_externalspacecondition2/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/80extra_externalspacecondition2/extra_dirs/extra/00-base.xml
@@ -1,17 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.9">
-    <variables>
-        <family name='ejabberd'>
-            <variable name="description" type="string">
-                <value>Exportation de la base de ejabberd</value>
-            </variable>
-            <variable name="day" type="schedule"></variable>
-            <variable name="mode" type="schedulemod">
-                <value>pre</value>
-            </variable>
-        </family>
-    </variables>
-    <constraints>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <variables>
+    <family name="ejabberd">
+      <variable name="description" type="string">
+        <value>Exportation de la base de ejabberd</value>
+      </variable>
+      <variable name="day" type="schedule"/>
+      <variable name="mode" type="schedulemod">
+        <value>pre</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
     </constraints>
 </rougail>
diff --git a/tests/dictionaries/80extra_externalspacecondition2/extra_dirs/extra1/00-base.xml b/tests/dictionaries/80extra_externalspacecondition2/extra_dirs/extra1/00-base.xml
index ece8e1a7..97a77c93 100644
--- a/tests/dictionaries/80extra_externalspacecondition2/extra_dirs/extra1/00-base.xml
+++ b/tests/dictionaries/80extra_externalspacecondition2/extra_dirs/extra1/00-base.xml
@@ -1,17 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.9">
-    <variables>
-        <family name='external'>
-            <variable name="description" type="string">
-                <value>test</value>
-            </variable>
-        </family>
-    </variables>
-    <constraints>
-        <condition name ='disabled_if_in' source='extra1.external.description'>
-            <param>non</param>
-            <target type='family'>extra.ejabberd</target>
-        </condition>
-    </constraints>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <variables>
+    <family name="external">
+      <variable name="description" type="string">
+        <value>test</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="extra1.external.description">
+      <param>non</param>
+      <target type="family">extra.ejabberd</target>
+    </condition>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/80extra_externalspacecondition3/00-base.xml b/tests/dictionaries/80extra_externalspacecondition3/00-base.xml
index 0217e0ff..187a814a 100644
--- a/tests/dictionaries/80extra_externalspacecondition3/00-base.xml
+++ b/tests/dictionaries/80extra_externalspacecondition3/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general" description="général">
-            <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general" description="général">
+      <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80extra_externalspacecondition3/extra_dirs/extra/00-base.xml b/tests/dictionaries/80extra_externalspacecondition3/extra_dirs/extra/00-base.xml
index b02206e1..350a2e22 100644
--- a/tests/dictionaries/80extra_externalspacecondition3/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/80extra_externalspacecondition3/extra_dirs/extra/00-base.xml
@@ -1,17 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.9">
-    <variables>
-        <family name='external'>
-            <variable name="description" type="string">
-                <value>test</value>
-            </variable>
-        </family>
-    </variables>
-    <constraints>
-        <condition name ='disabled_if_in' source='extra1.external.description'>
-            <param>non</param>
-            <target type='family'>general</target>
-        </condition>
-    </constraints>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <variables>
+    <family name="external">
+      <variable name="description" type="string">
+        <value>test</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="extra1.external.description">
+      <param>non</param>
+      <target type="family">general</target>
+    </condition>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/80extra_rougail/00-base.xml b/tests/dictionaries/80extra_rougail/00-base.xml
index d8b5f8f0..3e70495c 100644
--- a/tests/dictionaries/80extra_rougail/00-base.xml
+++ b/tests/dictionaries/80extra_rougail/00-base.xml
@@ -1,15 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80extra_rougail/extra_dirs/rougail/00-base.xml b/tests/dictionaries/80extra_rougail/extra_dirs/rougail/00-base.xml
index cae3048d..081e73b0 100644
--- a/tests/dictionaries/80extra_rougail/extra_dirs/rougail/00-base.xml
+++ b/tests/dictionaries/80extra_rougail/extra_dirs/rougail/00-base.xml
@@ -1,24 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.9">
-    <variables>
-        <family name='ejabberd'>
-            <variable name="description" type="string">
-                <value>Exportation de la base de ejabberd</value>
-            </variable>
-            <variable name="day" type="schedule"></variable>
-            <variable name="mode" type="schedulemod">
-                <value>pre</value>
-            </variable>
-        </family>
-    </variables>
-    <constraints>
-        <fill name='calc_multi_condition'>
-            <param>non</param>
-            <param type='variable' name='condition_1' propertyerror='True'>activer_ejabberd</param>
-            <param name='match'>none</param>
-            <param name='mismatch'>daily</param>
-	    <target>extra.ejabberd.day</target>
-        </fill>
-    </constraints>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <variables>
+    <family name="ejabberd">
+      <variable name="description" type="string">
+        <value>Exportation de la base de ejabberd</value>
+      </variable>
+      <variable name="day" type="schedule"/>
+      <variable name="mode" type="schedulemod">
+        <value>pre</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_multi_condition">
+      <param>non</param>
+      <param type="variable" name="condition_1" propertyerror="True">activer_ejabberd</param>
+      <param name="match">none</param>
+      <param name="mismatch">daily</param>
+      <target>extra.ejabberd.day</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/80extra_services/00-base.xml b/tests/dictionaries/80extra_services/00-base.xml
index d8b5f8f0..3e70495c 100644
--- a/tests/dictionaries/80extra_services/00-base.xml
+++ b/tests/dictionaries/80extra_services/00-base.xml
@@ -1,15 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80extra_services/extra_dirs/services/00-base.xml b/tests/dictionaries/80extra_services/extra_dirs/services/00-base.xml
index ac0557b0..3b736941 100644
--- a/tests/dictionaries/80extra_services/extra_dirs/services/00-base.xml
+++ b/tests/dictionaries/80extra_services/extra_dirs/services/00-base.xml
@@ -1,24 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.9">
-    <variables>
-        <family name='ejabberd'>
-            <variable name="description" type="string">
-                <value>Exportation de la base de ejabberd</value>
-            </variable>
-            <variable name="day" type="schedule"></variable>
-            <variable name="mode" type="schedulemod">
-                <value>pre</value>
-            </variable>
-        </family>
-    </variables>
-    <constraints>
-        <fill name='calc_multi_condition'>
-            <param>non</param>
-            <param type='variable' name='condition_1' propertyerror='False'>activer_ejabberd</param>
-            <param name='match'>none</param>
-            <param name='mismatch'>daily</param>
-	    <target>extra.ejabberd.day</target>
-        </fill>
-    </constraints>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <variables>
+    <family name="ejabberd">
+      <variable name="description" type="string">
+        <value>Exportation de la base de ejabberd</value>
+      </variable>
+      <variable name="day" type="schedule"/>
+      <variable name="mode" type="schedulemod">
+        <value>pre</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_multi_condition">
+      <param>non</param>
+      <param type="variable" name="condition_1" propertyerror="False">activer_ejabberd</param>
+      <param name="match">none</param>
+      <param name="mismatch">daily</param>
+      <target>extra.ejabberd.day</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/80family_appendaccent/00-base.xml b/tests/dictionaries/80family_appendaccent/00-base.xml
index eea45200..a4ec075d 100644
--- a/tests/dictionaries/80family_appendaccent/00-base.xml
+++ b/tests/dictionaries/80family_appendaccent/00-base.xml
@@ -1,24 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="Général">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="Other">
-            <variable name="mode_conteneur_actif3" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_in" source="mode_conteneur_actif3">
-            <param>non</param>
-            <target type="variable">mode_conteneur_actif</target>
-        </condition>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="Général">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="Other">
+      <variable name="mode_conteneur_actif3" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="mode_conteneur_actif3">
+      <param>non</param>
+      <target type="variable">mode_conteneur_actif</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80family_appendaccent/01-base.xml b/tests/dictionaries/80family_appendaccent/01-base.xml
index b31afe12..21d8557e 100644
--- a/tests/dictionaries/80family_appendaccent/01-base.xml
+++ b/tests/dictionaries/80family_appendaccent/01-base.xml
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="Général">
-            <variable name="mode_conteneur_actif1" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="Général">
+      <variable name="mode_conteneur_actif1" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/80family_appendaccent/02-base.xml b/tests/dictionaries/80family_appendaccent/02-base.xml
index 81155361..3d4ad67b 100644
--- a/tests/dictionaries/80family_appendaccent/02-base.xml
+++ b/tests/dictionaries/80family_appendaccent/02-base.xml
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/80family_change/00-base.xml b/tests/dictionaries/80family_change/00-base.xml
index 2c7fbada..568d567a 100644
--- a/tests/dictionaries/80family_change/00-base.xml
+++ b/tests/dictionaries/80family_change/00-base.xml
@@ -1,15 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif1" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80family_change/01-base.xml b/tests/dictionaries/80family_change/01-base.xml
index 330752a1..db3b1a37 100644
--- a/tests/dictionaries/80family_change/01-base.xml
+++ b/tests/dictionaries/80family_change/01-base.xml
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="other">
-            <variable name="mode_conteneur_actif1" redefine="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="other">
+      <variable name="mode_conteneur_actif1" redefine="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/80family_dynamic_calc_invalid_suffix/00-base.xml b/tests/dictionaries/80family_dynamic_calc_invalid_suffix/00-base.xml
index 7fbdd546..eed87bb4 100644
--- a/tests/dictionaries/80family_dynamic_calc_invalid_suffix/00-base.xml
+++ b/tests/dictionaries/80family_dynamic_calc_invalid_suffix/00-base.xml
@@ -1,26 +1,25 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.9">
-    <variables>
-        <family name='general'>
-            <variable name='varname' type='string' description="No change" multi="True">
-                <value>val1</value>
-                <value>val2</value>
-            </variable>
-        </family>
-        <family name='dyn' dynamic="varname">
-            <variable name='vardyn' type='string' description="No change">
-                <value>val</value>
-            </variable>
-        </family>
-        <family name='new'>
-            <variable name='newvar' type='string' description="No change"/>
-        </family>
-    </variables>
-    <constraints>
-        <fill name="calc_val">
-            <param type="suffix">unknown</param>
-	    <target>vardyn</target>
-        </fill>
-    </constraints>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="varname" type="string" description="No change" multi="True">
+        <value>val1</value>
+        <value>val2</value>
+      </variable>
+    </family>
+    <family name="dyn" dynamic="varname">
+      <variable name="vardyn" type="string" description="No change">
+        <value>val</value>
+      </variable>
+    </family>
+    <family name="new">
+      <variable name="newvar" type="string" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="suffix">unknown</param>
+      <target>vardyn</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/80family_dynamic_check/00-base.xml b/tests/dictionaries/80family_dynamic_check/00-base.xml
index 5136eadf..1a9e1f91 100644
--- a/tests/dictionaries/80family_dynamic_check/00-base.xml
+++ b/tests/dictionaries/80family_dynamic_check/00-base.xml
@@ -1,22 +1,21 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.9">
-    <variables>
-        <family name='general'>
-            <variable name='varname' type='string' description="No change" multi="True">
-                <value>val1</value>
-                <value>val2</value>
-            </variable>
-        </family>
-        <family name='dyn' dynamic="varname">
-            <variable name='vardyn' type='number' description="No change"/>
-        </family>
-    </variables>
-    <constraints>
-        <check name="valid_entier">
-            <param name="mini" type="number">0</param>
-            <param name="maxi" type="number">100</param>
-            <target>vardynval1</target>
-        </check>
-    </constraints>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="varname" type="string" description="No change" multi="True">
+        <value>val1</value>
+        <value>val2</value>
+      </variable>
+    </family>
+    <family name="dyn" dynamic="varname">
+      <variable name="vardyn" type="number" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_entier">
+      <param name="mini" type="number">0</param>
+      <param name="maxi" type="number">100</param>
+      <target>vardynval1</target>
+    </check>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/80family_dynamic_not_multi/00-base.xml b/tests/dictionaries/80family_dynamic_not_multi/00-base.xml
index fa524864..c608daf6 100644
--- a/tests/dictionaries/80family_dynamic_not_multi/00-base.xml
+++ b/tests/dictionaries/80family_dynamic_not_multi/00-base.xml
@@ -1,14 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.9">
-    <variables>
-        <family name='general'>
-            <variable name='varname' type='string' description="No change">
-                <value>val1</value>
-            </variable>
-        </family>
-        <family name='dyn' dynamic="varname">
-            <variable name='vardyn' type='string' description="No change"/>
-        </family>
-    </variables>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="varname" type="string" description="No change">
+        <value>val1</value>
+      </variable>
+    </family>
+    <family name="dyn" dynamic="varname">
+      <variable name="vardyn" type="string" description="No change"/>
+    </family>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/80family_dynamic_with_family/00-base.xml b/tests/dictionaries/80family_dynamic_with_family/00-base.xml
index b5de9b92..f62b708c 100644
--- a/tests/dictionaries/80family_dynamic_with_family/00-base.xml
+++ b/tests/dictionaries/80family_dynamic_with_family/00-base.xml
@@ -1,16 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.9">
-    <variables>
-        <family name='general'>
-            <variable name='varname' type='string' description="No change" multi="True">
-                <value>val1</value>
-                <value>val2</value>
-            </variable>
-        </family>
-        <family name='dyn' dynamic="varname">
-            <variable name='vardyn' type='string' description="No change"/>
-	    <family name="my_family"/>
-        </family>
-    </variables>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="varname" type="string" description="No change" multi="True">
+        <value>val1</value>
+        <value>val2</value>
+      </variable>
+    </family>
+    <family name="dyn" dynamic="varname">
+      <variable name="vardyn" type="string" description="No change"/>
+      <family name="my_family"/>
+    </family>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/80family_not_dynamic_calc_suffix/00-base.xml b/tests/dictionaries/80family_not_dynamic_calc_suffix/00-base.xml
index 4e9f0861..e764aceb 100644
--- a/tests/dictionaries/80family_not_dynamic_calc_suffix/00-base.xml
+++ b/tests/dictionaries/80family_not_dynamic_calc_suffix/00-base.xml
@@ -1,26 +1,25 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.9">
-    <variables>
-        <family name='general'>
-            <variable name='varname' type='string' description="No change" multi="True">
-                <value>val1</value>
-                <value>val2</value>
-            </variable>
-        </family>
-        <family name='dyn' dynamic="varname">
-            <variable name='vardyn' type='string' description="No change">
-                <value>val</value>
-            </variable>
-        </family>
-        <family name='new'>
-            <variable name='newvar' type='string' description="No change"/>
-        </family>
-    </variables>
-    <constraints>
-        <fill name="calc_val">
-            <param type="suffix"/>
-	    <target>newvar</target>
-        </fill>
-    </constraints>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="varname" type="string" description="No change" multi="True">
+        <value>val1</value>
+        <value>val2</value>
+      </variable>
+    </family>
+    <family name="dyn" dynamic="varname">
+      <variable name="vardyn" type="string" description="No change">
+        <value>val</value>
+      </variable>
+    </family>
+    <family name="new">
+      <variable name="newvar" type="string" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="suffix"/>
+      <target>newvar</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/80family_only_on_suffix/00-base.xml b/tests/dictionaries/80family_only_on_suffix/00-base.xml
index 65816e5f..c243b2e4 100644
--- a/tests/dictionaries/80family_only_on_suffix/00-base.xml
+++ b/tests/dictionaries/80family_only_on_suffix/00-base.xml
@@ -1,21 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.9">
-    <variables>
-        <family name='general'>
-            <variable name='varname' type='string' description="No change" multi="True">
-                <value>val1</value>
-                <value>val2</value>
-            </variable>
-        </family>
-        <family name='dyn' dynamic="varname">
-            <variable name='vardyn' type='string' description="No change"/>
-        </family>
-    </variables>
-    <constraints>
-        <fill name="calc_val">
-            <param>value</param>
-	    <target>vardynval1</target>
-        </fill>
-    </constraints>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="varname" type="string" description="No change" multi="True">
+        <value>val1</value>
+        <value>val2</value>
+      </variable>
+    </family>
+    <family name="dyn" dynamic="varname">
+      <variable name="vardyn" type="string" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param>value</param>
+      <target>vardynval1</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/80family_several/00-base.xml b/tests/dictionaries/80family_several/00-base.xml
index d53f2304..973cf9be 100644
--- a/tests/dictionaries/80family_several/00-base.xml
+++ b/tests/dictionaries/80family_several/00-base.xml
@@ -1,30 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="general">
-            <variable name="leader" type="string" description="leader" multi="True"/>
-            <variable name="follower1" type="string" description="follower1" multi="True"/>
-            <variable name="follower2" type="string" description="follower2" multi="True"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param name="valeur">valfill</param>
-	    <target>follower1</target>
-        </fill>
-        <fill name="calc_val">
-            <param type="variable">follower1</param>
-	    <target>follower2</target>
-        </fill>
-        <group leader="leader">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="general">
+      <family name="leader" description="leader" leadership="True">
+        <variable name="leader" type="string" description="leader" multi="True"/>
+        <variable name="follower1" type="string" description="follower1" multi="True"/>
+        <variable name="follower2" type="string" description="follower2" multi="True"/>
+      </family>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valfill</param>
+      <target>follower1</target>
+    </fill>
+    <fill name="calc_val">
+      <param type="variable">follower1</param>
+      <target>follower2</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/80family_unique/00-base.xml b/tests/dictionaries/80family_unique/00-base.xml
index d4a6768c..768591e0 100644
--- a/tests/dictionaries/80family_unique/00-base.xml
+++ b/tests/dictionaries/80family_unique/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <family name="general">
-                <variable name="my_variable"/>
-            </family>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <family name="general">
+        <variable name="my_variable"/>
+      </family>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80family_variable_not_same_name/00-base.xml b/tests/dictionaries/80family_variable_not_same_name/00-base.xml
index 6d300ef6..f5b18339 100644
--- a/tests/dictionaries/80family_variable_not_same_name/00-base.xml
+++ b/tests/dictionaries/80family_variable_not_same_name/00-base.xml
@@ -1,11 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="my_variable2"/>
-        </family>
-        <variable name="general"/>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="my_variable2"/>
+    </family>
+    <variable name="general"/>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80familyaction_accent/00-base.xml b/tests/dictionaries/80familyaction_accent/00-base.xml
index fe0ee547..c1a03c50 100644
--- a/tests/dictionaries/80familyaction_accent/00-base.xml
+++ b/tests/dictionaries/80familyaction_accent/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="général">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80familyaction_accent/extra_dirs/extra/00-base.xml b/tests/dictionaries/80familyaction_accent/extra_dirs/extra/00-base.xml
index 03e2ed73..102f3af8 100644
--- a/tests/dictionaries/80familyaction_accent/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/80familyaction_accent/extra_dirs/extra/00-base.xml
@@ -1,9 +1,10 @@
-<rougail version="0.9">
-    <variables>
-        <family name="test">	
-            <variable name="delay" type="number" description="délai en minutes avant lancement">
-                <value>0</value>
-            </variable>
-        </family>
-    </variables>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <variables>
+    <family name="test">
+      <variable name="delay" type="number" description="délai en minutes avant lancement">
+        <value>0</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/80file_wrong_type/00-base.xml b/tests/dictionaries/80file_wrong_type/00-base.xml
index 41f2f638..3f9482b4 100644
--- a/tests/dictionaries/80file_wrong_type/00-base.xml
+++ b/tests/dictionaries/80file_wrong_type/00-base.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
-<rougail version="0.9">
-    <services> 
-        <service name='test'>
-            <file file_type="variable" source="mailname">file_name</file>
-        </service>
-    </services>
-    <variables>
-        <variable name='file_name' type='string'>
-            <value>/etc/mailname</value>
-        </variable>
-    </variables>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <services>
+    <service name="test">
+      <file file_type="variable" source="mailname">file_name</file>
+    </service>
+  </services>
+  <variables>
+    <variable name="file_name" type="string">
+      <value>/etc/mailname</value>
+    </variable>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/80fill_baseaccent/00-base.xml b/tests/dictionaries/80fill_baseaccent/00-base.xml
index 03c8dd40..cbe02d24 100644
--- a/tests/dictionaries/80fill_baseaccent/00-base.xml
+++ b/tests/dictionaries/80fill_baseaccent/00-base.xml
@@ -1,22 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="Général">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif1" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param type="variable">mode_conteneur_actif1</param>
-            <target>mode_conteneur_actif</target>
-        </fill>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="Général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="variable">mode_conteneur_actif1</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80fill_error/00-base.xml b/tests/dictionaries/80fill_error/00-base.xml
index def2932e..90bcf5ea 100644
--- a/tests/dictionaries/80fill_error/00-base.xml
+++ b/tests/dictionaries/80fill_error/00-base.xml
@@ -1,24 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param name="valeur">valeur</param>
-            <target>mode_conteneur_actif</target>
-        </fill>
-        <fill name="calc_val">
-            <param name="valeur">valeur2</param>
-            <target>mode_conteneur_actif</target>
-        </fill>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valeur</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+    <fill name="calc_val">
+      <param name="valeur">valeur2</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80fill_multi/00-base.xml b/tests/dictionaries/80fill_multi/00-base.xml
index 9606cc8c..4dedf3de 100644
--- a/tests/dictionaries/80fill_multi/00-base.xml
+++ b/tests/dictionaries/80fill_multi/00-base.xml
@@ -1,26 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif1" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param>value</param>
-            <target>mode_conteneur_actif</target>
-        </fill>
-        <fill name="calc_val">
-            <param name="variable">mode_conteneur_actif1</param>
-            <target>mode_conteneur_actif</target>
-        </fill>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param>value</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+    <fill name="calc_val">
+      <param name="variable">mode_conteneur_actif1</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80fill_not_exists/00-base.xml b/tests/dictionaries/80fill_not_exists/00-base.xml
index 131e69d6..c162fc61 100644
--- a/tests/dictionaries/80fill_not_exists/00-base.xml
+++ b/tests/dictionaries/80fill_not_exists/00-base.xml
@@ -1,24 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif1" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param type="variable">mode_conteneur_actif4</param>
-            <param type="variable">mode_conteneur_actif1</param>
-            <param type="variable" optional="True">mode_conteneur_actif3</param>
-            <target>mode_conteneur_actif</target>
-        </fill>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="variable">mode_conteneur_actif4</param>
+      <param type="variable">mode_conteneur_actif1</param>
+      <param type="variable" optional="True">mode_conteneur_actif3</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80fill_unknown_function/00-base.xml b/tests/dictionaries/80fill_unknown_function/00-base.xml
index 652dfb87..74618199 100644
--- a/tests/dictionaries/80fill_unknown_function/00-base.xml
+++ b/tests/dictionaries/80fill_unknown_function/00-base.xml
@@ -1,20 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change"/>
-            <variable name="mode_conteneur_actif1" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="unknown_function">
-            <param type="variable">mode_conteneur_actif1</param>
-            <target>mode_conteneur_actif</target>
-        </fill>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change"/>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="unknown_function">
+      <param type="variable">mode_conteneur_actif1</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80frozenifin_unknown/00-base.xml b/tests/dictionaries/80frozenifin_unknown/00-base.xml
index 399abe46..7e34ddd1 100644
--- a/tests/dictionaries/80frozenifin_unknown/00-base.xml
+++ b/tests/dictionaries/80frozenifin_unknown/00-base.xml
@@ -1,30 +1,26 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general" mode="expert">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="enumfam" mode="expert">
-            <variable name="enumvar" type="number" description="enumvar" help="bla bla bla"/>
-            <variable name="test_variable" type="number" description="test variable"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_enum">
-            <param>1</param>
-            <param>2</param>
-            <param>3</param>
-            <target>enumvar</target>
-        </check>
-        <condition name="hidden_if_in" source="condition">
-            <param>4</param>
-            <target type="variable">test_variable</target>
-        </condition>
-    </constraints>
-
+<rougail version="0.10">
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="enumfam" mode="expert">
+      <variable name="enumvar" type="number" description="enumvar" help="bla bla bla"/>
+      <variable name="test_variable" type="number" description="test variable"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>1</param>
+      <param>2</param>
+      <param>3</param>
+      <target>enumvar</target>
+    </check>
+    <condition name="hidden_if_in" source="condition">
+      <param>4</param>
+      <target type="variable">test_variable</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80hidden_if_in_dynamic/00-base.xml b/tests/dictionaries/80hidden_if_in_dynamic/00-base.xml
index a547bdc3..2893c6a0 100644
--- a/tests/dictionaries/80hidden_if_in_dynamic/00-base.xml
+++ b/tests/dictionaries/80hidden_if_in_dynamic/00-base.xml
@@ -1,26 +1,25 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.9">
-    <variables>
-        <family name='general'>
-            <variable name='varname' type='string' description="No change" multi="True">
-                <value>val1</value>
-                <value>val2</value>
-            </variable>
-        </family>
-        <family name='dyn' dynamic="varname">
-            <variable name='vardyn' type='string' description="No change">
-                <value>val</value>
-            </variable>
-        </family>
-        <family name='new'>
-            <variable name='newvar' type='string' description="No change"/>
-        </family>
-    </variables>
-    <constraints>
-        <condition name="hidden_if_in" source="vardynval1">
-            <param>non</param>
-            <target type="family">new</target>
-        </condition>
-    </constraints>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="varname" type="string" description="No change" multi="True">
+        <value>val1</value>
+        <value>val2</value>
+      </variable>
+    </family>
+    <family name="dyn" dynamic="varname">
+      <variable name="vardyn" type="string" description="No change">
+        <value>val</value>
+      </variable>
+    </family>
+    <family name="new">
+      <variable name="newvar" type="string" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="hidden_if_in" source="vardynval1">
+      <param>non</param>
+      <target type="family">new</target>
+    </condition>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/80hidden_if_in_filelist/00-base.xml b/tests/dictionaries/80hidden_if_in_filelist/00-base.xml
index 7aaf14d7..06b525ad 100644
--- a/tests/dictionaries/80hidden_if_in_filelist/00-base.xml
+++ b/tests/dictionaries/80hidden_if_in_filelist/00-base.xml
@@ -1,26 +1,24 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <services>
-        <service name="test">
-            <file filelist="afilllist">/tmp/file1</file>
-        </service>
-    </services>
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="condition" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-    <constraints>
-        <condition name="hidden_if_in" source="activer_clam" optional="True">
-            <param>non</param>
-            <target type="filelist">afilllist</target>
-        </condition>
-    </constraints>
+<rougail version="0.10">
+  <services>
+    <service name="test">
+      <file filelist="afilllist">/tmp/file1</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="hidden_if_in" source="activer_clam" optional="True">
+      <param>non</param>
+      <target type="filelist">afilllist</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80invalid_dtd/00_base.xml b/tests/dictionaries/80invalid_dtd/00_base.xml
index 01935505..b1ad46d1 100644
--- a/tests/dictionaries/80invalid_dtd/00_base.xml
+++ b/tests/dictionaries/80invalid_dtd/00_base.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <services>
-        <unknown>
+<rougail version="0.10">
+  <services>
+    <unknown>
         </unknown>
-    </services>
+  </services>
 </rougail>
diff --git a/tests/dictionaries/80leadership_accent/00-base.xml b/tests/dictionaries/80leadership_accent/00-base.xml
index b38a223d..054ce0e0 100644
--- a/tests/dictionaries/80leadership_accent/00-base.xml
+++ b/tests/dictionaries/80leadership_accent/00-base.xml
@@ -1,30 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="general1">
-            <variable name="leader" type="string" multi="True"/>
-            <variable name="Followér1" type="string"/>
-            <variable name="Followér2" type="string"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param name="valeur">valfill</param>
-	    <target>follower1</target>
-        </fill>
-        <fill name="calc_val">
-            <param type="variable">Followér1</param>
-	    <target>follower2</target>
-        </fill>
-        <group leader="leader">
-            <follower>Followér1</follower>
-            <follower>Followér2</follower>
-        </group>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="general1">
+      <family name="leader" description="leader" leadership="True">
+        <variable name="leader" type="string" multi="True"/>
+        <variable name="Followér1" type="string"/>
+        <variable name="Followér2" type="string"/>
+      </family>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valfill</param>
+      <target>follower1</target>
+    </fill>
+    <fill name="calc_val">
+      <param type="variable">Followér1</param>
+      <target>follower2</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/80leadership_accent_leader/00-base.xml b/tests/dictionaries/80leadership_accent_leader/00-base.xml
index 59013e03..b742a27b 100644
--- a/tests/dictionaries/80leadership_accent_leader/00-base.xml
+++ b/tests/dictionaries/80leadership_accent_leader/00-base.xml
@@ -1,30 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="general1">
-            <variable name="Léader" type="string" multi="True"/>
-            <variable name="follower1" type="string"/>
-            <variable name="follower2" type="string"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param name="valeur">valfill</param>
-	    <target>follower1</target>
-        </fill>
-        <fill name="calc_val">
-            <param type="variable">follower1</param>
-	    <target>follower2</target>
-        </fill>
-        <group leader="Léader">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="general1">
+      <family name="Léader" description="Léader" leadership="True">
+        <variable name="Léader" type="string" multi="True"/>
+        <variable name="follower1" type="string"/>
+        <variable name="follower2" type="string"/>
+      </family>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valfill</param>
+      <target>follower1</target>
+    </fill>
+    <fill name="calc_val">
+      <param type="variable">follower1</param>
+      <target>follower2</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/80leadership_auto_save/00-base.xml b/tests/dictionaries/80leadership_auto_save/00-base.xml
index be9f75ad..0991d781 100644
--- a/tests/dictionaries/80leadership_auto_save/00-base.xml
+++ b/tests/dictionaries/80leadership_auto_save/00-base.xml
@@ -1,29 +1,26 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <variable name="server_deployed" type="boolean"/>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-              <value>non</value>
-            </variable>
-            <variable name="leader" type="string" description="leader" multi="True"/>
-            <variable name="follower1" type="string" description="follower1"/>
-            <variable name="follower2" type="string" description="follower2" auto_save="True"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param name="valeur">valfill</param>
-            <target>follower1</target>
-        </fill>
-        <fill name="calc_val">
-            <param type="variable">follower1</param>
-            <target>follower2</target>
-        </fill>
-        <group leader="leader">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <variable name="server_deployed" type="boolean"/>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <family name="leader" description="leader" leadership="True">
+        <variable name="leader" type="string" description="leader" multi="True"/>
+        <variable name="follower1" type="string" description="follower1"/>
+        <variable name="follower2" type="string" description="follower2" auto_save="True"/>
+      </family>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valfill</param>
+      <target>follower1</target>
+    </fill>
+    <fill name="calc_val">
+      <param type="variable">follower1</param>
+      <target>follower2</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/80leadership_autofreeze/00-base.xml b/tests/dictionaries/80leadership_autofreeze/00-base.xml
index 41349632..f3f2e5f9 100644
--- a/tests/dictionaries/80leadership_autofreeze/00-base.xml
+++ b/tests/dictionaries/80leadership_autofreeze/00-base.xml
@@ -1,26 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="server_deployed" type="boolean"/>
-            <variable name="leader" description="leader" auto_freeze="True" multi="True"/>
-            <variable name="follower1" multi="True"/>
-            <variable name="follower2" multi="True"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param name="valeur">valfill</param>
-            <target>follower1</target>
-        </fill>
-        <fill name="calc_val">
-            <param type="variable">follower1</param>
-            <target>follower2</target>
-        </fill>
-        <group leader="leader">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="server_deployed" type="boolean"/>
+      <family name="leader" description="leader" leadership="True">
+        <variable name="leader" description="leader" auto_freeze="True" multi="True"/>
+        <variable name="follower1" multi="True"/>
+        <variable name="follower2" multi="True"/>
+      </family>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valfill</param>
+      <target>follower1</target>
+    </fill>
+    <fill name="calc_val">
+      <param type="variable">follower1</param>
+      <target>follower2</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/80leadership_familyaccent/00-base.xml b/tests/dictionaries/80leadership_familyaccent/00-base.xml
index e0dfdd9c..8fe72c77 100644
--- a/tests/dictionaries/80leadership_familyaccent/00-base.xml
+++ b/tests/dictionaries/80leadership_familyaccent/00-base.xml
@@ -1,28 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="Général">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="leader" type="string" description="leader" multi="True"/>
-            <variable name="follower1" type="string" description="follower1"/>
-            <variable name="follower2" type="string" description="follower2"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param name="valeur">valfill</param>
-	    <target>follower1</target>
-        </fill>
-        <fill name="calc_val">
-            <param type="variable">follower1</param>
-	    <target>follower2</target>
-        </fill>
-        <group leader="leader">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="Général">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <family name="leader" description="leader" leadership="True">
+        <variable name="leader" type="string" description="leader" multi="True"/>
+        <variable name="follower1" type="string" description="follower1"/>
+        <variable name="follower2" type="string" description="follower2"/>
+      </family>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valfill</param>
+      <target>follower1</target>
+    </fill>
+    <fill name="calc_val">
+      <param type="variable">follower1</param>
+      <target>follower2</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/80leadership_leader_not_multi/00-base.xml b/tests/dictionaries/80leadership_leader_not_multi/00-base.xml
index 5e04647a..13f30b17 100644
--- a/tests/dictionaries/80leadership_leader_not_multi/00-base.xml
+++ b/tests/dictionaries/80leadership_leader_not_multi/00-base.xml
@@ -1,22 +1,18 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="general1">
-            <variable name="leader" type="string" description="leader"/>
-            <variable name="follower1" type="string" description="follower1"/>
-            <variable name="follower2" type="string" description="follower2"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <group leader="leader">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="general1">
+      <family name="leader" description="leader" leadership="True">
+        <variable name="leader" type="string" description="leader"/>
+        <variable name="follower1" type="string" description="follower1"/>
+        <variable name="follower2" type="string" description="follower2"/>
+      </family>
+    </family>
+  </variables>
+  <constraints/>
 </rougail>
diff --git a/tests/dictionaries/80leadership_none_follower_between_follower/00-base.xml b/tests/dictionaries/80leadership_none_follower_between_follower/00-base.xml
deleted file mode 100644
index f09a21fe..00000000
--- a/tests/dictionaries/80leadership_none_follower_between_follower/00-base.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="leader" type="string" description="leader" multi="True"/>
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="follower1" type="string" description="follower1"/>
-            <variable name="follower2" type="string" description="follower2"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param name="valeur">valfill</param>
-            <target>follower1</target>
-        </fill>
-        <fill name="calc_val">
-            <param type="variable">follower1</param>
-            <target>follower2</target>
-        </fill>
-        <group leader="leader">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-    </constraints>
-</rougail>
diff --git a/tests/dictionaries/80leadership_not_ordered/00-base.xml b/tests/dictionaries/80leadership_not_ordered/00-base.xml
deleted file mode 100644
index 9c5b0541..00000000
--- a/tests/dictionaries/80leadership_not_ordered/00-base.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="general1">
-            <variable name="leader" type="string" description="leader" multi="True"/>
-            <variable name="follower1" type="string" description="follower1"/>
-            <variable name="follower2" type="string" description="follower2"/>
-        </family>
-    </variables>
-
-    <constraints>
-	<fill name="calc_val">
-            <param name="valeur">valfill</param>
-            <target>follower1</target>
-        </fill>
-	<fill name="calc_val">
-            <param type="variable">follower1</param>
-            <target>follower2</target>
-        </fill>
-        <group leader="leader">
-            <follower>follower2</follower>
-            <follower>follower1</follower>
-        </group>
-    </constraints>
-</rougail>
diff --git a/tests/dictionaries/80leadership_not_same_family/00-base.xml b/tests/dictionaries/80leadership_not_same_family/00-base.xml
deleted file mode 100644
index 1b7c1d2a..00000000
--- a/tests/dictionaries/80leadership_not_same_family/00-base.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="general1">
-            <variable name="leader" type="string" description="leader" multi="True"/>
-            <variable name="follower1" type="string" description="follower1"/>
-        </family>
-        <family name="general2">
-            <variable name="follower2" type="string" description="follower2"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param name="valeur">valfill</param>
-            <target>follower1</target>
-        </fill>
-	<fill name="calc_val">
-            <param type="variable">follower1</param>
-            <target>follower2</target>
-        </fill>
-        <group leader="leader">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-    </constraints>
-</rougail>
diff --git a/tests/dictionaries/80leadership_notexists/00-base.xml b/tests/dictionaries/80leadership_notexists/00-base.xml
deleted file mode 100644
index aae9b700..00000000
--- a/tests/dictionaries/80leadership_notexists/00-base.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-              <value>non</value>
-            </variable>
-            <variable name="leader" type="string" description="leader" multi="True"/>
-            <variable name="follower1" type="string" description="follower1"/>
-            <variable name="follower2" type="string" description="follower2" auto_save="True"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param name="valeur">valfill</param>
-            <target>follower1</target>
-        </fill>
-	<fill name="calc_val">
-            <param type="variable">follower1</param>
-            <target>follower2</target>
-        </fill>
-        <group leader="leader">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-        <group leader="leader1">
-            <follower>follower3</follower>
-            <follower>follower4</follower>
-        </group>
-    </constraints>
-</rougail>
diff --git a/tests/dictionaries/80load_disabled_if_inaccent_family/00-base.xml b/tests/dictionaries/80load_disabled_if_inaccent_family/00-base.xml
index ce569d65..a2df9732 100644
--- a/tests/dictionaries/80load_disabled_if_inaccent_family/00-base.xml
+++ b/tests/dictionaries/80load_disabled_if_inaccent_family/00-base.xml
@@ -1,32 +1,29 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="Général">
-            <variable name="condition" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif" type="string" description="No change" >
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="Général2">
-            <variable name="mode_conteneur_actif3" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_in" source="condition">
-            <param>oui</param>
-            <target type="variable">mode_conteneur_actif</target>
-            <target type="variable">mode_conteneur_actif2</target>
-            <target type="family">Général2</target>
-        </condition>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="Général">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="Général2">
+      <variable name="mode_conteneur_actif3" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+      <target type="family">Général2</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80load_leadership_normalize_family/00-base.xml b/tests/dictionaries/80load_leadership_normalize_family/00-base.xml
index fed57268..0fd9f356 100644
--- a/tests/dictionaries/80load_leadership_normalize_family/00-base.xml
+++ b/tests/dictionaries/80load_leadership_normalize_family/00-base.xml
@@ -1,21 +1,18 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="general-1">
-            <variable name="leader" type="string" description="leader" multi="True"/>
-            <variable name="follower1" type="string" description="follower1"/>
-            <variable name="follower2" type="string" description="follower2"/>
-        </family>
-    </variables>
-    <constraints>
-        <group leader="leader">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="general-1">
+      <family name="leader" description="leader" leadership="True">
+        <variable name="leader" type="string" description="leader" multi="True"/>
+        <variable name="follower1" type="string" description="follower1"/>
+        <variable name="follower2" type="string" description="follower2"/>
+      </family>
+    </family>
+  </variables>
+  <constraints/>
 </rougail>
diff --git a/tests/dictionaries/80load_leadership_normalize_family/01-base.xml b/tests/dictionaries/80load_leadership_normalize_family/01-base.xml
index 3641da10..ab25f6c9 100644
--- a/tests/dictionaries/80load_leadership_normalize_family/01-base.xml
+++ b/tests/dictionaries/80load_leadership_normalize_family/01-base.xml
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general-1">
-            <variable name="leader" redefine="True" mandatory="True"/>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general-1">
+      <variable name="leader" redefine="True" mandatory="True"/>
+    </family>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/80load_mandatoryifin_family/00-base.xml b/tests/dictionaries/80load_mandatoryifin_family/00-base.xml
index 2be2b27e..710ee562 100644
--- a/tests/dictionaries/80load_mandatoryifin_family/00-base.xml
+++ b/tests/dictionaries/80load_mandatoryifin_family/00-base.xml
@@ -1,20 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="condition" type="boolean"/>
-        </family>
-        <family name="general2">
-            <variable name="my_variable"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="mandatory_if_in" source="condition">
-            <param>oui</param>
-            <target type="family">general2</target>
-        </condition>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="condition" type="boolean"/>
+    </family>
+    <family name="general2">
+      <variable name="my_variable"/>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="mandatory_if_in" source="condition">
+      <param>oui</param>
+      <target type="family">general2</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80mode_conflict/00-base.xml b/tests/dictionaries/80mode_conflict/00-base.xml
index b13b1ea0..07d5a52e 100644
--- a/tests/dictionaries/80mode_conflict/00-base.xml
+++ b/tests/dictionaries/80mode_conflict/00-base.xml
@@ -1,13 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <variable name="server_deployed" type="boolean"/>
-        <family name="general" mode="normal">
-            <variable name="mode_conteneur_actif" type="string" description="No change" mode="expert">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <variable name="server_deployed" type="boolean"/>
+    <family name="general" mode="normal">
+      <variable name="mode_conteneur_actif" type="string" description="No change" mode="expert">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80mode_leadership_conflict/00-base.xml b/tests/dictionaries/80mode_leadership_conflict/00-base.xml
index 84623be4..b2b511f5 100644
--- a/tests/dictionaries/80mode_leadership_conflict/00-base.xml
+++ b/tests/dictionaries/80mode_leadership_conflict/00-base.xml
@@ -1,26 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general" mode="expert">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="leadermode">
-            <variable name="leader" type="string" description="leader" multi="True" mode="expert"/>
-            <variable name="follower1" type="string" description="follower1" mode="normal"/>
-            <variable name="follower2" type="string" description="follower2"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_list">
-            <param name="valeur">valfill</param>
-	    <target>leader</target>
-        </fill>
-        <group leader="leader">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="leadermode">
+      <family name="leader" description="leader" leadership="True">
+        <variable name="leader" type="string" description="leader" multi="True" mode="expert"/>
+        <variable name="follower1" type="string" description="follower1" mode="normal"/>
+        <variable name="follower2" type="string" description="follower2"/>
+      </family>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_list">
+      <param name="valeur">valfill</param>
+      <target>leader</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/80multi_family_mode_conflict/00-base.xml b/tests/dictionaries/80multi_family_mode_conflict/00-base.xml
index ddfc0f87..754c7fc8 100644
--- a/tests/dictionaries/80multi_family_mode_conflict/00-base.xml
+++ b/tests/dictionaries/80multi_family_mode_conflict/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="base" mode="expert">
-            <family name="subfamily">
-                <variable name="variable" mode="basic"/>
-            </family>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="base" mode="expert">
+      <family name="subfamily">
+        <variable name="variable" mode="basic"/>
+      </family>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80nil_with_value/00-base.xml b/tests/dictionaries/80nil_with_value/00-base.xml
index b6c20a82..2126f0e0 100644
--- a/tests/dictionaries/80nil_with_value/00-base.xml
+++ b/tests/dictionaries/80nil_with_value/00-base.xml
@@ -1,27 +1,24 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="condition" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_in" source="condition">
-            <param type="nil">value</param>
-            <target type="variable">mode_conteneur_actif</target>
-            <target type="variable">mode_conteneur_actif2</target>
-            <target type="filelist">afilllist</target>
-        </condition>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param type="nil">value</param>
+      <target type="variable">mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+      <target type="filelist">afilllist</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80no_leadership_index/00-base.xml b/tests/dictionaries/80no_leadership_index/00-base.xml
index 4804f80f..27187799 100644
--- a/tests/dictionaries/80no_leadership_index/00-base.xml
+++ b/tests/dictionaries/80no_leadership_index/00-base.xml
@@ -1,13 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <variable name="my_variable"/>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param type="index"/>
-            <target>my_variable</target>
-        </fill>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <variable name="my_variable"/>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="index"/>
+      <target>my_variable</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/80override_twice/00-base.xml b/tests/dictionaries/80override_twice/00-base.xml
index 8345c642..deca7378 100644
--- a/tests/dictionaries/80override_twice/00-base.xml
+++ b/tests/dictionaries/80override_twice/00-base.xml
@@ -1,20 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-
-    <services>
-        <service name="test">
-            <override/>
-            <override/>
-        </service>
-    </services>
-
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <services>
+    <service name="test">
+      <override/>
+      <override/>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80redefine_double_error/00-base.xml b/tests/dictionaries/80redefine_double_error/00-base.xml
index 9ea33030..210875c0 100644
--- a/tests/dictionaries/80redefine_double_error/00-base.xml
+++ b/tests/dictionaries/80redefine_double_error/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80redefine_double_error/01-base.xml b/tests/dictionaries/80redefine_double_error/01-base.xml
index 7fa2b135..8e94f521 100644
--- a/tests/dictionaries/80redefine_double_error/01-base.xml
+++ b/tests/dictionaries/80redefine_double_error/01-base.xml
@@ -1,10 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" redefine="True"/>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" redefine="True"/>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80redefine_double_error/02-base.xml b/tests/dictionaries/80redefine_double_error/02-base.xml
index 098b70bc..61108d3e 100644
--- a/tests/dictionaries/80redefine_double_error/02-base.xml
+++ b/tests/dictionaries/80redefine_double_error/02-base.xml
@@ -1,10 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" redefine="True" type="string"/>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" redefine="True" type="string"/>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80redefine_error/00-base.xml b/tests/dictionaries/80redefine_error/00-base.xml
index 9ea33030..210875c0 100644
--- a/tests/dictionaries/80redefine_error/00-base.xml
+++ b/tests/dictionaries/80redefine_error/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80redefine_error/01-redefine.xml b/tests/dictionaries/80redefine_error/01-redefine.xml
index 9ea33030..210875c0 100644
--- a/tests/dictionaries/80redefine_error/01-redefine.xml
+++ b/tests/dictionaries/80redefine_error/01-redefine.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80redefine_fillerror/00-base.xml b/tests/dictionaries/80redefine_fillerror/00-base.xml
index 7b67be9a..59552a91 100644
--- a/tests/dictionaries/80redefine_fillerror/00-base.xml
+++ b/tests/dictionaries/80redefine_fillerror/00-base.xml
@@ -1,20 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param name="valeur">valeur</param>
-            <target>mode_conteneur_actif</target>
-        </fill>
-    </constraints>
-
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valeur</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80redefine_fillerror/01-base.xml b/tests/dictionaries/80redefine_fillerror/01-base.xml
index 98edd8f6..9e0aab4e 100644
--- a/tests/dictionaries/80redefine_fillerror/01-base.xml
+++ b/tests/dictionaries/80redefine_fillerror/01-base.xml
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <constraints>
-        <fill name="concat">
-            <param name="valeur">valeur</param>
-            <target>mode_conteneur_actif</target>
-        </fill>
-    </constraints>
+<rougail version="0.10">
+  <constraints>
+    <fill name="concat">
+      <param name="valeur">valeur</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/80redefine_notexists/00-base.xml b/tests/dictionaries/80redefine_notexists/00-base.xml
index 9ea33030..210875c0 100644
--- a/tests/dictionaries/80redefine_notexists/00-base.xml
+++ b/tests/dictionaries/80redefine_notexists/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80redefine_notexists/01-redefine.xml b/tests/dictionaries/80redefine_notexists/01-redefine.xml
index f6dc3434..6d484bb1 100644
--- a/tests/dictionaries/80redefine_notexists/01-redefine.xml
+++ b/tests/dictionaries/80redefine_notexists/01-redefine.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif1" redefine="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif1" redefine="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80service_not_managed_overrides/00-base.xml b/tests/dictionaries/80service_not_managed_overrides/00-base.xml
index 923a828b..46519082 100644
--- a/tests/dictionaries/80service_not_managed_overrides/00-base.xml
+++ b/tests/dictionaries/80service_not_managed_overrides/00-base.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
-<rougail version="0.9">
-    <services> 
-        <service name='test' manage="False">
-	    <override/>
-        </service>
-    </services>
-    <variables>
-        <variable name='var' type='string'>
-            <value>mailname</value>
-        </variable>
-    </variables>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <services>
+    <service name="test" manage="False">
+      <override/>
+    </service>
+  </services>
+  <variables>
+    <variable name="var" type="string">
+      <value>mailname</value>
+    </variable>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/80services_ip_cidr_netmask/00-base.xml b/tests/dictionaries/80services_ip_cidr_netmask/00-base.xml
index 538e7bee..d952cf94 100644
--- a/tests/dictionaries/80services_ip_cidr_netmask/00-base.xml
+++ b/tests/dictionaries/80services_ip_cidr_netmask/00-base.xml
@@ -1,14 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
-<rougail version="0.9">
-    <services>
-        <service name='nut'>
-            <ip ip_type='variable' netmask="nut_monitor_netmask">nut_monitor_host</ip>
-        </service>
-    </services>
-    <variables>
-        <variable name="nut_monitor_host" type="network_cidr" mandatory='True'/>
-        <variable name="nut_monitor_netmask" type="netmask" mandatory='True'/>
-    </variables>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <services>
+    <service name="nut">
+      <ip ip_type="variable" netmask="nut_monitor_netmask">nut_monitor_host</ip>
+    </service>
+  </services>
+  <variables>
+    <variable name="nut_monitor_host" type="network_cidr" mandatory="True"/>
+    <variable name="nut_monitor_netmask" type="netmask" mandatory="True"/>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80services_ip_netmask/00-base.xml b/tests/dictionaries/80services_ip_netmask/00-base.xml
index 5b5a7a71..4a7801d8 100644
--- a/tests/dictionaries/80services_ip_netmask/00-base.xml
+++ b/tests/dictionaries/80services_ip_netmask/00-base.xml
@@ -1,17 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.9">
-
-    <services>
-        <service name='nut'>
-            <ip netmask="nut_monitor_netmask">nut_monitor_host</ip>
-        </service>
-    </services>
-
-    <variables>
-        <variable name="nut_monitor_host" type="ip" mandatory='True'/>
-        <variable name="nut_monitor_netmask" type="netmask" mandatory='True'/>
-    </variables>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <services>
+    <service name="nut">
+      <ip netmask="nut_monitor_netmask">nut_monitor_host</ip>
+    </service>
+  </services>
+  <variables>
+    <variable name="nut_monitor_host" type="ip" mandatory="True"/>
+    <variable name="nut_monitor_netmask" type="netmask" mandatory="True"/>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80services_ip_network_no_netmask/00-base.xml b/tests/dictionaries/80services_ip_network_no_netmask/00-base.xml
index 3cdd5971..c09db05d 100644
--- a/tests/dictionaries/80services_ip_network_no_netmask/00-base.xml
+++ b/tests/dictionaries/80services_ip_network_no_netmask/00-base.xml
@@ -1,16 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.9">
-
-    <services>
-        <service name='nut'>
-            <ip>nut_monitor_host</ip>
-        </service>
-    </services>
-
-    <variables>
-        <variable name="nut_monitor_host" type="network" mandatory='True'/>
-    </variables>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <services>
+    <service name="nut">
+      <ip>nut_monitor_host</ip>
+    </service>
+  </services>
+  <variables>
+    <variable name="nut_monitor_host" type="network" mandatory="True"/>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80services_ip_not_netmask/00-base.xml b/tests/dictionaries/80services_ip_not_netmask/00-base.xml
index 8a6c7f86..f8f37ce9 100644
--- a/tests/dictionaries/80services_ip_not_netmask/00-base.xml
+++ b/tests/dictionaries/80services_ip_not_netmask/00-base.xml
@@ -1,17 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.9">
-
-    <services>
-        <service name='nut'>
-            <ip netmask='nut_monitor_netmask'>nut_monitor_host</ip>
-        </service>
-    </services>
-
-    <variables>
-        <variable name="nut_monitor_host" type="network" mandatory='True'/>
-        <variable name="nut_monitor_netmask" type="ip" mandatory='True'/>
-    </variables>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <services>
+    <service name="nut">
+      <ip netmask="nut_monitor_netmask">nut_monitor_host</ip>
+    </service>
+  </services>
+  <variables>
+    <variable name="nut_monitor_host" type="network" mandatory="True"/>
+    <variable name="nut_monitor_netmask" type="ip" mandatory="True"/>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80services_ip_wrong_type/00-base.xml b/tests/dictionaries/80services_ip_wrong_type/00-base.xml
index 9d94e645..924c52f2 100644
--- a/tests/dictionaries/80services_ip_wrong_type/00-base.xml
+++ b/tests/dictionaries/80services_ip_wrong_type/00-base.xml
@@ -1,18 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.9">
-
-    <services>
-        <service name='nut'>
-            <ip>nut_monitor_host</ip>
-        </service>
-    </services>
-
-    <variables>
-        <variable name="nut_monitor_host" type="string" mandatory='True'>
-            <value>192.168.0.1</value>
-        </variable>
-    </variables>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <services>
+    <service name="nut">
+      <ip>nut_monitor_host</ip>
+    </service>
+  </services>
+  <variables>
+    <variable name="nut_monitor_host" type="string" mandatory="True">
+      <value>192.168.0.1</value>
+    </variable>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80target_list_unknown/00-base.xml b/tests/dictionaries/80target_list_unknown/00-base.xml
index f1145b5b..a4120aa0 100644
--- a/tests/dictionaries/80target_list_unknown/00-base.xml
+++ b/tests/dictionaries/80target_list_unknown/00-base.xml
@@ -1,15 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <variable name="condition" type="boolean"/>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_in" source="condition">
-            <param>True</param>
-            <target type="filelist">unknown</target>
-        </condition>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <variable name="condition" type="boolean"/>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>True</param>
+      <target type="filelist">unknown</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80unknown_type/00-base.xml b/tests/dictionaries/80unknown_type/00-base.xml
index 20491818..a14e3904 100644
--- a/tests/dictionaries/80unknown_type/00-base.xml
+++ b/tests/dictionaries/80unknown_type/00-base.xml
@@ -1,10 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="unknown" description="Description"/>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="unknown" description="Description"/>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80valid_entier_invalid_param/00-base.xml b/tests/dictionaries/80valid_entier_invalid_param/00-base.xml
index e7a71186..fb92ae49 100644
--- a/tests/dictionaries/80valid_entier_invalid_param/00-base.xml
+++ b/tests/dictionaries/80valid_entier_invalid_param/00-base.xml
@@ -1,20 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>b</value>
-            </variable>
-            <variable name="int" type="number" description="No change"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_entier">
-            <param name="unknown" type="number">0</param>
-            <target>int</target>
-        </check>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>b</value>
+      </variable>
+      <variable name="int" type="number" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_entier">
+      <param name="unknown" type="number">0</param>
+      <target>int</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80valid_entier_not_number/00-base.xml b/tests/dictionaries/80valid_entier_not_number/00-base.xml
index f3693fca..0f73e651 100644
--- a/tests/dictionaries/80valid_entier_not_number/00-base.xml
+++ b/tests/dictionaries/80valid_entier_not_number/00-base.xml
@@ -1,21 +1,18 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>b</value>
-            </variable>
-            <variable name="int" type="number" description="No change"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_entier">
-            <param name="mini">0</param>
-            <param name="maxi" type="number">100</param>
-            <target>int</target>
-        </check>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>b</value>
+      </variable>
+      <variable name="int" type="number" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_entier">
+      <param name="mini">0</param>
+      <param name="maxi" type="number">100</param>
+      <target>int</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80valid_entier_without_param/00-base.xml b/tests/dictionaries/80valid_entier_without_param/00-base.xml
index d636ae03..7c40e897 100644
--- a/tests/dictionaries/80valid_entier_without_param/00-base.xml
+++ b/tests/dictionaries/80valid_entier_without_param/00-base.xml
@@ -1,19 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>b</value>
-            </variable>
-            <variable name="int" type="number" description="No change"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_entier">
-            <target>int</target>
-        </check>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>b</value>
+      </variable>
+      <variable name="int" type="number" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_entier">
+      <target>int</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80valid_enum_base_redefine/00-base.xml b/tests/dictionaries/80valid_enum_base_redefine/00-base.xml
index 120c5a4f..3c65e8f0 100644
--- a/tests/dictionaries/80valid_enum_base_redefine/00-base.xml
+++ b/tests/dictionaries/80valid_enum_base_redefine/00-base.xml
@@ -1,35 +1,32 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general" mode="expert">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="enumfam" mode="expert">
-            <variable name="enumvar2" type="string" description="multi">
-                <value>c</value>
-            </variable>
-            <variable name="enumvar" type="string" description="multi" help="bla bla bla">
-                <value>c</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_enum">
-            <param>a</param>
-            <param>b</param>
-            <param>c</param>
-            <target>enumvar</target>
-        </check>
-        <check name="valid_enum">
-            <param>a</param>
-            <param>b</param>
-            <param>c</param>
-            <target>enumvar</target>
-        </check>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="enumfam" mode="expert">
+      <variable name="enumvar2" type="string" description="multi">
+        <value>c</value>
+      </variable>
+      <variable name="enumvar" type="string" description="multi" help="bla bla bla">
+        <value>c</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>a</param>
+      <param>b</param>
+      <param>c</param>
+      <target>enumvar</target>
+    </check>
+    <check name="valid_enum">
+      <param>a</param>
+      <param>b</param>
+      <param>c</param>
+      <target>enumvar</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80valid_enum_base_redefine/01-base.xml b/tests/dictionaries/80valid_enum_base_redefine/01-base.xml
index d220950b..aae22228 100644
--- a/tests/dictionaries/80valid_enum_base_redefine/01-base.xml
+++ b/tests/dictionaries/80valid_enum_base_redefine/01-base.xml
@@ -1,20 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="enumfam" mode="expert">
-            <variable name="enumvar" redefine="True">
-                <value>c</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_enum">
-            <param>a</param>
-            <param>c</param>
-            <target>enumvar</target>
-        </check>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="enumfam" mode="expert">
+      <variable name="enumvar" redefine="True">
+        <value>c</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>a</param>
+      <param>c</param>
+      <target>enumvar</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80valid_enum_multi_param/00-base.xml b/tests/dictionaries/80valid_enum_multi_param/00-base.xml
index 2078e776..9cd2bbef 100644
--- a/tests/dictionaries/80valid_enum_multi_param/00-base.xml
+++ b/tests/dictionaries/80valid_enum_multi_param/00-base.xml
@@ -1,24 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>a</value>
-            </variable>
-            <variable name="var" type="string" description="New variable" multi="True">
-                <value>a</value>
-                <value>b</value>
-                <value>c</value>
-            </variable>
-        </family>
-    </variables>
-    <constraints>
-        <check name="valid_enum">
-            <param type="variable">var</param>
-            <param>d</param>
-            <target>mode_conteneur_actif</target>
-        </check>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>a</value>
+      </variable>
+      <variable name="var" type="string" description="New variable" multi="True">
+        <value>a</value>
+        <value>b</value>
+        <value>c</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param type="variable">var</param>
+      <param>d</param>
+      <target>mode_conteneur_actif</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80valid_enum_multi_variable/00-base.xml b/tests/dictionaries/80valid_enum_multi_variable/00-base.xml
index c0b9e69a..355aaead 100644
--- a/tests/dictionaries/80valid_enum_multi_variable/00-base.xml
+++ b/tests/dictionaries/80valid_enum_multi_variable/00-base.xml
@@ -1,29 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>a</value>
-            </variable>
-            <variable name="var" type="string" description="New variable" multi="True">
-                <value>a</value>
-                <value>b</value>
-                <value>c</value>
-            </variable>
-            <variable name="var2" type="string" description="New variable" multi="True">
-                <value>a</value>
-                <value>b</value>
-                <value>c</value>
-            </variable>
-        </family>
-    </variables>
-    <constraints>
-        <check name="valid_enum">
-            <param type="variable">var</param>
-            <param type="variable">var2</param>
-            <target>mode_conteneur_actif</target>
-        </check>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>a</value>
+      </variable>
+      <variable name="var" type="string" description="New variable" multi="True">
+        <value>a</value>
+        <value>b</value>
+        <value>c</value>
+      </variable>
+      <variable name="var2" type="string" description="New variable" multi="True">
+        <value>a</value>
+        <value>b</value>
+        <value>c</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param type="variable">var</param>
+      <param type="variable">var2</param>
+      <target>mode_conteneur_actif</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80valid_enum_no_param/00-base.xml b/tests/dictionaries/80valid_enum_no_param/00-base.xml
index d5209327..b8e7cc33 100644
--- a/tests/dictionaries/80valid_enum_no_param/00-base.xml
+++ b/tests/dictionaries/80valid_enum_no_param/00-base.xml
@@ -1,23 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general" mode="expert">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="enumfam" mode="expert">
-            <variable name="enumvar" type="string" description="multi" help="bla bla bla">
-                <value>c</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_enum">
-            <target>enumvar</target>
-        </check>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="enumfam" mode="expert">
+      <variable name="enumvar" type="string" description="multi" help="bla bla bla">
+        <value>c</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <target>enumvar</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80valid_enum_none_multi_variable/00-base.xml b/tests/dictionaries/80valid_enum_none_multi_variable/00-base.xml
index b7031f48..03e34285 100644
--- a/tests/dictionaries/80valid_enum_none_multi_variable/00-base.xml
+++ b/tests/dictionaries/80valid_enum_none_multi_variable/00-base.xml
@@ -1,21 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>a</value>
-            </variable>
-            <variable name="var" type="string" description="New variable">
-                <value>a</value>
-            </variable>
-        </family>
-    </variables>
-    <constraints>
-        <check name="valid_enum">
-            <param type="variable">var</param>
-            <target>mode_conteneur_actif</target>
-        </check>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>a</value>
+      </variable>
+      <variable name="var" type="string" description="New variable">
+        <value>a</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param type="variable">var</param>
+      <target>mode_conteneur_actif</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80valid_enum_number_without_value/00-base.xml b/tests/dictionaries/80valid_enum_number_without_value/00-base.xml
index cf929804..7dc7ad5a 100644
--- a/tests/dictionaries/80valid_enum_number_without_value/00-base.xml
+++ b/tests/dictionaries/80valid_enum_number_without_value/00-base.xml
@@ -1,23 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general" mode="expert">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="enumfam" mode="expert">
-            <variable name="enumvar" type="number" description="enumvar" help="bla bla bla"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_enum">
-            <param type="number"/>
-            <target>enumvar</target>
-        </check>
-    </constraints>
-
+<rougail version="0.10">
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="enumfam" mode="expert">
+      <variable name="enumvar" type="number" description="enumvar" help="bla bla bla"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param type="number"/>
+      <target>enumvar</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80value_not_multi/00-base.xml b/tests/dictionaries/80value_not_multi/00-base.xml
index 288ee61e..ce7eb32b 100644
--- a/tests/dictionaries/80value_not_multi/00-base.xml
+++ b/tests/dictionaries/80value_not_multi/00-base.xml
@@ -1,12 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.9">
-    <variables>
-        <variable name="nut_monitor_host" type="ip" mandatory='True'>
-            <value>192.168.0.1</value>
-            <value>192.168.0.2</value>
-        </variable>
-    </variables>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <variables>
+    <variable name="nut_monitor_host" type="ip" mandatory="True">
+      <value>192.168.0.1</value>
+      <value>192.168.0.2</value>
+    </variable>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80variable_accent/00-base.xml b/tests/dictionaries/80variable_accent/00-base.xml
index ac4a4ffe..74f7ad0d 100644
--- a/tests/dictionaries/80variable_accent/00-base.xml
+++ b/tests/dictionaries/80variable_accent/00-base.xml
@@ -1,23 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="variableAccenté" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="Other">
-            <variable name="mode_conteneur_actif3" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-    <constraints>
-        <condition name="disabled_if_in" source="mode_conteneur_actif3">
-            <param>non</param>
-            <target type="variable">mode_conteneur_actif</target>
-        </condition>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="variableAccenté" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="Other">
+      <variable name="mode_conteneur_actif3" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="mode_conteneur_actif3">
+      <param>non</param>
+      <target type="variable">mode_conteneur_actif</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80variable_accent/01-base.xml b/tests/dictionaries/80variable_accent/01-base.xml
index b31afe12..21d8557e 100644
--- a/tests/dictionaries/80variable_accent/01-base.xml
+++ b/tests/dictionaries/80variable_accent/01-base.xml
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="Général">
-            <variable name="mode_conteneur_actif1" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="Général">
+      <variable name="mode_conteneur_actif1" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/80variable_accent/02-base.xml b/tests/dictionaries/80variable_accent/02-base.xml
index 81155361..3d4ad67b 100644
--- a/tests/dictionaries/80variable_accent/02-base.xml
+++ b/tests/dictionaries/80variable_accent/02-base.xml
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/80variable_extra/00-base.xml b/tests/dictionaries/80variable_extra/00-base.xml
index c7f7a65e..93528ce5 100644
--- a/tests/dictionaries/80variable_extra/00-base.xml
+++ b/tests/dictionaries/80variable_extra/00-base.xml
@@ -1,8 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <variable name="extra"/>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <variable name="extra"/>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80variable_extra/extra_dirs/extra/00-base.xml b/tests/dictionaries/80variable_extra/extra_dirs/extra/00-base.xml
index 28e8e579..f01504a3 100644
--- a/tests/dictionaries/80variable_extra/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/80variable_extra/extra_dirs/extra/00-base.xml
@@ -1,7 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.9">
-    <variables>
-        <variable name="day"/>
-    </variables>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <variables>
+    <variable name="day"/>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/80variable_family_not_same_name/00-base.xml b/tests/dictionaries/80variable_family_not_same_name/00-base.xml
index c2433b7a..83ee6572 100644
--- a/tests/dictionaries/80variable_family_not_same_name/00-base.xml
+++ b/tests/dictionaries/80variable_family_not_same_name/00-base.xml
@@ -1,11 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <variable name="general"/>
-        <family name="general">
-            <variable name="my_variable2"/>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <variable name="general"/>
+    <family name="general">
+      <variable name="my_variable2"/>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80variable_rougail/00-base.xml b/tests/dictionaries/80variable_rougail/00-base.xml
index f5bbbd5b..82284f32 100644
--- a/tests/dictionaries/80variable_rougail/00-base.xml
+++ b/tests/dictionaries/80variable_rougail/00-base.xml
@@ -1,8 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <variable name="rougail"/>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <variable name="rougail"/>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80variable_up/00-base.xml b/tests/dictionaries/80variable_up/00-base.xml
index 443f4139..560654a9 100644
--- a/tests/dictionaries/80variable_up/00-base.xml
+++ b/tests/dictionaries/80variable_up/00-base.xml
@@ -1,23 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="variableAccent" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="Other">
-            <variable name="mode_conteneur_actif3" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-    <constraints>
-        <condition name="disabled_if_in" source="mode_conteneur_actif3">
-            <param>non</param>
-            <target type="variable">mode_conteneur_actif</target>
-        </condition>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="variableAccent" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="Other">
+      <variable name="mode_conteneur_actif3" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="mode_conteneur_actif3">
+      <param>non</param>
+      <target type="variable">mode_conteneur_actif</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/81extra_externalspace/00-base.xml b/tests/dictionaries/81extra_externalspace/00-base.xml
index 5249b01e..fcdfd4bf 100644
--- a/tests/dictionaries/81extra_externalspace/00-base.xml
+++ b/tests/dictionaries/81extra_externalspace/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/81extra_externalspace/extra_dirs/extra/00-base.xml b/tests/dictionaries/81extra_externalspace/extra_dirs/extra/00-base.xml
index 2f0455bf..68a5efc4 100644
--- a/tests/dictionaries/81extra_externalspace/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/81extra_externalspace/extra_dirs/extra/00-base.xml
@@ -1,17 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.9">
-    <variables>
-        <family name='ejabberd'>
-            <variable name="description" type="string">
-                <value>Exportation de la base de ejabberd</value>
-            </variable>
-            <variable name="day" type="schedule"></variable>
-            <variable name="mode" type="schedulemod">
-                <value>pre</value>
-            </variable>
-        </family>
-    </variables>
-    <constraints>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <variables>
+    <family name="ejabberd">
+      <variable name="description" type="string">
+        <value>Exportation de la base de ejabberd</value>
+      </variable>
+      <variable name="day" type="schedule"/>
+      <variable name="mode" type="schedulemod">
+        <value>pre</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
     </constraints>
 </rougail>
diff --git a/tests/dictionaries/81extra_externalspace/extra_dirs/extra1/00-base.xml b/tests/dictionaries/81extra_externalspace/extra_dirs/extra1/00-base.xml
index 9ce009bc..e244fd59 100644
--- a/tests/dictionaries/81extra_externalspace/extra_dirs/extra1/00-base.xml
+++ b/tests/dictionaries/81extra_externalspace/extra_dirs/extra1/00-base.xml
@@ -1,20 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.9">
-    <variables>
-        <family name='external'>
-            <variable name="description" type="string">
-                <value>test</value>
-            </variable>
-        </family>
-    </variables>
-    <constraints>
-        <fill name='calc_multi_condition'>
-            <param>non</param>
-            <param type='variable' name='condition_1'>activer_ejabberd</param>
-            <param name='match'>none</param>
-            <param name='mismatch'>daily</param>
-	    <target>extra.ejabberd.day</target>
-        </fill>
-    </constraints>
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <variables>
+    <family name="external">
+      <variable name="description" type="string">
+        <value>test</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_multi_condition">
+      <param>non</param>
+      <param type="variable" name="condition_1">activer_ejabberd</param>
+      <param name="match">none</param>
+      <param name="mismatch">daily</param>
+      <target>extra.ejabberd.day</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/88valid_enum_not_number/00-base.xml b/tests/dictionaries/88valid_enum_not_number/00-base.xml
index 38cdcf1a..fde7b574 100644
--- a/tests/dictionaries/88valid_enum_not_number/00-base.xml
+++ b/tests/dictionaries/88valid_enum_not_number/00-base.xml
@@ -1,24 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general" mode="expert">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="enumfam" mode="expert">
-            <variable name="enumvar" type="number" description="enumvar"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_enum">
-            <param>a</param>
-            <param>b</param>
-            <param>c</param>
-            <target>enumvar</target>
-        </check>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="enumfam" mode="expert">
+      <variable name="enumvar" type="number" description="enumvar"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>a</param>
+      <param>b</param>
+      <param>c</param>
+      <target>enumvar</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/88valid_enum_not_number2/00-base.xml b/tests/dictionaries/88valid_enum_not_number2/00-base.xml
index 93c2180a..831505b1 100644
--- a/tests/dictionaries/88valid_enum_not_number2/00-base.xml
+++ b/tests/dictionaries/88valid_enum_not_number2/00-base.xml
@@ -1,24 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general" mode="expert">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="enumfam" mode="expert">
-            <variable name="enumvar" type="string" description="enumvar">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_enum">
-            <param type="number">1</param>
-            <target>enumvar</target>
-        </check>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="enumfam" mode="expert">
+      <variable name="enumvar" type="string" description="enumvar">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param type="number">1</param>
+      <target>enumvar</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/88valid_enum_not_number_variable/00-base.xml b/tests/dictionaries/88valid_enum_not_number_variable/00-base.xml
index c583fa32..ffa5c8c4 100644
--- a/tests/dictionaries/88valid_enum_not_number_variable/00-base.xml
+++ b/tests/dictionaries/88valid_enum_not_number_variable/00-base.xml
@@ -1,18 +1,15 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="enumfam" mode="expert">
-            <variable name="str" multi="True"/>
-            <variable name="enumvar" type="number"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_enum">
-            <param type="variable">str</param>
-            <target>enumvar</target>
-        </check>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="enumfam" mode="expert">
+      <variable name="str" multi="True"/>
+      <variable name="enumvar" type="number"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param type="variable">str</param>
+      <target>enumvar</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/88valid_enum_numberdefaultstring/00-base.xml b/tests/dictionaries/88valid_enum_numberdefaultstring/00-base.xml
index a4ae867f..86f9fc0b 100644
--- a/tests/dictionaries/88valid_enum_numberdefaultstring/00-base.xml
+++ b/tests/dictionaries/88valid_enum_numberdefaultstring/00-base.xml
@@ -1,26 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general" mode="expert">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="enumfam" mode="expert">
-            <variable name="enumvar" type="string" description="enumvar">
-                <value>a</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_enum">
-            <param>1</param>
-            <param>2</param>
-            <param>3</param>
-            <target>enumvar</target>
-        </check>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="enumfam" mode="expert">
+      <variable name="enumvar" type="string" description="enumvar">
+        <value>a</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>1</param>
+      <param>2</param>
+      <param>3</param>
+      <target>enumvar</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/88valid_enum_variable_optional/00-base.xml b/tests/dictionaries/88valid_enum_variable_optional/00-base.xml
index f259c710..36ae120a 100644
--- a/tests/dictionaries/88valid_enum_variable_optional/00-base.xml
+++ b/tests/dictionaries/88valid_enum_variable_optional/00-base.xml
@@ -1,23 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>a</value>
-            </variable>
-            <variable name="var" type="string" description="New variable" multi="True">
-                <value>a</value>
-                <value>b</value>
-                <value>c</value>
-            </variable>
-        </family>
-    </variables>
-    <constraints>
-        <check name="valid_enum">
-            <param type="variable" optional="True">var</param>
-            <target>mode_conteneur_actif</target>
-        </check>
-    </constraints>
+<rougail version="0.10">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>a</value>
+      </variable>
+      <variable name="var" type="string" description="New variable" multi="True">
+        <value>a</value>
+        <value>b</value>
+        <value>c</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param type="variable" optional="True">var</param>
+      <target>mode_conteneur_actif</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries_old/00empty/00_base.xml b/tests/dictionaries_old/00empty/00_base.xml
new file mode 100644
index 00000000..78227d6f
--- /dev/null
+++ b/tests/dictionaries_old/00empty/00_base.xml
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="tata">
+        </service>
+  </services>
+</rougail>
diff --git a/tests/dictionaries/80leadership_none_follower_between_follower/__init__.py b/tests/dictionaries_old/00empty/__init__.py
similarity index 100%
rename from tests/dictionaries/80leadership_none_follower_between_follower/__init__.py
rename to tests/dictionaries_old/00empty/__init__.py
diff --git a/tests/dictionaries_old/00empty/makedict/after.json b/tests/dictionaries_old/00empty/makedict/after.json
new file mode 100644
index 00000000..fd94145f
--- /dev/null
+++ b/tests/dictionaries_old/00empty/makedict/after.json
@@ -0,0 +1,10 @@
+{
+    "services.tata.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.tata.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/00empty/makedict/base.json b/tests/dictionaries_old/00empty/makedict/base.json
new file mode 100644
index 00000000..df4366ea
--- /dev/null
+++ b/tests/dictionaries_old/00empty/makedict/base.json
@@ -0,0 +1,4 @@
+{
+    "services.tata.activate": true,
+    "services.tata.manage": true
+}
diff --git a/tests/dictionaries_old/00empty/makedict/before.json b/tests/dictionaries_old/00empty/makedict/before.json
new file mode 100644
index 00000000..fd94145f
--- /dev/null
+++ b/tests/dictionaries_old/00empty/makedict/before.json
@@ -0,0 +1,10 @@
+{
+    "services.tata.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.tata.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/00empty/tiramisu/base.py b/tests/dictionaries_old/00empty/tiramisu/base.py
new file mode 100644
index 00000000..fbf5613a
--- /dev/null
+++ b/tests/dictionaries_old/00empty/tiramisu/base.py
@@ -0,0 +1,18 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = BoolOption(name="activate", doc="activate", default=True)
+option_4 = BoolOption(name="manage", doc="manage", default=True)
+option_2 = OptionDescription(name="tata", doc="tata", children=[option_3, option_4])
+option_1 = OptionDescription(name="services", doc="services", children=[option_2], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/00load_autofreeze/00-base.xml b/tests/dictionaries_old/00load_autofreeze/00-base.xml
new file mode 100644
index 00000000..92f639a1
--- /dev/null
+++ b/tests/dictionaries_old/00load_autofreeze/00-base.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <variable name="myvar" auto_freeze="True">
+      <value>no</value>
+    </variable>
+    <variable name="server_deployed" type="boolean">
+      <value>False</value>
+    </variable>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries/80leadership_not_ordered/__init__.py b/tests/dictionaries_old/00load_autofreeze/__init__.py
similarity index 100%
rename from tests/dictionaries/80leadership_not_ordered/__init__.py
rename to tests/dictionaries_old/00load_autofreeze/__init__.py
diff --git a/tests/dictionaries_old/00load_autofreeze/makedict/after.json b/tests/dictionaries_old/00load_autofreeze/makedict/after.json
new file mode 100644
index 00000000..36e336b2
--- /dev/null
+++ b/tests/dictionaries_old/00load_autofreeze/makedict/after.json
@@ -0,0 +1,10 @@
+{
+    "rougail.myvar": {
+        "owner": "forced",
+        "value": "no"
+    },
+    "rougail.server_deployed": {
+        "owner": "default",
+        "value": false
+    }
+}
diff --git a/tests/dictionaries_old/00load_autofreeze/makedict/base.json b/tests/dictionaries_old/00load_autofreeze/makedict/base.json
new file mode 100644
index 00000000..92b8b010
--- /dev/null
+++ b/tests/dictionaries_old/00load_autofreeze/makedict/base.json
@@ -0,0 +1,4 @@
+{
+    "rougail.myvar": "no",
+    "rougail.server_deployed": false
+}
diff --git a/tests/dictionaries_old/00load_autofreeze/makedict/before.json b/tests/dictionaries_old/00load_autofreeze/makedict/before.json
new file mode 100644
index 00000000..eaf8d2ec
--- /dev/null
+++ b/tests/dictionaries_old/00load_autofreeze/makedict/before.json
@@ -0,0 +1,10 @@
+{
+    "rougail.myvar": {
+        "owner": "default",
+        "value": "no"
+    },
+    "rougail.server_deployed": {
+        "owner": "default",
+        "value": false
+    }
+}
diff --git a/tests/dictionaries_old/00load_autofreeze/tiramisu/base.py b/tests/dictionaries_old/00load_autofreeze/tiramisu/base.py
new file mode 100644
index 00000000..d8426bc8
--- /dev/null
+++ b/tests/dictionaries_old/00load_autofreeze/tiramisu/base.py
@@ -0,0 +1,17 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = BoolOption(name="server_deployed", doc="server_deployed", default=False, properties=frozenset({"mandatory", "normal"}))
+option_2 = StrOption(name="myvar", doc="myvar", default="no", properties=frozenset({"basic", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue(True)}))}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_3])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/00load_autofreezeexpert/00-base.xml b/tests/dictionaries_old/00load_autofreezeexpert/00-base.xml
new file mode 100644
index 00000000..5c1546e2
--- /dev/null
+++ b/tests/dictionaries_old/00load_autofreezeexpert/00-base.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <variable name="my_var" auto_freeze="True" mode="expert">
+      <value>no</value>
+    </variable>
+    <variable name="server_deployed" type="boolean">
+      <value>False</value>
+    </variable>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries/80leadership_not_same_family/__init__.py b/tests/dictionaries_old/00load_autofreezeexpert/__init__.py
similarity index 100%
rename from tests/dictionaries/80leadership_not_same_family/__init__.py
rename to tests/dictionaries_old/00load_autofreezeexpert/__init__.py
diff --git a/tests/dictionaries_old/00load_autofreezeexpert/makedict/after.json b/tests/dictionaries_old/00load_autofreezeexpert/makedict/after.json
new file mode 100644
index 00000000..1082f86a
--- /dev/null
+++ b/tests/dictionaries_old/00load_autofreezeexpert/makedict/after.json
@@ -0,0 +1,10 @@
+{
+    "rougail.my_var": {
+        "owner": "forced",
+        "value": "no"
+    },
+    "rougail.server_deployed": {
+        "owner": "default",
+        "value": false
+    }
+}
diff --git a/tests/dictionaries_old/00load_autofreezeexpert/makedict/base.json b/tests/dictionaries_old/00load_autofreezeexpert/makedict/base.json
new file mode 100644
index 00000000..911baaae
--- /dev/null
+++ b/tests/dictionaries_old/00load_autofreezeexpert/makedict/base.json
@@ -0,0 +1,4 @@
+{
+    "rougail.my_var": "no",
+    "rougail.server_deployed": false
+}
diff --git a/tests/dictionaries_old/00load_autofreezeexpert/makedict/before.json b/tests/dictionaries_old/00load_autofreezeexpert/makedict/before.json
new file mode 100644
index 00000000..7c8f380b
--- /dev/null
+++ b/tests/dictionaries_old/00load_autofreezeexpert/makedict/before.json
@@ -0,0 +1,10 @@
+{
+    "rougail.my_var": {
+        "owner": "default",
+        "value": "no"
+    },
+    "rougail.server_deployed": {
+        "owner": "default",
+        "value": false
+    }
+}
diff --git a/tests/dictionaries_old/00load_autofreezeexpert/tiramisu/base.py b/tests/dictionaries_old/00load_autofreezeexpert/tiramisu/base.py
new file mode 100644
index 00000000..cb7cbd09
--- /dev/null
+++ b/tests/dictionaries_old/00load_autofreezeexpert/tiramisu/base.py
@@ -0,0 +1,17 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = BoolOption(name="server_deployed", doc="server_deployed", default=False, properties=frozenset({"mandatory", "normal"}))
+option_2 = StrOption(name="my_var", doc="my_var", default="no", properties=frozenset({"expert", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue(True)}))}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_3])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/00load_autosave/00-base.xml b/tests/dictionaries_old/00load_autosave/00-base.xml
new file mode 100644
index 00000000..647c823d
--- /dev/null
+++ b/tests/dictionaries_old/00load_autosave/00-base.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <variable name="server_deployed" type="boolean"/>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" auto_save="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries/80leadership_notexists/__init__.py b/tests/dictionaries_old/00load_autosave/__init__.py
similarity index 100%
rename from tests/dictionaries/80leadership_notexists/__init__.py
rename to tests/dictionaries_old/00load_autosave/__init__.py
diff --git a/tests/dictionaries_old/00load_autosave/makedict/after.json b/tests/dictionaries_old/00load_autosave/makedict/after.json
new file mode 100644
index 00000000..b749ddd8
--- /dev/null
+++ b/tests/dictionaries_old/00load_autosave/makedict/after.json
@@ -0,0 +1,10 @@
+{
+    "rougail.server_deployed": {
+        "owner": "default",
+        "value": true
+    },
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "forced",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/00load_autosave/makedict/base.json b/tests/dictionaries_old/00load_autosave/makedict/base.json
new file mode 100644
index 00000000..90c5c76d
--- /dev/null
+++ b/tests/dictionaries_old/00load_autosave/makedict/base.json
@@ -0,0 +1,4 @@
+{
+    "rougail.server_deployed": true,
+    "rougail.general.mode_conteneur_actif": "non"
+}
diff --git a/tests/dictionaries_old/00load_autosave/makedict/before.json b/tests/dictionaries_old/00load_autosave/makedict/before.json
new file mode 100644
index 00000000..91cd78bc
--- /dev/null
+++ b/tests/dictionaries_old/00load_autosave/makedict/before.json
@@ -0,0 +1,10 @@
+{
+    "rougail.server_deployed": {
+        "owner": "default",
+        "value": true
+    },
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/00load_autosave/tiramisu/base.py b/tests/dictionaries_old/00load_autosave/tiramisu/base.py
new file mode 100644
index 00000000..4771b8bb
--- /dev/null
+++ b/tests/dictionaries_old/00load_autosave/tiramisu/base.py
@@ -0,0 +1,18 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_2 = BoolOption(name="server_deployed", doc="server_deployed", default=True, properties=frozenset({"mandatory", "normal"}))
+option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"basic", "force_store_value", "mandatory"}))
+option_3 = OptionDescription(name="general", doc="général", children=[option_4], properties=frozenset({"basic"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_3])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/00load_autosaveexpert/00-base.xml b/tests/dictionaries_old/00load_autosaveexpert/00-base.xml
new file mode 100644
index 00000000..2959c5c3
--- /dev/null
+++ b/tests/dictionaries_old/00load_autosaveexpert/00-base.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <variable name="server_deployed" type="boolean"/>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" auto_save="True" mode="expert">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries/80leadership_none_follower_between_follower/errno_33 b/tests/dictionaries_old/00load_autosaveexpert/__init__.py
similarity index 100%
rename from tests/dictionaries/80leadership_none_follower_between_follower/errno_33
rename to tests/dictionaries_old/00load_autosaveexpert/__init__.py
diff --git a/tests/dictionaries_old/00load_autosaveexpert/makedict/after.json b/tests/dictionaries_old/00load_autosaveexpert/makedict/after.json
new file mode 100644
index 00000000..b749ddd8
--- /dev/null
+++ b/tests/dictionaries_old/00load_autosaveexpert/makedict/after.json
@@ -0,0 +1,10 @@
+{
+    "rougail.server_deployed": {
+        "owner": "default",
+        "value": true
+    },
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "forced",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/00load_autosaveexpert/makedict/base.json b/tests/dictionaries_old/00load_autosaveexpert/makedict/base.json
new file mode 100644
index 00000000..90c5c76d
--- /dev/null
+++ b/tests/dictionaries_old/00load_autosaveexpert/makedict/base.json
@@ -0,0 +1,4 @@
+{
+    "rougail.server_deployed": true,
+    "rougail.general.mode_conteneur_actif": "non"
+}
diff --git a/tests/dictionaries_old/00load_autosaveexpert/makedict/before.json b/tests/dictionaries_old/00load_autosaveexpert/makedict/before.json
new file mode 100644
index 00000000..91cd78bc
--- /dev/null
+++ b/tests/dictionaries_old/00load_autosaveexpert/makedict/before.json
@@ -0,0 +1,10 @@
+{
+    "rougail.server_deployed": {
+        "owner": "default",
+        "value": true
+    },
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/00load_autosaveexpert/tiramisu/base.py b/tests/dictionaries_old/00load_autosaveexpert/tiramisu/base.py
new file mode 100644
index 00000000..2e1082a1
--- /dev/null
+++ b/tests/dictionaries_old/00load_autosaveexpert/tiramisu/base.py
@@ -0,0 +1,18 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_2 = BoolOption(name="server_deployed", doc="server_deployed", default=True, properties=frozenset({"mandatory", "normal"}))
+option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"expert", "force_store_value", "mandatory"}))
+option_3 = OptionDescription(name="general", doc="général", children=[option_4], properties=frozenset({"expert"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_3])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/00load_comment/00-base.xml b/tests/dictionaries_old/00load_comment/00-base.xml
new file mode 100644
index 00000000..7ff4428f
--- /dev/null
+++ b/tests/dictionaries_old/00load_comment/00-base.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general" description="général">
+      <!-- this is a comment -->
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries/80leadership_not_ordered/errno_33 b/tests/dictionaries_old/00load_comment/__init__.py
similarity index 100%
rename from tests/dictionaries/80leadership_not_ordered/errno_33
rename to tests/dictionaries_old/00load_comment/__init__.py
diff --git a/tests/dictionaries_old/00load_comment/makedict/after.json b/tests/dictionaries_old/00load_comment/makedict/after.json
new file mode 100644
index 00000000..2e6c541d
--- /dev/null
+++ b/tests/dictionaries_old/00load_comment/makedict/after.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/00load_comment/makedict/base.json b/tests/dictionaries_old/00load_comment/makedict/base.json
new file mode 100644
index 00000000..25056378
--- /dev/null
+++ b/tests/dictionaries_old/00load_comment/makedict/base.json
@@ -0,0 +1,3 @@
+{
+    "rougail.general.mode_conteneur_actif": "non"
+}
diff --git a/tests/dictionaries_old/00load_comment/makedict/before.json b/tests/dictionaries_old/00load_comment/makedict/before.json
new file mode 100644
index 00000000..2e6c541d
--- /dev/null
+++ b/tests/dictionaries_old/00load_comment/makedict/before.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/00load_comment/tiramisu/base.py b/tests/dictionaries_old/00load_comment/tiramisu/base.py
new file mode 100644
index 00000000..5ffec0a0
--- /dev/null
+++ b/tests/dictionaries_old/00load_comment/tiramisu/base.py
@@ -0,0 +1,17 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="général", children=[option_3], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/00load_notype/00-base.xml b/tests/dictionaries_old/00load_notype/00-base.xml
new file mode 100644
index 00000000..14c82f1c
--- /dev/null
+++ b/tests/dictionaries_old/00load_notype/00-base.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="without_type">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries/80leadership_not_same_family/errno_31 b/tests/dictionaries_old/00load_notype/__init__.py
similarity index 100%
rename from tests/dictionaries/80leadership_not_same_family/errno_31
rename to tests/dictionaries_old/00load_notype/__init__.py
diff --git a/tests/dictionaries_old/00load_notype/makedict/after.json b/tests/dictionaries_old/00load_notype/makedict/after.json
new file mode 100644
index 00000000..89640e57
--- /dev/null
+++ b/tests/dictionaries_old/00load_notype/makedict/after.json
@@ -0,0 +1,10 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.without_type": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/00load_notype/makedict/base.json b/tests/dictionaries_old/00load_notype/makedict/base.json
new file mode 100644
index 00000000..983f231e
--- /dev/null
+++ b/tests/dictionaries_old/00load_notype/makedict/base.json
@@ -0,0 +1,4 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general.without_type": "non"
+}
diff --git a/tests/dictionaries_old/00load_notype/makedict/before.json b/tests/dictionaries_old/00load_notype/makedict/before.json
new file mode 100644
index 00000000..89640e57
--- /dev/null
+++ b/tests/dictionaries_old/00load_notype/makedict/before.json
@@ -0,0 +1,10 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.without_type": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/00load_notype/tiramisu/base.py b/tests/dictionaries_old/00load_notype/tiramisu/base.py
new file mode 100644
index 00000000..c80e9cf9
--- /dev/null
+++ b/tests/dictionaries_old/00load_notype/tiramisu/base.py
@@ -0,0 +1,18 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_4 = StrOption(name="without_type", doc="without_type", default="non", properties=frozenset({"mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="général", children=[option_3, option_4], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/00load_save/00-base.xml b/tests/dictionaries_old/00load_save/00-base.xml
new file mode 100644
index 00000000..84913090
--- /dev/null
+++ b/tests/dictionaries_old/00load_save/00-base.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries/80leadership_notexists/errno_42 b/tests/dictionaries_old/00load_save/__init__.py
similarity index 100%
rename from tests/dictionaries/80leadership_notexists/errno_42
rename to tests/dictionaries_old/00load_save/__init__.py
diff --git a/tests/dictionaries_old/00load_save/makedict/after.json b/tests/dictionaries_old/00load_save/makedict/after.json
new file mode 100644
index 00000000..2e6c541d
--- /dev/null
+++ b/tests/dictionaries_old/00load_save/makedict/after.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/00load_save/makedict/base.json b/tests/dictionaries_old/00load_save/makedict/base.json
new file mode 100644
index 00000000..25056378
--- /dev/null
+++ b/tests/dictionaries_old/00load_save/makedict/base.json
@@ -0,0 +1,3 @@
+{
+    "rougail.general.mode_conteneur_actif": "non"
+}
diff --git a/tests/dictionaries_old/00load_save/makedict/before.json b/tests/dictionaries_old/00load_save/makedict/before.json
new file mode 100644
index 00000000..2e6c541d
--- /dev/null
+++ b/tests/dictionaries_old/00load_save/makedict/before.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/00load_save/tiramisu/base.py b/tests/dictionaries_old/00load_save/tiramisu/base.py
new file mode 100644
index 00000000..5ffec0a0
--- /dev/null
+++ b/tests/dictionaries_old/00load_save/tiramisu/base.py
@@ -0,0 +1,17 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="général", children=[option_3], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/00load_subfolder/99-base.xml b/tests/dictionaries_old/00load_subfolder/99-base.xml
new file mode 100644
index 00000000..84913090
--- /dev/null
+++ b/tests/dictionaries_old/00load_subfolder/99-base.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/00load_subfolder/__init__.py b/tests/dictionaries_old/00load_subfolder/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/00load_subfolder/makedict/after.json b/tests/dictionaries_old/00load_subfolder/makedict/after.json
new file mode 100644
index 00000000..6ebfbbe9
--- /dev/null
+++ b/tests/dictionaries_old/00load_subfolder/makedict/after.json
@@ -0,0 +1,10 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif1": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/00load_subfolder/makedict/base.json b/tests/dictionaries_old/00load_subfolder/makedict/base.json
new file mode 100644
index 00000000..3f1a7b00
--- /dev/null
+++ b/tests/dictionaries_old/00load_subfolder/makedict/base.json
@@ -0,0 +1,4 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general.mode_conteneur_actif1": "non"
+}
diff --git a/tests/dictionaries_old/00load_subfolder/makedict/before.json b/tests/dictionaries_old/00load_subfolder/makedict/before.json
new file mode 100644
index 00000000..6ebfbbe9
--- /dev/null
+++ b/tests/dictionaries_old/00load_subfolder/makedict/before.json
@@ -0,0 +1,10 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif1": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/00load_subfolder/subfolder/00-base.xml b/tests/dictionaries_old/00load_subfolder/subfolder/00-base.xml
new file mode 100644
index 00000000..27c7f0b7
--- /dev/null
+++ b/tests/dictionaries_old/00load_subfolder/subfolder/00-base.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif1" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/00load_subfolder/tiramisu/base.py b/tests/dictionaries_old/00load_subfolder/tiramisu/base.py
new file mode 100644
index 00000000..0f0768ec
--- /dev/null
+++ b/tests/dictionaries_old/00load_subfolder/tiramisu/base.py
@@ -0,0 +1,18 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_4 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="général", children=[option_3, option_4], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/01auto_autofreeze/00-base.xml b/tests/dictionaries_old/01auto_autofreeze/00-base.xml
new file mode 100644
index 00000000..db10997f
--- /dev/null
+++ b/tests/dictionaries_old/01auto_autofreeze/00-base.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <variable name="server_deployed" type="boolean">
+      <value>no</value>
+    </variable>
+    <variable name="my_variable" auto_freeze="True" hidden="True">
+      <value>no</value>
+    </variable>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param>yes</param>
+      <target>my_variable</target>
+    </fill>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/01auto_autofreeze/__init__.py b/tests/dictionaries_old/01auto_autofreeze/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/01auto_autofreeze/makedict/after.json b/tests/dictionaries_old/01auto_autofreeze/makedict/after.json
new file mode 100644
index 00000000..5c307f3b
--- /dev/null
+++ b/tests/dictionaries_old/01auto_autofreeze/makedict/after.json
@@ -0,0 +1,10 @@
+{
+    "rougail.server_deployed": {
+        "owner": "default",
+        "value": false
+    },
+    "rougail.my_variable": {
+        "owner": "forced",
+        "value": "yes"
+    }
+}
diff --git a/tests/dictionaries_old/01auto_autofreeze/makedict/base.json b/tests/dictionaries_old/01auto_autofreeze/makedict/base.json
new file mode 100644
index 00000000..2ca3008f
--- /dev/null
+++ b/tests/dictionaries_old/01auto_autofreeze/makedict/base.json
@@ -0,0 +1,4 @@
+{
+    "rougail.server_deployed": false,
+    "rougail.my_variable": "yes"
+}
diff --git a/tests/dictionaries_old/01auto_autofreeze/makedict/before.json b/tests/dictionaries_old/01auto_autofreeze/makedict/before.json
new file mode 100644
index 00000000..b2905faa
--- /dev/null
+++ b/tests/dictionaries_old/01auto_autofreeze/makedict/before.json
@@ -0,0 +1,10 @@
+{
+    "rougail.server_deployed": {
+        "owner": "default",
+        "value": false
+    },
+    "rougail.my_variable": {
+        "owner": "default",
+        "value": "yes"
+    }
+}
diff --git a/tests/dictionaries_old/01auto_autofreeze/tiramisu/base.py b/tests/dictionaries_old/01auto_autofreeze/tiramisu/base.py
new file mode 100644
index 00000000..c98e9f07
--- /dev/null
+++ b/tests/dictionaries_old/01auto_autofreeze/tiramisu/base.py
@@ -0,0 +1,17 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_2 = BoolOption(name="server_deployed", doc="server_deployed", default=False, properties=frozenset({"mandatory", "normal"}))
+option_3 = StrOption(name="my_variable", doc="my_variable", default=Calculation(func.calc_val, Params((ParamValue("yes")))), properties=frozenset({"basic", "force_store_value", "hidden", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue(True)}))}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_3])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/01auto_base/00-base.xml b/tests/dictionaries_old/01auto_base/00-base.xml
new file mode 100644
index 00000000..4db9eed3
--- /dev/null
+++ b/tests/dictionaries_old/01auto_base/00-base.xml
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="variable">mode_conteneur_actif1</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/01auto_base/__init__.py b/tests/dictionaries_old/01auto_base/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/01auto_base/makedict/after.json b/tests/dictionaries_old/01auto_base/makedict/after.json
new file mode 100644
index 00000000..6ebfbbe9
--- /dev/null
+++ b/tests/dictionaries_old/01auto_base/makedict/after.json
@@ -0,0 +1,10 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif1": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/01auto_base/makedict/base.json b/tests/dictionaries_old/01auto_base/makedict/base.json
new file mode 100644
index 00000000..3f1a7b00
--- /dev/null
+++ b/tests/dictionaries_old/01auto_base/makedict/base.json
@@ -0,0 +1,4 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general.mode_conteneur_actif1": "non"
+}
diff --git a/tests/dictionaries_old/01auto_base/makedict/before.json b/tests/dictionaries_old/01auto_base/makedict/before.json
new file mode 100644
index 00000000..6ebfbbe9
--- /dev/null
+++ b/tests/dictionaries_old/01auto_base/makedict/before.json
@@ -0,0 +1,10 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif1": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/01auto_base/tiramisu/base.py b/tests/dictionaries_old/01auto_base/tiramisu/base.py
new file mode 100644
index 00000000..a4fb076c
--- /dev/null
+++ b/tests/dictionaries_old/01auto_base/tiramisu/base.py
@@ -0,0 +1,18 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_4 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params((ParamOption(option_4)))), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/01auto_withoutparam/00-base.xml b/tests/dictionaries_old/01auto_withoutparam/00-base.xml
new file mode 100644
index 00000000..7c346837
--- /dev/null
+++ b/tests/dictionaries_old/01auto_withoutparam/00-base.xml
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/01auto_withoutparam/__init__.py b/tests/dictionaries_old/01auto_withoutparam/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/01auto_withoutparam/makedict/after.json b/tests/dictionaries_old/01auto_withoutparam/makedict/after.json
new file mode 100644
index 00000000..477ccc55
--- /dev/null
+++ b/tests/dictionaries_old/01auto_withoutparam/makedict/after.json
@@ -0,0 +1,10 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": null
+    },
+    "rougail.general.mode_conteneur_actif1": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/01auto_withoutparam/makedict/base.json b/tests/dictionaries_old/01auto_withoutparam/makedict/base.json
new file mode 100644
index 00000000..f8d69705
--- /dev/null
+++ b/tests/dictionaries_old/01auto_withoutparam/makedict/base.json
@@ -0,0 +1,4 @@
+{
+    "rougail.general.mode_conteneur_actif": null,
+    "rougail.general.mode_conteneur_actif1": "non"
+}
diff --git a/tests/dictionaries_old/01auto_withoutparam/makedict/before.json b/tests/dictionaries_old/01auto_withoutparam/makedict/before.json
new file mode 100644
index 00000000..477ccc55
--- /dev/null
+++ b/tests/dictionaries_old/01auto_withoutparam/makedict/before.json
@@ -0,0 +1,10 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": null
+    },
+    "rougail.general.mode_conteneur_actif1": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/01auto_withoutparam/tiramisu/base.py b/tests/dictionaries_old/01auto_withoutparam/tiramisu/base.py
new file mode 100644
index 00000000..548f1929
--- /dev/null
+++ b/tests/dictionaries_old/01auto_withoutparam/tiramisu/base.py
@@ -0,0 +1,18 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params(())), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal"}))
+option_4 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/01base_domainname/00-base.xml b/tests/dictionaries_old/01base_domainname/00-base.xml
new file mode 100644
index 00000000..1376bc79
--- /dev/null
+++ b/tests/dictionaries_old/01base_domainname/00-base.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="domain" type="domainname" description="Description">
+        <value>my.domain.name</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/01base_domainname/__init__.py b/tests/dictionaries_old/01base_domainname/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/01base_domainname/makedict/after.json b/tests/dictionaries_old/01base_domainname/makedict/after.json
new file mode 100644
index 00000000..3917b2c5
--- /dev/null
+++ b/tests/dictionaries_old/01base_domainname/makedict/after.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.domain": {
+        "owner": "default",
+        "value": "my.domain.name"
+    }
+}
diff --git a/tests/dictionaries_old/01base_domainname/makedict/base.json b/tests/dictionaries_old/01base_domainname/makedict/base.json
new file mode 100644
index 00000000..ffe723c3
--- /dev/null
+++ b/tests/dictionaries_old/01base_domainname/makedict/base.json
@@ -0,0 +1,3 @@
+{
+    "rougail.general.domain": "my.domain.name"
+}
diff --git a/tests/dictionaries_old/01base_domainname/makedict/before.json b/tests/dictionaries_old/01base_domainname/makedict/before.json
new file mode 100644
index 00000000..3917b2c5
--- /dev/null
+++ b/tests/dictionaries_old/01base_domainname/makedict/before.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.domain": {
+        "owner": "default",
+        "value": "my.domain.name"
+    }
+}
diff --git a/tests/dictionaries_old/01base_domainname/tiramisu/base.py b/tests/dictionaries_old/01base_domainname/tiramisu/base.py
new file mode 100644
index 00000000..94cabcdf
--- /dev/null
+++ b/tests/dictionaries_old/01base_domainname/tiramisu/base.py
@@ -0,0 +1,17 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = DomainnameOption(name="domain", doc="Description", default="my.domain.name", type='domainname', allow_ip=False, properties=frozenset({"mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/01base_file/00-base.xml b/tests/dictionaries_old/01base_file/00-base.xml
new file mode 100644
index 00000000..2bc1f68d
--- /dev/null
+++ b/tests/dictionaries_old/01base_file/00-base.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="test">
+      <file>/etc/file</file>
+      <file engine="jinja2">/etc/file2</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Description">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/01base_file/__init__.py b/tests/dictionaries_old/01base_file/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/01base_file/makedict/after.json b/tests/dictionaries_old/01base_file/makedict/after.json
new file mode 100644
index 00000000..c8edf346
--- /dev/null
+++ b/tests/dictionaries_old/01base_file/makedict/after.json
@@ -0,0 +1,30 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "services.test.files.file.name": {
+        "owner": "default",
+        "value": "/etc/file"
+    },
+    "services.test.files.file.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.files.file2.name": {
+        "owner": "default",
+        "value": "/etc/file2"
+    },
+    "services.test.files.file2.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/01base_file/makedict/base.json b/tests/dictionaries_old/01base_file/makedict/base.json
new file mode 100644
index 00000000..c9048468
--- /dev/null
+++ b/tests/dictionaries_old/01base_file/makedict/base.json
@@ -0,0 +1,9 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "services.test.files.file.name": "/etc/file",
+    "services.test.files.file.activate": true,
+    "services.test.files.file2.name": "/etc/file2",
+    "services.test.files.file2.activate": true,
+    "services.test.activate": true,
+    "services.test.manage": true
+}
diff --git a/tests/dictionaries_old/01base_file/makedict/before.json b/tests/dictionaries_old/01base_file/makedict/before.json
new file mode 100644
index 00000000..c8edf346
--- /dev/null
+++ b/tests/dictionaries_old/01base_file/makedict/before.json
@@ -0,0 +1,30 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "services.test.files.file.name": {
+        "owner": "default",
+        "value": "/etc/file"
+    },
+    "services.test.files.file.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.files.file2.name": {
+        "owner": "default",
+        "value": "/etc/file2"
+    },
+    "services.test.files.file2.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/01base_file/result/etc/file b/tests/dictionaries_old/01base_file/result/etc/file
new file mode 100644
index 00000000..4089fbcc
--- /dev/null
+++ b/tests/dictionaries_old/01base_file/result/etc/file
@@ -0,0 +1,2 @@
+non
+non
diff --git a/tests/dictionaries_old/01base_file/result/etc/file2 b/tests/dictionaries_old/01base_file/result/etc/file2
new file mode 100644
index 00000000..4089fbcc
--- /dev/null
+++ b/tests/dictionaries_old/01base_file/result/etc/file2
@@ -0,0 +1,2 @@
+non
+non
diff --git a/tests/dictionaries_old/01base_file/result/tmpfiles.d/rougail.conf b/tests/dictionaries_old/01base_file/result/tmpfiles.d/rougail.conf
new file mode 100644
index 00000000..2dab2179
--- /dev/null
+++ b/tests/dictionaries_old/01base_file/result/tmpfiles.d/rougail.conf
@@ -0,0 +1,4 @@
+C /etc/file 0644 root root - /usr/local/lib/etc/file
+z /etc/file - - - - -
+C /etc/file2 0644 root root - /usr/local/lib/etc/file2
+z /etc/file2 - - - - -
diff --git a/tests/dictionaries_old/01base_file/tiramisu/base.py b/tests/dictionaries_old/01base_file/tiramisu/base.py
new file mode 100644
index 00000000..5cceee7b
--- /dev/null
+++ b/tests/dictionaries_old/01base_file/tiramisu/base.py
@@ -0,0 +1,31 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_8 = FilenameOption(name="name", doc="name", default="/etc/file")
+option_9 = BoolOption(name="activate", doc="activate", default=True)
+option_7 = OptionDescription(name="file", doc="file", children=[option_8, option_9])
+option_7.impl_set_information('source', "file")
+option_11 = FilenameOption(name="name", doc="name", default="/etc/file2")
+option_12 = BoolOption(name="activate", doc="activate", default=True)
+option_10 = OptionDescription(name="file2", doc="file2", children=[option_11, option_12])
+option_10.impl_set_information('engine', "jinja2")
+option_10.impl_set_information('source', "file2")
+option_6 = OptionDescription(name="files", doc="files", children=[option_7, option_10])
+option_13 = BoolOption(name="activate", doc="activate", default=True)
+option_14 = BoolOption(name="manage", doc="manage", default=True)
+option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_13, option_14])
+option_4 = OptionDescription(name="services", doc="services", children=[option_5], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4])
diff --git a/tests/dictionaries_old/01base_file/tmpl/file b/tests/dictionaries_old/01base_file/tmpl/file
new file mode 100644
index 00000000..27ff6834
--- /dev/null
+++ b/tests/dictionaries_old/01base_file/tmpl/file
@@ -0,0 +1,2 @@
+%%mode_conteneur_actif
+%%rougail.general.mode_conteneur_actif
diff --git a/tests/dictionaries_old/01base_file/tmpl/file2 b/tests/dictionaries_old/01base_file/tmpl/file2
new file mode 100644
index 00000000..6d214113
--- /dev/null
+++ b/tests/dictionaries_old/01base_file/tmpl/file2
@@ -0,0 +1,2 @@
+{{ mode_conteneur_actif }}
+{{ rougail.general.mode_conteneur_actif }}
diff --git a/tests/dictionaries_old/01base_file_include/00-base.xml b/tests/dictionaries_old/01base_file_include/00-base.xml
new file mode 100644
index 00000000..2bc1f68d
--- /dev/null
+++ b/tests/dictionaries_old/01base_file_include/00-base.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="test">
+      <file>/etc/file</file>
+      <file engine="jinja2">/etc/file2</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Description">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/01base_file_include/__init__.py b/tests/dictionaries_old/01base_file_include/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/01base_file_include/makedict/after.json b/tests/dictionaries_old/01base_file_include/makedict/after.json
new file mode 100644
index 00000000..c8edf346
--- /dev/null
+++ b/tests/dictionaries_old/01base_file_include/makedict/after.json
@@ -0,0 +1,30 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "services.test.files.file.name": {
+        "owner": "default",
+        "value": "/etc/file"
+    },
+    "services.test.files.file.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.files.file2.name": {
+        "owner": "default",
+        "value": "/etc/file2"
+    },
+    "services.test.files.file2.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/01base_file_include/makedict/base.json b/tests/dictionaries_old/01base_file_include/makedict/base.json
new file mode 100644
index 00000000..c9048468
--- /dev/null
+++ b/tests/dictionaries_old/01base_file_include/makedict/base.json
@@ -0,0 +1,9 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "services.test.files.file.name": "/etc/file",
+    "services.test.files.file.activate": true,
+    "services.test.files.file2.name": "/etc/file2",
+    "services.test.files.file2.activate": true,
+    "services.test.activate": true,
+    "services.test.manage": true
+}
diff --git a/tests/dictionaries_old/01base_file_include/makedict/before.json b/tests/dictionaries_old/01base_file_include/makedict/before.json
new file mode 100644
index 00000000..c8edf346
--- /dev/null
+++ b/tests/dictionaries_old/01base_file_include/makedict/before.json
@@ -0,0 +1,30 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "services.test.files.file.name": {
+        "owner": "default",
+        "value": "/etc/file"
+    },
+    "services.test.files.file.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.files.file2.name": {
+        "owner": "default",
+        "value": "/etc/file2"
+    },
+    "services.test.files.file2.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/01base_file_include/result/etc/file b/tests/dictionaries_old/01base_file_include/result/etc/file
new file mode 100644
index 00000000..d907505b
--- /dev/null
+++ b/tests/dictionaries_old/01base_file_include/result/etc/file
@@ -0,0 +1 @@
+non
diff --git a/tests/dictionaries_old/01base_file_include/result/etc/file2 b/tests/dictionaries_old/01base_file_include/result/etc/file2
new file mode 100644
index 00000000..d907505b
--- /dev/null
+++ b/tests/dictionaries_old/01base_file_include/result/etc/file2
@@ -0,0 +1 @@
+non
diff --git a/tests/dictionaries_old/01base_file_include/result/tmpfiles.d/rougail.conf b/tests/dictionaries_old/01base_file_include/result/tmpfiles.d/rougail.conf
new file mode 100644
index 00000000..2dab2179
--- /dev/null
+++ b/tests/dictionaries_old/01base_file_include/result/tmpfiles.d/rougail.conf
@@ -0,0 +1,4 @@
+C /etc/file 0644 root root - /usr/local/lib/etc/file
+z /etc/file - - - - -
+C /etc/file2 0644 root root - /usr/local/lib/etc/file2
+z /etc/file2 - - - - -
diff --git a/tests/dictionaries_old/01base_file_include/tiramisu/base.py b/tests/dictionaries_old/01base_file_include/tiramisu/base.py
new file mode 100644
index 00000000..5cceee7b
--- /dev/null
+++ b/tests/dictionaries_old/01base_file_include/tiramisu/base.py
@@ -0,0 +1,31 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_8 = FilenameOption(name="name", doc="name", default="/etc/file")
+option_9 = BoolOption(name="activate", doc="activate", default=True)
+option_7 = OptionDescription(name="file", doc="file", children=[option_8, option_9])
+option_7.impl_set_information('source', "file")
+option_11 = FilenameOption(name="name", doc="name", default="/etc/file2")
+option_12 = BoolOption(name="activate", doc="activate", default=True)
+option_10 = OptionDescription(name="file2", doc="file2", children=[option_11, option_12])
+option_10.impl_set_information('engine', "jinja2")
+option_10.impl_set_information('source', "file2")
+option_6 = OptionDescription(name="files", doc="files", children=[option_7, option_10])
+option_13 = BoolOption(name="activate", doc="activate", default=True)
+option_14 = BoolOption(name="manage", doc="manage", default=True)
+option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_13, option_14])
+option_4 = OptionDescription(name="services", doc="services", children=[option_5], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4])
diff --git a/tests/dictionaries_old/01base_file_include/tmpl/file b/tests/dictionaries_old/01base_file_include/tmpl/file
new file mode 100644
index 00000000..19f93237
--- /dev/null
+++ b/tests/dictionaries_old/01base_file_include/tmpl/file
@@ -0,0 +1 @@
+%include "incfile"
diff --git a/tests/dictionaries_old/01base_file_include/tmpl/file2 b/tests/dictionaries_old/01base_file_include/tmpl/file2
new file mode 100644
index 00000000..6e61e8c6
--- /dev/null
+++ b/tests/dictionaries_old/01base_file_include/tmpl/file2
@@ -0,0 +1 @@
+{% include "incfile2" %}
diff --git a/tests/dictionaries_old/01base_file_include/tmpl/incfile b/tests/dictionaries_old/01base_file_include/tmpl/incfile
new file mode 100644
index 00000000..a29cfeaf
--- /dev/null
+++ b/tests/dictionaries_old/01base_file_include/tmpl/incfile
@@ -0,0 +1 @@
+%%mode_conteneur_actif
diff --git a/tests/dictionaries_old/01base_file_include/tmpl/incfile2 b/tests/dictionaries_old/01base_file_include/tmpl/incfile2
new file mode 100644
index 00000000..db665a0e
--- /dev/null
+++ b/tests/dictionaries_old/01base_file_include/tmpl/incfile2
@@ -0,0 +1 @@
+{{ mode_conteneur_actif }}
diff --git a/tests/dictionaries_old/01base_file_include_content/00-base.xml b/tests/dictionaries_old/01base_file_include_content/00-base.xml
new file mode 100644
index 00000000..6632ee17
--- /dev/null
+++ b/tests/dictionaries_old/01base_file_include_content/00-base.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="test">
+      <file>/etc/file</file>
+      <file engine="jinja2">/etc/file2</file>
+      <file included="content">/etc/dir/incfile</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Description">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/01base_file_include_content/__init__.py b/tests/dictionaries_old/01base_file_include_content/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/01base_file_include_content/makedict/after.json b/tests/dictionaries_old/01base_file_include_content/makedict/after.json
new file mode 100644
index 00000000..0f9e1770
--- /dev/null
+++ b/tests/dictionaries_old/01base_file_include_content/makedict/after.json
@@ -0,0 +1,38 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "services.test.files.file.name": {
+        "owner": "default",
+        "value": "/etc/file"
+    },
+    "services.test.files.file.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.files.file2.name": {
+        "owner": "default",
+        "value": "/etc/file2"
+    },
+    "services.test.files.file2.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.files.incfile.name": {
+        "owner": "default",
+        "value": "/etc/dir/incfile"
+    },
+    "services.test.files.incfile.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/01base_file_include_content/makedict/base.json b/tests/dictionaries_old/01base_file_include_content/makedict/base.json
new file mode 100644
index 00000000..68409c43
--- /dev/null
+++ b/tests/dictionaries_old/01base_file_include_content/makedict/base.json
@@ -0,0 +1,11 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "services.test.files.file.name": "/etc/file",
+    "services.test.files.file.activate": true,
+    "services.test.files.file2.name": "/etc/file2",
+    "services.test.files.file2.activate": true,
+    "services.test.files.incfile.name": "/etc/dir/incfile",
+    "services.test.files.incfile.activate": true,
+    "services.test.activate": true,
+    "services.test.manage": true
+}
diff --git a/tests/dictionaries_old/01base_file_include_content/makedict/before.json b/tests/dictionaries_old/01base_file_include_content/makedict/before.json
new file mode 100644
index 00000000..0f9e1770
--- /dev/null
+++ b/tests/dictionaries_old/01base_file_include_content/makedict/before.json
@@ -0,0 +1,38 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "services.test.files.file.name": {
+        "owner": "default",
+        "value": "/etc/file"
+    },
+    "services.test.files.file.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.files.file2.name": {
+        "owner": "default",
+        "value": "/etc/file2"
+    },
+    "services.test.files.file2.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.files.incfile.name": {
+        "owner": "default",
+        "value": "/etc/dir/incfile"
+    },
+    "services.test.files.incfile.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/01base_file_include_content/result/etc/dir/incfile b/tests/dictionaries_old/01base_file_include_content/result/etc/dir/incfile
new file mode 100644
index 00000000..d907505b
--- /dev/null
+++ b/tests/dictionaries_old/01base_file_include_content/result/etc/dir/incfile
@@ -0,0 +1 @@
+non
diff --git a/tests/dictionaries_old/01base_file_include_content/result/etc/file b/tests/dictionaries_old/01base_file_include_content/result/etc/file
new file mode 100644
index 00000000..d907505b
--- /dev/null
+++ b/tests/dictionaries_old/01base_file_include_content/result/etc/file
@@ -0,0 +1 @@
+non
diff --git a/tests/dictionaries_old/01base_file_include_content/result/etc/file2 b/tests/dictionaries_old/01base_file_include_content/result/etc/file2
new file mode 100644
index 00000000..d907505b
--- /dev/null
+++ b/tests/dictionaries_old/01base_file_include_content/result/etc/file2
@@ -0,0 +1 @@
+non
diff --git a/tests/dictionaries_old/01base_file_include_content/result/tmpfiles.d/rougail.conf b/tests/dictionaries_old/01base_file_include_content/result/tmpfiles.d/rougail.conf
new file mode 100644
index 00000000..2dab2179
--- /dev/null
+++ b/tests/dictionaries_old/01base_file_include_content/result/tmpfiles.d/rougail.conf
@@ -0,0 +1,4 @@
+C /etc/file 0644 root root - /usr/local/lib/etc/file
+z /etc/file - - - - -
+C /etc/file2 0644 root root - /usr/local/lib/etc/file2
+z /etc/file2 - - - - -
diff --git a/tests/dictionaries_old/01base_file_include_content/tiramisu/base.py b/tests/dictionaries_old/01base_file_include_content/tiramisu/base.py
new file mode 100644
index 00000000..f1fd9d2c
--- /dev/null
+++ b/tests/dictionaries_old/01base_file_include_content/tiramisu/base.py
@@ -0,0 +1,36 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_8 = FilenameOption(name="name", doc="name", default="/etc/file")
+option_9 = BoolOption(name="activate", doc="activate", default=True)
+option_7 = OptionDescription(name="file", doc="file", children=[option_8, option_9])
+option_7.impl_set_information('source', "file")
+option_11 = FilenameOption(name="name", doc="name", default="/etc/file2")
+option_12 = BoolOption(name="activate", doc="activate", default=True)
+option_10 = OptionDescription(name="file2", doc="file2", children=[option_11, option_12])
+option_10.impl_set_information('engine', "jinja2")
+option_10.impl_set_information('source', "file2")
+option_14 = FilenameOption(name="name", doc="name", default="/etc/dir/incfile")
+option_15 = BoolOption(name="activate", doc="activate", default=True)
+option_13 = OptionDescription(name="incfile", doc="incfile", children=[option_14, option_15])
+option_13.impl_set_information('included', "content")
+option_13.impl_set_information('source', "incfile")
+option_6 = OptionDescription(name="files", doc="files", children=[option_7, option_10, option_13])
+option_16 = BoolOption(name="activate", doc="activate", default=True)
+option_17 = BoolOption(name="manage", doc="manage", default=True)
+option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_16, option_17])
+option_4 = OptionDescription(name="services", doc="services", children=[option_5], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4])
diff --git a/tests/dictionaries_old/01base_file_include_content/tmpl/file b/tests/dictionaries_old/01base_file_include_content/tmpl/file
new file mode 100644
index 00000000..9b6ed7d4
--- /dev/null
+++ b/tests/dictionaries_old/01base_file_include_content/tmpl/file
@@ -0,0 +1,7 @@
+%import os
+%set %%confdir = %%rougail_destination_dir + '/etc/dir/'
+%set %%files = %%os.listdir(%%confdir)
+%%files.sort()%slurp
+%for file in %%files
+%include raw %%confdir + file
+%end for
diff --git a/tests/dictionaries_old/01base_file_include_content/tmpl/file2 b/tests/dictionaries_old/01base_file_include_content/tmpl/file2
new file mode 100644
index 00000000..2c66fba2
--- /dev/null
+++ b/tests/dictionaries_old/01base_file_include_content/tmpl/file2
@@ -0,0 +1 @@
+{% include "/etc/dir/incfile" %}
diff --git a/tests/dictionaries_old/01base_file_include_content/tmpl/incfile b/tests/dictionaries_old/01base_file_include_content/tmpl/incfile
new file mode 100644
index 00000000..a29cfeaf
--- /dev/null
+++ b/tests/dictionaries_old/01base_file_include_content/tmpl/incfile
@@ -0,0 +1 @@
+%%mode_conteneur_actif
diff --git a/tests/dictionaries_old/01base_file_include_name/00-base.xml b/tests/dictionaries_old/01base_file_include_name/00-base.xml
new file mode 100644
index 00000000..eff8650e
--- /dev/null
+++ b/tests/dictionaries_old/01base_file_include_name/00-base.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="test">
+      <file>/etc/file</file>
+      <file engine="jinja2">/etc/file2</file>
+      <file included="name">/etc/dir/incfile</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Description">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/01base_file_include_name/__init__.py b/tests/dictionaries_old/01base_file_include_name/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/01base_file_include_name/makedict/after.json b/tests/dictionaries_old/01base_file_include_name/makedict/after.json
new file mode 100644
index 00000000..0f9e1770
--- /dev/null
+++ b/tests/dictionaries_old/01base_file_include_name/makedict/after.json
@@ -0,0 +1,38 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "services.test.files.file.name": {
+        "owner": "default",
+        "value": "/etc/file"
+    },
+    "services.test.files.file.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.files.file2.name": {
+        "owner": "default",
+        "value": "/etc/file2"
+    },
+    "services.test.files.file2.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.files.incfile.name": {
+        "owner": "default",
+        "value": "/etc/dir/incfile"
+    },
+    "services.test.files.incfile.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/01base_file_include_name/makedict/base.json b/tests/dictionaries_old/01base_file_include_name/makedict/base.json
new file mode 100644
index 00000000..68409c43
--- /dev/null
+++ b/tests/dictionaries_old/01base_file_include_name/makedict/base.json
@@ -0,0 +1,11 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "services.test.files.file.name": "/etc/file",
+    "services.test.files.file.activate": true,
+    "services.test.files.file2.name": "/etc/file2",
+    "services.test.files.file2.activate": true,
+    "services.test.files.incfile.name": "/etc/dir/incfile",
+    "services.test.files.incfile.activate": true,
+    "services.test.activate": true,
+    "services.test.manage": true
+}
diff --git a/tests/dictionaries_old/01base_file_include_name/makedict/before.json b/tests/dictionaries_old/01base_file_include_name/makedict/before.json
new file mode 100644
index 00000000..0f9e1770
--- /dev/null
+++ b/tests/dictionaries_old/01base_file_include_name/makedict/before.json
@@ -0,0 +1,38 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "services.test.files.file.name": {
+        "owner": "default",
+        "value": "/etc/file"
+    },
+    "services.test.files.file.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.files.file2.name": {
+        "owner": "default",
+        "value": "/etc/file2"
+    },
+    "services.test.files.file2.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.files.incfile.name": {
+        "owner": "default",
+        "value": "/etc/dir/incfile"
+    },
+    "services.test.files.incfile.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/01base_file_include_name/result/etc/dir/incfile b/tests/dictionaries_old/01base_file_include_name/result/etc/dir/incfile
new file mode 100644
index 00000000..d907505b
--- /dev/null
+++ b/tests/dictionaries_old/01base_file_include_name/result/etc/dir/incfile
@@ -0,0 +1 @@
+non
diff --git a/tests/dictionaries_old/01base_file_include_name/result/etc/file b/tests/dictionaries_old/01base_file_include_name/result/etc/file
new file mode 100644
index 00000000..1ac4955d
--- /dev/null
+++ b/tests/dictionaries_old/01base_file_include_name/result/etc/file
@@ -0,0 +1 @@
+include /etc/dir/incfile
diff --git a/tests/dictionaries_old/01base_file_include_name/result/etc/file2 b/tests/dictionaries_old/01base_file_include_name/result/etc/file2
new file mode 100644
index 00000000..d907505b
--- /dev/null
+++ b/tests/dictionaries_old/01base_file_include_name/result/etc/file2
@@ -0,0 +1 @@
+non
diff --git a/tests/dictionaries_old/01base_file_include_name/result/tmpfiles.d/rougail.conf b/tests/dictionaries_old/01base_file_include_name/result/tmpfiles.d/rougail.conf
new file mode 100644
index 00000000..245eb456
--- /dev/null
+++ b/tests/dictionaries_old/01base_file_include_name/result/tmpfiles.d/rougail.conf
@@ -0,0 +1,6 @@
+C /etc/file 0644 root root - /usr/local/lib/etc/file
+z /etc/file - - - - -
+C /etc/file2 0644 root root - /usr/local/lib/etc/file2
+z /etc/file2 - - - - -
+C /etc/dir/incfile 0644 root root - /usr/local/lib/etc/dir/incfile
+z /etc/dir/incfile - - - - -
diff --git a/tests/dictionaries_old/01base_file_include_name/tiramisu/base.py b/tests/dictionaries_old/01base_file_include_name/tiramisu/base.py
new file mode 100644
index 00000000..b8c816a3
--- /dev/null
+++ b/tests/dictionaries_old/01base_file_include_name/tiramisu/base.py
@@ -0,0 +1,36 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_8 = FilenameOption(name="name", doc="name", default="/etc/file")
+option_9 = BoolOption(name="activate", doc="activate", default=True)
+option_7 = OptionDescription(name="file", doc="file", children=[option_8, option_9])
+option_7.impl_set_information('source', "file")
+option_11 = FilenameOption(name="name", doc="name", default="/etc/file2")
+option_12 = BoolOption(name="activate", doc="activate", default=True)
+option_10 = OptionDescription(name="file2", doc="file2", children=[option_11, option_12])
+option_10.impl_set_information('engine', "jinja2")
+option_10.impl_set_information('source', "file2")
+option_14 = FilenameOption(name="name", doc="name", default="/etc/dir/incfile")
+option_15 = BoolOption(name="activate", doc="activate", default=True)
+option_13 = OptionDescription(name="incfile", doc="incfile", children=[option_14, option_15])
+option_13.impl_set_information('included', "name")
+option_13.impl_set_information('source', "incfile")
+option_6 = OptionDescription(name="files", doc="files", children=[option_7, option_10, option_13])
+option_16 = BoolOption(name="activate", doc="activate", default=True)
+option_17 = BoolOption(name="manage", doc="manage", default=True)
+option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_16, option_17])
+option_4 = OptionDescription(name="services", doc="services", children=[option_5], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4])
diff --git a/tests/dictionaries_old/01base_file_include_name/tmpl/file b/tests/dictionaries_old/01base_file_include_name/tmpl/file
new file mode 100644
index 00000000..cabf7b21
--- /dev/null
+++ b/tests/dictionaries_old/01base_file_include_name/tmpl/file
@@ -0,0 +1,7 @@
+%import os
+%set %%confdir = '/etc/dir/'
+%set %%files = %%os.listdir(%%rougail_destination_dir + %%confdir)
+%%files.sort()%slurp
+%for %%file in %%files
+include %%{confdir}%%file
+%end for
diff --git a/tests/dictionaries_old/01base_file_include_name/tmpl/file2 b/tests/dictionaries_old/01base_file_include_name/tmpl/file2
new file mode 100644
index 00000000..2c66fba2
--- /dev/null
+++ b/tests/dictionaries_old/01base_file_include_name/tmpl/file2
@@ -0,0 +1 @@
+{% include "/etc/dir/incfile" %}
diff --git a/tests/dictionaries_old/01base_file_include_name/tmpl/incfile b/tests/dictionaries_old/01base_file_include_name/tmpl/incfile
new file mode 100644
index 00000000..a29cfeaf
--- /dev/null
+++ b/tests/dictionaries_old/01base_file_include_name/tmpl/incfile
@@ -0,0 +1 @@
+%%mode_conteneur_actif
diff --git a/tests/dictionaries_old/01base_file_patch/00-base.xml b/tests/dictionaries_old/01base_file_patch/00-base.xml
new file mode 100644
index 00000000..2bc1f68d
--- /dev/null
+++ b/tests/dictionaries_old/01base_file_patch/00-base.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="test">
+      <file>/etc/file</file>
+      <file engine="jinja2">/etc/file2</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Description">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/01base_file_patch/__init__.py b/tests/dictionaries_old/01base_file_patch/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/01base_file_patch/makedict/after.json b/tests/dictionaries_old/01base_file_patch/makedict/after.json
new file mode 100644
index 00000000..c8edf346
--- /dev/null
+++ b/tests/dictionaries_old/01base_file_patch/makedict/after.json
@@ -0,0 +1,30 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "services.test.files.file.name": {
+        "owner": "default",
+        "value": "/etc/file"
+    },
+    "services.test.files.file.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.files.file2.name": {
+        "owner": "default",
+        "value": "/etc/file2"
+    },
+    "services.test.files.file2.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/01base_file_patch/makedict/base.json b/tests/dictionaries_old/01base_file_patch/makedict/base.json
new file mode 100644
index 00000000..c9048468
--- /dev/null
+++ b/tests/dictionaries_old/01base_file_patch/makedict/base.json
@@ -0,0 +1,9 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "services.test.files.file.name": "/etc/file",
+    "services.test.files.file.activate": true,
+    "services.test.files.file2.name": "/etc/file2",
+    "services.test.files.file2.activate": true,
+    "services.test.activate": true,
+    "services.test.manage": true
+}
diff --git a/tests/dictionaries_old/01base_file_patch/makedict/before.json b/tests/dictionaries_old/01base_file_patch/makedict/before.json
new file mode 100644
index 00000000..c8edf346
--- /dev/null
+++ b/tests/dictionaries_old/01base_file_patch/makedict/before.json
@@ -0,0 +1,30 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "services.test.files.file.name": {
+        "owner": "default",
+        "value": "/etc/file"
+    },
+    "services.test.files.file.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.files.file2.name": {
+        "owner": "default",
+        "value": "/etc/file2"
+    },
+    "services.test.files.file2.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/01base_file_patch/patches/file.patch b/tests/dictionaries_old/01base_file_patch/patches/file.patch
new file mode 100644
index 00000000..db5b04d1
--- /dev/null
+++ b/tests/dictionaries_old/01base_file_patch/patches/file.patch
@@ -0,0 +1,5 @@
+--- tmpl/file	2020-11-20 07:44:38.588472784 +0100
++++ dest/file	2020-11-20 07:44:54.588536011 +0100
+@@ -1 +1 @@
+-unpatched
++patched
diff --git a/tests/dictionaries_old/01base_file_patch/patches/file2.patch b/tests/dictionaries_old/01base_file_patch/patches/file2.patch
new file mode 100644
index 00000000..d44031f6
--- /dev/null
+++ b/tests/dictionaries_old/01base_file_patch/patches/file2.patch
@@ -0,0 +1,5 @@
+--- tmpl/file2	2020-11-20 07:44:38.588472784 +0100
++++ dest/file2	2020-11-20 07:44:54.588536011 +0100
+@@ -1 +1 @@
+-unpatched
++patched
diff --git a/tests/dictionaries_old/01base_file_patch/result/etc/file b/tests/dictionaries_old/01base_file_patch/result/etc/file
new file mode 100644
index 00000000..893adcd3
--- /dev/null
+++ b/tests/dictionaries_old/01base_file_patch/result/etc/file
@@ -0,0 +1 @@
+patched
diff --git a/tests/dictionaries_old/01base_file_patch/result/etc/file2 b/tests/dictionaries_old/01base_file_patch/result/etc/file2
new file mode 100644
index 00000000..893adcd3
--- /dev/null
+++ b/tests/dictionaries_old/01base_file_patch/result/etc/file2
@@ -0,0 +1 @@
+patched
diff --git a/tests/dictionaries_old/01base_file_patch/result/tmpfiles.d/rougail.conf b/tests/dictionaries_old/01base_file_patch/result/tmpfiles.d/rougail.conf
new file mode 100644
index 00000000..2dab2179
--- /dev/null
+++ b/tests/dictionaries_old/01base_file_patch/result/tmpfiles.d/rougail.conf
@@ -0,0 +1,4 @@
+C /etc/file 0644 root root - /usr/local/lib/etc/file
+z /etc/file - - - - -
+C /etc/file2 0644 root root - /usr/local/lib/etc/file2
+z /etc/file2 - - - - -
diff --git a/tests/dictionaries_old/01base_file_patch/tiramisu/base.py b/tests/dictionaries_old/01base_file_patch/tiramisu/base.py
new file mode 100644
index 00000000..5cceee7b
--- /dev/null
+++ b/tests/dictionaries_old/01base_file_patch/tiramisu/base.py
@@ -0,0 +1,31 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_8 = FilenameOption(name="name", doc="name", default="/etc/file")
+option_9 = BoolOption(name="activate", doc="activate", default=True)
+option_7 = OptionDescription(name="file", doc="file", children=[option_8, option_9])
+option_7.impl_set_information('source', "file")
+option_11 = FilenameOption(name="name", doc="name", default="/etc/file2")
+option_12 = BoolOption(name="activate", doc="activate", default=True)
+option_10 = OptionDescription(name="file2", doc="file2", children=[option_11, option_12])
+option_10.impl_set_information('engine', "jinja2")
+option_10.impl_set_information('source', "file2")
+option_6 = OptionDescription(name="files", doc="files", children=[option_7, option_10])
+option_13 = BoolOption(name="activate", doc="activate", default=True)
+option_14 = BoolOption(name="manage", doc="manage", default=True)
+option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_13, option_14])
+option_4 = OptionDescription(name="services", doc="services", children=[option_5], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4])
diff --git a/tests/dictionaries_old/01base_file_patch/tmpl/file b/tests/dictionaries_old/01base_file_patch/tmpl/file
new file mode 100644
index 00000000..832551d8
--- /dev/null
+++ b/tests/dictionaries_old/01base_file_patch/tmpl/file
@@ -0,0 +1 @@
+unpatched
diff --git a/tests/dictionaries_old/01base_file_patch/tmpl/file2 b/tests/dictionaries_old/01base_file_patch/tmpl/file2
new file mode 100644
index 00000000..832551d8
--- /dev/null
+++ b/tests/dictionaries_old/01base_file_patch/tmpl/file2
@@ -0,0 +1 @@
+unpatched
diff --git a/tests/dictionaries_old/01base_file_utfchar/00-base.xml b/tests/dictionaries_old/01base_file_utfchar/00-base.xml
new file mode 100644
index 00000000..5954ca3b
--- /dev/null
+++ b/tests/dictionaries_old/01base_file_utfchar/00-base.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="test">
+      <file>/etc/systemd-makefs@dev-disk-by\x2dpartlabel</file>
+      <file engine="jinja2">/etc/systemd-makefs@dev-disk-by\x2dpartlabel2</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Description">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/01base_file_utfchar/__init__.py b/tests/dictionaries_old/01base_file_utfchar/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/01base_file_utfchar/makedict/after.json b/tests/dictionaries_old/01base_file_utfchar/makedict/after.json
new file mode 100644
index 00000000..443ae742
--- /dev/null
+++ b/tests/dictionaries_old/01base_file_utfchar/makedict/after.json
@@ -0,0 +1,30 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel.name": {
+        "owner": "default",
+        "value": "/etc/systemd-makefs@dev-disk-by\\x2dpartlabel"
+    },
+    "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel2.name": {
+        "owner": "default",
+        "value": "/etc/systemd-makefs@dev-disk-by\\x2dpartlabel2"
+    },
+    "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel2.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/01base_file_utfchar/makedict/base.json b/tests/dictionaries_old/01base_file_utfchar/makedict/base.json
new file mode 100644
index 00000000..2ae7cd2f
--- /dev/null
+++ b/tests/dictionaries_old/01base_file_utfchar/makedict/base.json
@@ -0,0 +1,9 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel.name": "/etc/systemd-makefs@dev-disk-by\\x2dpartlabel",
+    "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel.activate": true,
+    "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel2.name": "/etc/systemd-makefs@dev-disk-by\\x2dpartlabel2",
+    "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel2.activate": true,
+    "services.test.activate": true,
+    "services.test.manage": true
+}
diff --git a/tests/dictionaries_old/01base_file_utfchar/makedict/before.json b/tests/dictionaries_old/01base_file_utfchar/makedict/before.json
new file mode 100644
index 00000000..443ae742
--- /dev/null
+++ b/tests/dictionaries_old/01base_file_utfchar/makedict/before.json
@@ -0,0 +1,30 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel.name": {
+        "owner": "default",
+        "value": "/etc/systemd-makefs@dev-disk-by\\x2dpartlabel"
+    },
+    "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel2.name": {
+        "owner": "default",
+        "value": "/etc/systemd-makefs@dev-disk-by\\x2dpartlabel2"
+    },
+    "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel2.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git "a/tests/dictionaries_old/01base_file_utfchar/result/etc/systemd-makefs@dev-disk-by\\x2dpartlabel" "b/tests/dictionaries_old/01base_file_utfchar/result/etc/systemd-makefs@dev-disk-by\\x2dpartlabel"
new file mode 100644
index 00000000..d907505b
--- /dev/null
+++ "b/tests/dictionaries_old/01base_file_utfchar/result/etc/systemd-makefs@dev-disk-by\\x2dpartlabel"
@@ -0,0 +1 @@
+non
diff --git "a/tests/dictionaries_old/01base_file_utfchar/result/etc/systemd-makefs@dev-disk-by\\x2dpartlabel2" "b/tests/dictionaries_old/01base_file_utfchar/result/etc/systemd-makefs@dev-disk-by\\x2dpartlabel2"
new file mode 100644
index 00000000..d907505b
--- /dev/null
+++ "b/tests/dictionaries_old/01base_file_utfchar/result/etc/systemd-makefs@dev-disk-by\\x2dpartlabel2"
@@ -0,0 +1 @@
+non
diff --git a/tests/dictionaries_old/01base_file_utfchar/result/tmpfiles.d/rougail.conf b/tests/dictionaries_old/01base_file_utfchar/result/tmpfiles.d/rougail.conf
new file mode 100644
index 00000000..23f97d81
--- /dev/null
+++ b/tests/dictionaries_old/01base_file_utfchar/result/tmpfiles.d/rougail.conf
@@ -0,0 +1,4 @@
+C /etc/systemd-makefs@dev-disk-by\x2dpartlabel 0644 root root - /usr/local/lib/etc/systemd-makefs@dev-disk-by\x2dpartlabel
+z /etc/systemd-makefs@dev-disk-by\x2dpartlabel - - - - -
+C /etc/systemd-makefs@dev-disk-by\x2dpartlabel2 0644 root root - /usr/local/lib/etc/systemd-makefs@dev-disk-by\x2dpartlabel2
+z /etc/systemd-makefs@dev-disk-by\x2dpartlabel2 - - - - -
diff --git a/tests/dictionaries_old/01base_file_utfchar/tiramisu/base.py b/tests/dictionaries_old/01base_file_utfchar/tiramisu/base.py
new file mode 100644
index 00000000..efd63225
--- /dev/null
+++ b/tests/dictionaries_old/01base_file_utfchar/tiramisu/base.py
@@ -0,0 +1,31 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_8 = FilenameOption(name="name", doc="name", default="/etc/systemd-makefs@dev-disk-by\\x2dpartlabel")
+option_9 = BoolOption(name="activate", doc="activate", default=True)
+option_7 = OptionDescription(name="systemd_makefs@dev_disk_by\\x2dpartlabel", doc="systemd-makefs@dev-disk-by\\x2dpartlabel", children=[option_8, option_9])
+option_7.impl_set_information('source', "systemd-makefs@dev-disk-by\\x2dpartlabel")
+option_11 = FilenameOption(name="name", doc="name", default="/etc/systemd-makefs@dev-disk-by\\x2dpartlabel2")
+option_12 = BoolOption(name="activate", doc="activate", default=True)
+option_10 = OptionDescription(name="systemd_makefs@dev_disk_by\\x2dpartlabel2", doc="systemd-makefs@dev-disk-by\\x2dpartlabel2", children=[option_11, option_12])
+option_10.impl_set_information('engine', "jinja2")
+option_10.impl_set_information('source', "systemd-makefs@dev-disk-by\\x2dpartlabel2")
+option_6 = OptionDescription(name="files", doc="files", children=[option_7, option_10])
+option_13 = BoolOption(name="activate", doc="activate", default=True)
+option_14 = BoolOption(name="manage", doc="manage", default=True)
+option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_13, option_14])
+option_4 = OptionDescription(name="services", doc="services", children=[option_5], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4])
diff --git "a/tests/dictionaries_old/01base_file_utfchar/tmpl/systemd-makefs@dev-disk-by\\x2dpartlabel" "b/tests/dictionaries_old/01base_file_utfchar/tmpl/systemd-makefs@dev-disk-by\\x2dpartlabel"
new file mode 100644
index 00000000..a29cfeaf
--- /dev/null
+++ "b/tests/dictionaries_old/01base_file_utfchar/tmpl/systemd-makefs@dev-disk-by\\x2dpartlabel"
@@ -0,0 +1 @@
+%%mode_conteneur_actif
diff --git "a/tests/dictionaries_old/01base_file_utfchar/tmpl/systemd-makefs@dev-disk-by\\x2dpartlabel2" "b/tests/dictionaries_old/01base_file_utfchar/tmpl/systemd-makefs@dev-disk-by\\x2dpartlabel2"
new file mode 100644
index 00000000..db665a0e
--- /dev/null
+++ "b/tests/dictionaries_old/01base_file_utfchar/tmpl/systemd-makefs@dev-disk-by\\x2dpartlabel2"
@@ -0,0 +1 @@
+{{ mode_conteneur_actif }}
diff --git a/tests/dictionaries_old/01base_float/00-base.xml b/tests/dictionaries_old/01base_float/00-base.xml
new file mode 100644
index 00000000..e775553e
--- /dev/null
+++ b/tests/dictionaries_old/01base_float/00-base.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="float" type="float" description="Description">
+        <value>0.527</value>
+      </variable>
+      <variable name="float_multi" type="float" description="Description" multi="True">
+        <value>0.527</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/01base_float/__init__.py b/tests/dictionaries_old/01base_float/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/01base_float/makedict/after.json b/tests/dictionaries_old/01base_float/makedict/after.json
new file mode 100644
index 00000000..005c64da
--- /dev/null
+++ b/tests/dictionaries_old/01base_float/makedict/after.json
@@ -0,0 +1,12 @@
+{
+    "rougail.general.float": {
+        "owner": "default",
+        "value": 0.527
+    },
+    "rougail.general.float_multi": {
+        "owner": "default",
+        "value": [
+            0.527
+        ]
+    }
+}
diff --git a/tests/dictionaries_old/01base_float/makedict/base.json b/tests/dictionaries_old/01base_float/makedict/base.json
new file mode 100644
index 00000000..99e81271
--- /dev/null
+++ b/tests/dictionaries_old/01base_float/makedict/base.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.float": 0.527,
+    "rougail.general.float_multi": [
+        0.527
+    ]
+}
diff --git a/tests/dictionaries_old/01base_float/makedict/before.json b/tests/dictionaries_old/01base_float/makedict/before.json
new file mode 100644
index 00000000..005c64da
--- /dev/null
+++ b/tests/dictionaries_old/01base_float/makedict/before.json
@@ -0,0 +1,12 @@
+{
+    "rougail.general.float": {
+        "owner": "default",
+        "value": 0.527
+    },
+    "rougail.general.float_multi": {
+        "owner": "default",
+        "value": [
+            0.527
+        ]
+    }
+}
diff --git a/tests/dictionaries_old/01base_float/tiramisu/base.py b/tests/dictionaries_old/01base_float/tiramisu/base.py
new file mode 100644
index 00000000..d84ccb50
--- /dev/null
+++ b/tests/dictionaries_old/01base_float/tiramisu/base.py
@@ -0,0 +1,18 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = FloatOption(name="float", doc="Description", default=0.527, properties=frozenset({"mandatory", "normal"}))
+option_4 = FloatOption(name="float_multi", doc="Description", multi=True, default=[0.527], default_multi=0.527, properties=frozenset({"mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/01base_help_quote/00-base.xml b/tests/dictionaries_old/01base_help_quote/00-base.xml
new file mode 100644
index 00000000..43c3fdae
--- /dev/null
+++ b/tests/dictionaries_old/01base_help_quote/00-base.xml
@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Redefine description" help="message with '"/>
+      <variable name="mode_conteneur_actif1" type="string" description="Redefine description" help="message with &quot;"/>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/01base_help_quote/__init__.py b/tests/dictionaries_old/01base_help_quote/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/01base_help_quote/makedict/after.json b/tests/dictionaries_old/01base_help_quote/makedict/after.json
new file mode 100644
index 00000000..7fe661fc
--- /dev/null
+++ b/tests/dictionaries_old/01base_help_quote/makedict/after.json
@@ -0,0 +1,10 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": null
+    },
+    "rougail.general.mode_conteneur_actif1": {
+        "owner": "default",
+        "value": null
+    }
+}
diff --git a/tests/dictionaries_old/01base_help_quote/makedict/base.json b/tests/dictionaries_old/01base_help_quote/makedict/base.json
new file mode 100644
index 00000000..230e4fc1
--- /dev/null
+++ b/tests/dictionaries_old/01base_help_quote/makedict/base.json
@@ -0,0 +1,4 @@
+{
+    "rougail.general.mode_conteneur_actif": null,
+    "rougail.general.mode_conteneur_actif1": null
+}
diff --git a/tests/dictionaries_old/01base_help_quote/makedict/before.json b/tests/dictionaries_old/01base_help_quote/makedict/before.json
new file mode 100644
index 00000000..7fe661fc
--- /dev/null
+++ b/tests/dictionaries_old/01base_help_quote/makedict/before.json
@@ -0,0 +1,10 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": null
+    },
+    "rougail.general.mode_conteneur_actif1": {
+        "owner": "default",
+        "value": null
+    }
+}
diff --git a/tests/dictionaries_old/01base_help_quote/tiramisu/base.py b/tests/dictionaries_old/01base_help_quote/tiramisu/base.py
new file mode 100644
index 00000000..c5c475d4
--- /dev/null
+++ b/tests/dictionaries_old/01base_help_quote/tiramisu/base.py
@@ -0,0 +1,20 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="Redefine description", properties=frozenset({"normal"}))
+option_3.impl_set_information('help', "message with '")
+option_4 = StrOption(name="mode_conteneur_actif1", doc="Redefine description", properties=frozenset({"normal"}))
+option_4.impl_set_information('help', "message with \"")
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/01base_multi/00-base.xml b/tests/dictionaries_old/01base_multi/00-base.xml
new file mode 100644
index 00000000..67ec9b79
--- /dev/null
+++ b/tests/dictionaries_old/01base_multi/00-base.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True" multi="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/01base_multi/__init__.py b/tests/dictionaries_old/01base_multi/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/01base_multi/makedict/after.json b/tests/dictionaries_old/01base_multi/makedict/after.json
new file mode 100644
index 00000000..cfec4b1f
--- /dev/null
+++ b/tests/dictionaries_old/01base_multi/makedict/after.json
@@ -0,0 +1,8 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": [
+            "non"
+        ]
+    }
+}
diff --git a/tests/dictionaries_old/01base_multi/makedict/base.json b/tests/dictionaries_old/01base_multi/makedict/base.json
new file mode 100644
index 00000000..feedadc6
--- /dev/null
+++ b/tests/dictionaries_old/01base_multi/makedict/base.json
@@ -0,0 +1,5 @@
+{
+    "rougail.general.mode_conteneur_actif": [
+        "non"
+    ]
+}
diff --git a/tests/dictionaries_old/01base_multi/makedict/before.json b/tests/dictionaries_old/01base_multi/makedict/before.json
new file mode 100644
index 00000000..cfec4b1f
--- /dev/null
+++ b/tests/dictionaries_old/01base_multi/makedict/before.json
@@ -0,0 +1,8 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": [
+            "non"
+        ]
+    }
+}
diff --git a/tests/dictionaries_old/01base_multi/tiramisu/base.py b/tests/dictionaries_old/01base_multi/tiramisu/base.py
new file mode 100644
index 00000000..7892c6a3
--- /dev/null
+++ b/tests/dictionaries_old/01base_multi/tiramisu/base.py
@@ -0,0 +1,17 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="Redefine description", multi=True, default=['non'], default_multi="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/01base_value_doublequote/00-base.xml b/tests/dictionaries_old/01base_value_doublequote/00-base.xml
new file mode 100644
index 00000000..df1c54f3
--- /dev/null
+++ b/tests/dictionaries_old/01base_value_doublequote/00-base.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True">
+        <value>quote"</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/01base_value_doublequote/__init__.py b/tests/dictionaries_old/01base_value_doublequote/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/01base_value_doublequote/makedict/after.json b/tests/dictionaries_old/01base_value_doublequote/makedict/after.json
new file mode 100644
index 00000000..65ffec19
--- /dev/null
+++ b/tests/dictionaries_old/01base_value_doublequote/makedict/after.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "quote\""
+    }
+}
diff --git a/tests/dictionaries_old/01base_value_doublequote/makedict/base.json b/tests/dictionaries_old/01base_value_doublequote/makedict/base.json
new file mode 100644
index 00000000..8b946678
--- /dev/null
+++ b/tests/dictionaries_old/01base_value_doublequote/makedict/base.json
@@ -0,0 +1,3 @@
+{
+    "rougail.general.mode_conteneur_actif": "quote\""
+}
diff --git a/tests/dictionaries_old/01base_value_doublequote/makedict/before.json b/tests/dictionaries_old/01base_value_doublequote/makedict/before.json
new file mode 100644
index 00000000..65ffec19
--- /dev/null
+++ b/tests/dictionaries_old/01base_value_doublequote/makedict/before.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "quote\""
+    }
+}
diff --git a/tests/dictionaries_old/01base_value_doublequote/tiramisu/base.py b/tests/dictionaries_old/01base_value_doublequote/tiramisu/base.py
new file mode 100644
index 00000000..3355bea9
--- /dev/null
+++ b/tests/dictionaries_old/01base_value_doublequote/tiramisu/base.py
@@ -0,0 +1,17 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="Redefine description", default="quote\"", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/01base_value_doublequote2/00-base.xml b/tests/dictionaries_old/01base_value_doublequote2/00-base.xml
new file mode 100644
index 00000000..8f2faae9
--- /dev/null
+++ b/tests/dictionaries_old/01base_value_doublequote2/00-base.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True">
+        <value>quote'"</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/01base_value_doublequote2/__init__.py b/tests/dictionaries_old/01base_value_doublequote2/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/01base_value_doublequote2/makedict/after.json b/tests/dictionaries_old/01base_value_doublequote2/makedict/after.json
new file mode 100644
index 00000000..3a7cb659
--- /dev/null
+++ b/tests/dictionaries_old/01base_value_doublequote2/makedict/after.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "quote'\""
+    }
+}
diff --git a/tests/dictionaries_old/01base_value_doublequote2/makedict/base.json b/tests/dictionaries_old/01base_value_doublequote2/makedict/base.json
new file mode 100644
index 00000000..5e62b4e3
--- /dev/null
+++ b/tests/dictionaries_old/01base_value_doublequote2/makedict/base.json
@@ -0,0 +1,3 @@
+{
+    "rougail.general.mode_conteneur_actif": "quote'\""
+}
diff --git a/tests/dictionaries_old/01base_value_doublequote2/makedict/before.json b/tests/dictionaries_old/01base_value_doublequote2/makedict/before.json
new file mode 100644
index 00000000..3a7cb659
--- /dev/null
+++ b/tests/dictionaries_old/01base_value_doublequote2/makedict/before.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "quote'\""
+    }
+}
diff --git a/tests/dictionaries_old/01base_value_doublequote2/tiramisu/base.py b/tests/dictionaries_old/01base_value_doublequote2/tiramisu/base.py
new file mode 100644
index 00000000..bf1497e3
--- /dev/null
+++ b/tests/dictionaries_old/01base_value_doublequote2/tiramisu/base.py
@@ -0,0 +1,17 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="Redefine description", default="quote'\"", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/01base_value_doublequote3/00-base.xml b/tests/dictionaries_old/01base_value_doublequote3/00-base.xml
new file mode 100644
index 00000000..97070d9f
--- /dev/null
+++ b/tests/dictionaries_old/01base_value_doublequote3/00-base.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True">
+        <value>quote\"\'</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/01base_value_doublequote3/__init__.py b/tests/dictionaries_old/01base_value_doublequote3/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/01base_value_doublequote3/makedict/after.json b/tests/dictionaries_old/01base_value_doublequote3/makedict/after.json
new file mode 100644
index 00000000..dfe893fd
--- /dev/null
+++ b/tests/dictionaries_old/01base_value_doublequote3/makedict/after.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "quote\\\"\\'"
+    }
+}
diff --git a/tests/dictionaries_old/01base_value_doublequote3/makedict/base.json b/tests/dictionaries_old/01base_value_doublequote3/makedict/base.json
new file mode 100644
index 00000000..6fb0f941
--- /dev/null
+++ b/tests/dictionaries_old/01base_value_doublequote3/makedict/base.json
@@ -0,0 +1,3 @@
+{
+    "rougail.general.mode_conteneur_actif": "quote\\\"\\'"
+}
diff --git a/tests/dictionaries_old/01base_value_doublequote3/makedict/before.json b/tests/dictionaries_old/01base_value_doublequote3/makedict/before.json
new file mode 100644
index 00000000..dfe893fd
--- /dev/null
+++ b/tests/dictionaries_old/01base_value_doublequote3/makedict/before.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "quote\\\"\\'"
+    }
+}
diff --git a/tests/dictionaries_old/01base_value_doublequote3/tiramisu/base.py b/tests/dictionaries_old/01base_value_doublequote3/tiramisu/base.py
new file mode 100644
index 00000000..4c36e5c7
--- /dev/null
+++ b/tests/dictionaries_old/01base_value_doublequote3/tiramisu/base.py
@@ -0,0 +1,17 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="Redefine description", default="quote\\\"\\'", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/01base_value_multi_doublequote/00-base.xml b/tests/dictionaries_old/01base_value_multi_doublequote/00-base.xml
new file mode 100644
index 00000000..6f8b0f9b
--- /dev/null
+++ b/tests/dictionaries_old/01base_value_multi_doublequote/00-base.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True" multi="True">
+        <value>quote"</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/01base_value_multi_doublequote/__init__.py b/tests/dictionaries_old/01base_value_multi_doublequote/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/01base_value_multi_doublequote/makedict/after.json b/tests/dictionaries_old/01base_value_multi_doublequote/makedict/after.json
new file mode 100644
index 00000000..d0855979
--- /dev/null
+++ b/tests/dictionaries_old/01base_value_multi_doublequote/makedict/after.json
@@ -0,0 +1,8 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": [
+            "quote\""
+        ]
+    }
+}
diff --git a/tests/dictionaries_old/01base_value_multi_doublequote/makedict/base.json b/tests/dictionaries_old/01base_value_multi_doublequote/makedict/base.json
new file mode 100644
index 00000000..8fab16f4
--- /dev/null
+++ b/tests/dictionaries_old/01base_value_multi_doublequote/makedict/base.json
@@ -0,0 +1,5 @@
+{
+    "rougail.general.mode_conteneur_actif": [
+        "quote\""
+    ]
+}
diff --git a/tests/dictionaries_old/01base_value_multi_doublequote/makedict/before.json b/tests/dictionaries_old/01base_value_multi_doublequote/makedict/before.json
new file mode 100644
index 00000000..d0855979
--- /dev/null
+++ b/tests/dictionaries_old/01base_value_multi_doublequote/makedict/before.json
@@ -0,0 +1,8 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": [
+            "quote\""
+        ]
+    }
+}
diff --git a/tests/dictionaries_old/01base_value_multi_doublequote/tiramisu/base.py b/tests/dictionaries_old/01base_value_multi_doublequote/tiramisu/base.py
new file mode 100644
index 00000000..7c7568d8
--- /dev/null
+++ b/tests/dictionaries_old/01base_value_multi_doublequote/tiramisu/base.py
@@ -0,0 +1,17 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="Redefine description", multi=True, default=['quote"'], default_multi="quote\"", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/01base_value_multi_doublequote2/00-base.xml b/tests/dictionaries_old/01base_value_multi_doublequote2/00-base.xml
new file mode 100644
index 00000000..cc6ed95e
--- /dev/null
+++ b/tests/dictionaries_old/01base_value_multi_doublequote2/00-base.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True" multi="True">
+        <value>quote'"</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/01base_value_multi_doublequote2/__init__.py b/tests/dictionaries_old/01base_value_multi_doublequote2/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/01base_value_multi_doublequote2/makedict/after.json b/tests/dictionaries_old/01base_value_multi_doublequote2/makedict/after.json
new file mode 100644
index 00000000..551c8229
--- /dev/null
+++ b/tests/dictionaries_old/01base_value_multi_doublequote2/makedict/after.json
@@ -0,0 +1,8 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": [
+            "quote'\""
+        ]
+    }
+}
diff --git a/tests/dictionaries_old/01base_value_multi_doublequote2/makedict/base.json b/tests/dictionaries_old/01base_value_multi_doublequote2/makedict/base.json
new file mode 100644
index 00000000..ca58e02d
--- /dev/null
+++ b/tests/dictionaries_old/01base_value_multi_doublequote2/makedict/base.json
@@ -0,0 +1,5 @@
+{
+    "rougail.general.mode_conteneur_actif": [
+        "quote'\""
+    ]
+}
diff --git a/tests/dictionaries_old/01base_value_multi_doublequote2/makedict/before.json b/tests/dictionaries_old/01base_value_multi_doublequote2/makedict/before.json
new file mode 100644
index 00000000..551c8229
--- /dev/null
+++ b/tests/dictionaries_old/01base_value_multi_doublequote2/makedict/before.json
@@ -0,0 +1,8 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": [
+            "quote'\""
+        ]
+    }
+}
diff --git a/tests/dictionaries_old/01base_value_multi_doublequote2/tiramisu/base.py b/tests/dictionaries_old/01base_value_multi_doublequote2/tiramisu/base.py
new file mode 100644
index 00000000..d8aee933
--- /dev/null
+++ b/tests/dictionaries_old/01base_value_multi_doublequote2/tiramisu/base.py
@@ -0,0 +1,17 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="Redefine description", multi=True, default=['quote\'"'], default_multi="quote'\"", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/01base_value_multi_quote/00-base.xml b/tests/dictionaries_old/01base_value_multi_quote/00-base.xml
new file mode 100644
index 00000000..a2a33d6d
--- /dev/null
+++ b/tests/dictionaries_old/01base_value_multi_quote/00-base.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True" multi="True">
+        <value>quote'</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/01base_value_multi_quote/__init__.py b/tests/dictionaries_old/01base_value_multi_quote/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/01base_value_multi_quote/makedict/after.json b/tests/dictionaries_old/01base_value_multi_quote/makedict/after.json
new file mode 100644
index 00000000..f73096a2
--- /dev/null
+++ b/tests/dictionaries_old/01base_value_multi_quote/makedict/after.json
@@ -0,0 +1,8 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": [
+            "quote'"
+        ]
+    }
+}
diff --git a/tests/dictionaries_old/01base_value_multi_quote/makedict/base.json b/tests/dictionaries_old/01base_value_multi_quote/makedict/base.json
new file mode 100644
index 00000000..687df2ba
--- /dev/null
+++ b/tests/dictionaries_old/01base_value_multi_quote/makedict/base.json
@@ -0,0 +1,5 @@
+{
+    "rougail.general.mode_conteneur_actif": [
+        "quote'"
+    ]
+}
diff --git a/tests/dictionaries_old/01base_value_multi_quote/makedict/before.json b/tests/dictionaries_old/01base_value_multi_quote/makedict/before.json
new file mode 100644
index 00000000..f73096a2
--- /dev/null
+++ b/tests/dictionaries_old/01base_value_multi_quote/makedict/before.json
@@ -0,0 +1,8 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": [
+            "quote'"
+        ]
+    }
+}
diff --git a/tests/dictionaries_old/01base_value_multi_quote/tiramisu/base.py b/tests/dictionaries_old/01base_value_multi_quote/tiramisu/base.py
new file mode 100644
index 00000000..0c165862
--- /dev/null
+++ b/tests/dictionaries_old/01base_value_multi_quote/tiramisu/base.py
@@ -0,0 +1,17 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="Redefine description", multi=True, default=["quote'"], default_multi="quote'", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/01base_value_quote/00-base.xml b/tests/dictionaries_old/01base_value_quote/00-base.xml
new file mode 100644
index 00000000..1b8d7272
--- /dev/null
+++ b/tests/dictionaries_old/01base_value_quote/00-base.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True">
+        <value>quote'</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/01base_value_quote/__init__.py b/tests/dictionaries_old/01base_value_quote/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/01base_value_quote/makedict/after.json b/tests/dictionaries_old/01base_value_quote/makedict/after.json
new file mode 100644
index 00000000..3b790b93
--- /dev/null
+++ b/tests/dictionaries_old/01base_value_quote/makedict/after.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "quote'"
+    }
+}
diff --git a/tests/dictionaries_old/01base_value_quote/makedict/base.json b/tests/dictionaries_old/01base_value_quote/makedict/base.json
new file mode 100644
index 00000000..a2a512d5
--- /dev/null
+++ b/tests/dictionaries_old/01base_value_quote/makedict/base.json
@@ -0,0 +1,3 @@
+{
+    "rougail.general.mode_conteneur_actif": "quote'"
+}
diff --git a/tests/dictionaries_old/01base_value_quote/makedict/before.json b/tests/dictionaries_old/01base_value_quote/makedict/before.json
new file mode 100644
index 00000000..3b790b93
--- /dev/null
+++ b/tests/dictionaries_old/01base_value_quote/makedict/before.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "quote'"
+    }
+}
diff --git a/tests/dictionaries_old/01base_value_quote/tiramisu/base.py b/tests/dictionaries_old/01base_value_quote/tiramisu/base.py
new file mode 100644
index 00000000..da9bf3c1
--- /dev/null
+++ b/tests/dictionaries_old/01base_value_quote/tiramisu/base.py
@@ -0,0 +1,17 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="Redefine description", default="quote'", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/01base_var_name_same_family/00-base.xml b/tests/dictionaries_old/01base_var_name_same_family/00-base.xml
new file mode 100644
index 00000000..7d8e62da
--- /dev/null
+++ b/tests/dictionaries_old/01base_var_name_same_family/00-base.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="general" type="string" description="description">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/01base_var_name_same_family/__init__.py b/tests/dictionaries_old/01base_var_name_same_family/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/01base_var_name_same_family/makedict/after.json b/tests/dictionaries_old/01base_var_name_same_family/makedict/after.json
new file mode 100644
index 00000000..b3942d98
--- /dev/null
+++ b/tests/dictionaries_old/01base_var_name_same_family/makedict/after.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.general": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/01base_var_name_same_family/makedict/base.json b/tests/dictionaries_old/01base_var_name_same_family/makedict/base.json
new file mode 100644
index 00000000..03f140af
--- /dev/null
+++ b/tests/dictionaries_old/01base_var_name_same_family/makedict/base.json
@@ -0,0 +1,3 @@
+{
+    "rougail.general.general": "non"
+}
diff --git a/tests/dictionaries_old/01base_var_name_same_family/makedict/before.json b/tests/dictionaries_old/01base_var_name_same_family/makedict/before.json
new file mode 100644
index 00000000..b3942d98
--- /dev/null
+++ b/tests/dictionaries_old/01base_var_name_same_family/makedict/before.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.general": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/01base_var_name_same_family/tiramisu/base.py b/tests/dictionaries_old/01base_var_name_same_family/tiramisu/base.py
new file mode 100644
index 00000000..77dac068
--- /dev/null
+++ b/tests/dictionaries_old/01base_var_name_same_family/tiramisu/base.py
@@ -0,0 +1,17 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="general", doc="description", default="non", properties=frozenset({"mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/01boolean_no_mandatory/00-base.xml b/tests/dictionaries_old/01boolean_no_mandatory/00-base.xml
new file mode 100644
index 00000000..f17d73cd
--- /dev/null
+++ b/tests/dictionaries_old/01boolean_no_mandatory/00-base.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <variable name="my_variable" type="boolean" mandatory="False"/>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/01boolean_no_mandatory/__init__.py b/tests/dictionaries_old/01boolean_no_mandatory/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/01boolean_no_mandatory/makedict/after.json b/tests/dictionaries_old/01boolean_no_mandatory/makedict/after.json
new file mode 100644
index 00000000..51758e8d
--- /dev/null
+++ b/tests/dictionaries_old/01boolean_no_mandatory/makedict/after.json
@@ -0,0 +1,6 @@
+{
+    "rougail.my_variable": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/01boolean_no_mandatory/makedict/base.json b/tests/dictionaries_old/01boolean_no_mandatory/makedict/base.json
new file mode 100644
index 00000000..9c4e49a9
--- /dev/null
+++ b/tests/dictionaries_old/01boolean_no_mandatory/makedict/base.json
@@ -0,0 +1,3 @@
+{
+    "rougail.my_variable": true
+}
diff --git a/tests/dictionaries_old/01boolean_no_mandatory/makedict/before.json b/tests/dictionaries_old/01boolean_no_mandatory/makedict/before.json
new file mode 100644
index 00000000..51758e8d
--- /dev/null
+++ b/tests/dictionaries_old/01boolean_no_mandatory/makedict/before.json
@@ -0,0 +1,6 @@
+{
+    "rougail.my_variable": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/01boolean_no_mandatory/tiramisu/base.py b/tests/dictionaries_old/01boolean_no_mandatory/tiramisu/base.py
new file mode 100644
index 00000000..a3e141bb
--- /dev/null
+++ b/tests/dictionaries_old/01boolean_no_mandatory/tiramisu/base.py
@@ -0,0 +1,16 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_2 = BoolOption(name="my_variable", doc="my_variable", default=True, properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/01family_description/00-base.xml b/tests/dictionaries_old/01family_description/00-base.xml
new file mode 100644
index 00000000..d4389823
--- /dev/null
+++ b/tests/dictionaries_old/01family_description/00-base.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general" description="Other description">
+      <variable name="mode_conteneur_actif">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/01family_description/__init__.py b/tests/dictionaries_old/01family_description/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/01family_description/makedict/after.json b/tests/dictionaries_old/01family_description/makedict/after.json
new file mode 100644
index 00000000..2e6c541d
--- /dev/null
+++ b/tests/dictionaries_old/01family_description/makedict/after.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/01family_description/makedict/base.json b/tests/dictionaries_old/01family_description/makedict/base.json
new file mode 100644
index 00000000..25056378
--- /dev/null
+++ b/tests/dictionaries_old/01family_description/makedict/base.json
@@ -0,0 +1,3 @@
+{
+    "rougail.general.mode_conteneur_actif": "non"
+}
diff --git a/tests/dictionaries_old/01family_description/makedict/before.json b/tests/dictionaries_old/01family_description/makedict/before.json
new file mode 100644
index 00000000..2e6c541d
--- /dev/null
+++ b/tests/dictionaries_old/01family_description/makedict/before.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/01family_description/tiramisu/base.py b/tests/dictionaries_old/01family_description/tiramisu/base.py
new file mode 100644
index 00000000..15ee3eed
--- /dev/null
+++ b/tests/dictionaries_old/01family_description/tiramisu/base.py
@@ -0,0 +1,17 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="mode_conteneur_actif", default="non", properties=frozenset({"mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="Other description", children=[option_3], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/01fill_autofreeze/00-base.xml b/tests/dictionaries_old/01fill_autofreeze/00-base.xml
new file mode 100644
index 00000000..a1f99cde
--- /dev/null
+++ b/tests/dictionaries_old/01fill_autofreeze/00-base.xml
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <variable name="my_var1" auto_freeze="True">
+      <value>no</value>
+    </variable>
+    <variable name="my_var2">
+      <value>no</value>
+    </variable>
+    <variable name="server_deployed" type="boolean">
+      <value>False</value>
+    </variable>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="variable">my_var2</param>
+      <target>my_var1</target>
+    </fill>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/01fill_autofreeze/__init__.py b/tests/dictionaries_old/01fill_autofreeze/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/01fill_autofreeze/makedict/after.json b/tests/dictionaries_old/01fill_autofreeze/makedict/after.json
new file mode 100644
index 00000000..0a833677
--- /dev/null
+++ b/tests/dictionaries_old/01fill_autofreeze/makedict/after.json
@@ -0,0 +1,14 @@
+{
+    "rougail.my_var1": {
+        "owner": "forced",
+        "value": "no"
+    },
+    "rougail.my_var2": {
+        "owner": "default",
+        "value": "no"
+    },
+    "rougail.server_deployed": {
+        "owner": "default",
+        "value": false
+    }
+}
diff --git a/tests/dictionaries_old/01fill_autofreeze/makedict/base.json b/tests/dictionaries_old/01fill_autofreeze/makedict/base.json
new file mode 100644
index 00000000..3f79625c
--- /dev/null
+++ b/tests/dictionaries_old/01fill_autofreeze/makedict/base.json
@@ -0,0 +1,5 @@
+{
+    "rougail.my_var1": "no",
+    "rougail.my_var2": "no",
+    "rougail.server_deployed": false
+}
diff --git a/tests/dictionaries_old/01fill_autofreeze/makedict/before.json b/tests/dictionaries_old/01fill_autofreeze/makedict/before.json
new file mode 100644
index 00000000..101266cd
--- /dev/null
+++ b/tests/dictionaries_old/01fill_autofreeze/makedict/before.json
@@ -0,0 +1,14 @@
+{
+    "rougail.my_var1": {
+        "owner": "default",
+        "value": "no"
+    },
+    "rougail.my_var2": {
+        "owner": "default",
+        "value": "no"
+    },
+    "rougail.server_deployed": {
+        "owner": "default",
+        "value": false
+    }
+}
diff --git a/tests/dictionaries_old/01fill_autofreeze/tiramisu/base.py b/tests/dictionaries_old/01fill_autofreeze/tiramisu/base.py
new file mode 100644
index 00000000..dda85a1d
--- /dev/null
+++ b/tests/dictionaries_old/01fill_autofreeze/tiramisu/base.py
@@ -0,0 +1,18 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="my_var2", doc="my_var2", default="no", properties=frozenset({"mandatory", "normal"}))
+option_4 = BoolOption(name="server_deployed", doc="server_deployed", default=False, properties=frozenset({"mandatory", "normal"}))
+option_2 = StrOption(name="my_var1", doc="my_var1", default=Calculation(func.calc_val, Params((ParamOption(option_3)))), properties=frozenset({"basic", "force_store_value", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_4, todict=True, notraisepropertyerror=True), 'expected': ParamValue(True)}))}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_3, option_4])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/01fill_autosave/00-base.xml b/tests/dictionaries_old/01fill_autosave/00-base.xml
new file mode 100644
index 00000000..b5bbda90
--- /dev/null
+++ b/tests/dictionaries_old/01fill_autosave/00-base.xml
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <variable name="server_deployed" type="boolean"/>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" auto_save="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="variable">mode_conteneur_actif1</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/01fill_autosave/__init__.py b/tests/dictionaries_old/01fill_autosave/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/01fill_autosave/makedict/after.json b/tests/dictionaries_old/01fill_autosave/makedict/after.json
new file mode 100644
index 00000000..8ac6b9a1
--- /dev/null
+++ b/tests/dictionaries_old/01fill_autosave/makedict/after.json
@@ -0,0 +1,14 @@
+{
+    "rougail.server_deployed": {
+        "owner": "default",
+        "value": true
+    },
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "forced",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif1": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/01fill_autosave/makedict/base.json b/tests/dictionaries_old/01fill_autosave/makedict/base.json
new file mode 100644
index 00000000..f380de6e
--- /dev/null
+++ b/tests/dictionaries_old/01fill_autosave/makedict/base.json
@@ -0,0 +1,5 @@
+{
+    "rougail.server_deployed": true,
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general.mode_conteneur_actif1": "non"
+}
diff --git a/tests/dictionaries_old/01fill_autosave/makedict/before.json b/tests/dictionaries_old/01fill_autosave/makedict/before.json
new file mode 100644
index 00000000..c4f382b5
--- /dev/null
+++ b/tests/dictionaries_old/01fill_autosave/makedict/before.json
@@ -0,0 +1,14 @@
+{
+    "rougail.server_deployed": {
+        "owner": "default",
+        "value": true
+    },
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif1": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/01fill_autosave/tiramisu/base.py b/tests/dictionaries_old/01fill_autosave/tiramisu/base.py
new file mode 100644
index 00000000..4bea789d
--- /dev/null
+++ b/tests/dictionaries_old/01fill_autosave/tiramisu/base.py
@@ -0,0 +1,19 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_2 = BoolOption(name="server_deployed", doc="server_deployed", default=True, properties=frozenset({"mandatory", "normal"}))
+option_5 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params((ParamOption(option_5)))), properties=frozenset({"basic", "force_store_value"}))
+option_3 = OptionDescription(name="general", doc="general", children=[option_4, option_5], properties=frozenset({"basic"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_3])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/01fill_base/00-base.xml b/tests/dictionaries_old/01fill_base/00-base.xml
new file mode 100644
index 00000000..a8241336
--- /dev/null
+++ b/tests/dictionaries_old/01fill_base/00-base.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change"/>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="variable">mode_conteneur_actif1</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/01fill_base/__init__.py b/tests/dictionaries_old/01fill_base/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/01fill_base/makedict/after.json b/tests/dictionaries_old/01fill_base/makedict/after.json
new file mode 100644
index 00000000..6ebfbbe9
--- /dev/null
+++ b/tests/dictionaries_old/01fill_base/makedict/after.json
@@ -0,0 +1,10 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif1": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/01fill_base/makedict/base.json b/tests/dictionaries_old/01fill_base/makedict/base.json
new file mode 100644
index 00000000..3f1a7b00
--- /dev/null
+++ b/tests/dictionaries_old/01fill_base/makedict/base.json
@@ -0,0 +1,4 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general.mode_conteneur_actif1": "non"
+}
diff --git a/tests/dictionaries_old/01fill_base/makedict/before.json b/tests/dictionaries_old/01fill_base/makedict/before.json
new file mode 100644
index 00000000..6ebfbbe9
--- /dev/null
+++ b/tests/dictionaries_old/01fill_base/makedict/before.json
@@ -0,0 +1,10 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif1": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/01fill_base/tiramisu/base.py b/tests/dictionaries_old/01fill_base/tiramisu/base.py
new file mode 100644
index 00000000..3f1f65b9
--- /dev/null
+++ b/tests/dictionaries_old/01fill_base/tiramisu/base.py
@@ -0,0 +1,18 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_4 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params((ParamOption(option_4)))), properties=frozenset({"normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/01fill_mandatory/00-base.xml b/tests/dictionaries_old/01fill_mandatory/00-base.xml
new file mode 100644
index 00000000..ac83f20e
--- /dev/null
+++ b/tests/dictionaries_old/01fill_mandatory/00-base.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general" mode="basic">
+      <variable name="mode_conteneur_actif" type="string" description="No change" mandatory="True" mode="expert"/>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="variable">mode_conteneur_actif1</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/01fill_mandatory/__init__.py b/tests/dictionaries_old/01fill_mandatory/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/01fill_mandatory/makedict/after.json b/tests/dictionaries_old/01fill_mandatory/makedict/after.json
new file mode 100644
index 00000000..6ebfbbe9
--- /dev/null
+++ b/tests/dictionaries_old/01fill_mandatory/makedict/after.json
@@ -0,0 +1,10 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif1": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/01fill_mandatory/makedict/base.json b/tests/dictionaries_old/01fill_mandatory/makedict/base.json
new file mode 100644
index 00000000..3f1a7b00
--- /dev/null
+++ b/tests/dictionaries_old/01fill_mandatory/makedict/base.json
@@ -0,0 +1,4 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general.mode_conteneur_actif1": "non"
+}
diff --git a/tests/dictionaries_old/01fill_mandatory/makedict/before.json b/tests/dictionaries_old/01fill_mandatory/makedict/before.json
new file mode 100644
index 00000000..6ebfbbe9
--- /dev/null
+++ b/tests/dictionaries_old/01fill_mandatory/makedict/before.json
@@ -0,0 +1,10 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif1": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/01fill_mandatory/tiramisu/base.py b/tests/dictionaries_old/01fill_mandatory/tiramisu/base.py
new file mode 100644
index 00000000..d8abb72b
--- /dev/null
+++ b/tests/dictionaries_old/01fill_mandatory/tiramisu/base.py
@@ -0,0 +1,18 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_4 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"basic", "mandatory"}))
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params((ParamOption(option_4)))), properties=frozenset({"expert", "mandatory"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4], properties=frozenset({"basic"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/01fill_number/00-base.xml b/tests/dictionaries_old/01fill_number/00-base.xml
new file mode 100644
index 00000000..ee2e4094
--- /dev/null
+++ b/tests/dictionaries_old/01fill_number/00-base.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="number" description="No change" hidden="True"/>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="number">3</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/01fill_number/__init__.py b/tests/dictionaries_old/01fill_number/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/01fill_number/makedict/after.json b/tests/dictionaries_old/01fill_number/makedict/after.json
new file mode 100644
index 00000000..65a98ebb
--- /dev/null
+++ b/tests/dictionaries_old/01fill_number/makedict/after.json
@@ -0,0 +1,10 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": 3
+    },
+    "rougail.general.mode_conteneur_actif1": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/01fill_number/makedict/base.json b/tests/dictionaries_old/01fill_number/makedict/base.json
new file mode 100644
index 00000000..e807c5bf
--- /dev/null
+++ b/tests/dictionaries_old/01fill_number/makedict/base.json
@@ -0,0 +1,4 @@
+{
+    "rougail.general.mode_conteneur_actif": 3,
+    "rougail.general.mode_conteneur_actif1": "non"
+}
diff --git a/tests/dictionaries_old/01fill_number/makedict/before.json b/tests/dictionaries_old/01fill_number/makedict/before.json
new file mode 100644
index 00000000..65a98ebb
--- /dev/null
+++ b/tests/dictionaries_old/01fill_number/makedict/before.json
@@ -0,0 +1,10 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": 3
+    },
+    "rougail.general.mode_conteneur_actif1": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/01fill_number/tiramisu/base.py b/tests/dictionaries_old/01fill_number/tiramisu/base.py
new file mode 100644
index 00000000..9f58ad60
--- /dev/null
+++ b/tests/dictionaries_old/01fill_number/tiramisu/base.py
@@ -0,0 +1,18 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = IntOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params((ParamValue(3)))), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal"}))
+option_4 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/01fill_only_optional/00-base.xml b/tests/dictionaries_old/01fill_only_optional/00-base.xml
new file mode 100644
index 00000000..10fef306
--- /dev/null
+++ b/tests/dictionaries_old/01fill_only_optional/00-base.xml
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="variable" optional="True">mode_conteneur_actif4</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/01fill_only_optional/__init__.py b/tests/dictionaries_old/01fill_only_optional/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/01fill_only_optional/makedict/after.json b/tests/dictionaries_old/01fill_only_optional/makedict/after.json
new file mode 100644
index 00000000..477ccc55
--- /dev/null
+++ b/tests/dictionaries_old/01fill_only_optional/makedict/after.json
@@ -0,0 +1,10 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": null
+    },
+    "rougail.general.mode_conteneur_actif1": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/01fill_only_optional/makedict/base.json b/tests/dictionaries_old/01fill_only_optional/makedict/base.json
new file mode 100644
index 00000000..f8d69705
--- /dev/null
+++ b/tests/dictionaries_old/01fill_only_optional/makedict/base.json
@@ -0,0 +1,4 @@
+{
+    "rougail.general.mode_conteneur_actif": null,
+    "rougail.general.mode_conteneur_actif1": "non"
+}
diff --git a/tests/dictionaries_old/01fill_only_optional/makedict/before.json b/tests/dictionaries_old/01fill_only_optional/makedict/before.json
new file mode 100644
index 00000000..477ccc55
--- /dev/null
+++ b/tests/dictionaries_old/01fill_only_optional/makedict/before.json
@@ -0,0 +1,10 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": null
+    },
+    "rougail.general.mode_conteneur_actif1": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/01fill_only_optional/tiramisu/base.py b/tests/dictionaries_old/01fill_only_optional/tiramisu/base.py
new file mode 100644
index 00000000..548f1929
--- /dev/null
+++ b/tests/dictionaries_old/01fill_only_optional/tiramisu/base.py
@@ -0,0 +1,18 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params(())), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal"}))
+option_4 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/01fill_optional/00-base.xml b/tests/dictionaries_old/01fill_optional/00-base.xml
new file mode 100644
index 00000000..6382ce45
--- /dev/null
+++ b/tests/dictionaries_old/01fill_optional/00-base.xml
@@ -0,0 +1,21 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="variable" optional="True">mode_conteneur_actif4</param>
+      <param type="variable">mode_conteneur_actif1</param>
+      <param type="variable" optional="True">mode_conteneur_actif3</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/01fill_optional/__init__.py b/tests/dictionaries_old/01fill_optional/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/01fill_optional/makedict/after.json b/tests/dictionaries_old/01fill_optional/makedict/after.json
new file mode 100644
index 00000000..6ebfbbe9
--- /dev/null
+++ b/tests/dictionaries_old/01fill_optional/makedict/after.json
@@ -0,0 +1,10 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif1": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/01fill_optional/makedict/base.json b/tests/dictionaries_old/01fill_optional/makedict/base.json
new file mode 100644
index 00000000..3f1a7b00
--- /dev/null
+++ b/tests/dictionaries_old/01fill_optional/makedict/base.json
@@ -0,0 +1,4 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general.mode_conteneur_actif1": "non"
+}
diff --git a/tests/dictionaries_old/01fill_optional/makedict/before.json b/tests/dictionaries_old/01fill_optional/makedict/before.json
new file mode 100644
index 00000000..6ebfbbe9
--- /dev/null
+++ b/tests/dictionaries_old/01fill_optional/makedict/before.json
@@ -0,0 +1,10 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif1": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/01fill_optional/tiramisu/base.py b/tests/dictionaries_old/01fill_optional/tiramisu/base.py
new file mode 100644
index 00000000..a4fb076c
--- /dev/null
+++ b/tests/dictionaries_old/01fill_optional/tiramisu/base.py
@@ -0,0 +1,18 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_4 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params((ParamOption(option_4)))), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/01fill_quote/00-base.xml b/tests/dictionaries_old/01fill_quote/00-base.xml
new file mode 100644
index 00000000..155af270
--- /dev/null
+++ b/tests/dictionaries_old/01fill_quote/00-base.xml
@@ -0,0 +1,29 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change"/>
+      <variable name="mode_conteneur_actif1" type="string" description="No change"/>
+      <variable name="mode_conteneur_actif2" type="string" description="No change"/>
+      <variable name="mode_conteneur_actif3" type="string" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param>quote'</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+    <fill name="calc_val">
+      <param>quote"</param>
+      <target>mode_conteneur_actif1</target>
+    </fill>
+    <fill name="calc_val">
+      <param>quote"'</param>
+      <target>mode_conteneur_actif2</target>
+    </fill>
+    <fill name="calc_val">
+      <param>quote"\'</param>
+      <target>mode_conteneur_actif3</target>
+    </fill>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/01fill_quote/__init__.py b/tests/dictionaries_old/01fill_quote/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/01fill_quote/makedict/after.json b/tests/dictionaries_old/01fill_quote/makedict/after.json
new file mode 100644
index 00000000..f0b262c4
--- /dev/null
+++ b/tests/dictionaries_old/01fill_quote/makedict/after.json
@@ -0,0 +1,18 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "quote'"
+    },
+    "rougail.general.mode_conteneur_actif1": {
+        "owner": "default",
+        "value": "quote\""
+    },
+    "rougail.general.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "quote\"'"
+    },
+    "rougail.general.mode_conteneur_actif3": {
+        "owner": "default",
+        "value": "quote\"\\'"
+    }
+}
diff --git a/tests/dictionaries_old/01fill_quote/makedict/base.json b/tests/dictionaries_old/01fill_quote/makedict/base.json
new file mode 100644
index 00000000..478f39ef
--- /dev/null
+++ b/tests/dictionaries_old/01fill_quote/makedict/base.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": "quote'",
+    "rougail.general.mode_conteneur_actif1": "quote\"",
+    "rougail.general.mode_conteneur_actif2": "quote\"'",
+    "rougail.general.mode_conteneur_actif3": "quote\"\\'"
+}
diff --git a/tests/dictionaries_old/01fill_quote/makedict/before.json b/tests/dictionaries_old/01fill_quote/makedict/before.json
new file mode 100644
index 00000000..f0b262c4
--- /dev/null
+++ b/tests/dictionaries_old/01fill_quote/makedict/before.json
@@ -0,0 +1,18 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "quote'"
+    },
+    "rougail.general.mode_conteneur_actif1": {
+        "owner": "default",
+        "value": "quote\""
+    },
+    "rougail.general.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "quote\"'"
+    },
+    "rougail.general.mode_conteneur_actif3": {
+        "owner": "default",
+        "value": "quote\"\\'"
+    }
+}
diff --git a/tests/dictionaries_old/01fill_quote/tiramisu/base.py b/tests/dictionaries_old/01fill_quote/tiramisu/base.py
new file mode 100644
index 00000000..4f39148f
--- /dev/null
+++ b/tests/dictionaries_old/01fill_quote/tiramisu/base.py
@@ -0,0 +1,20 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params((ParamValue("quote'")))), properties=frozenset({"normal"}))
+option_4 = StrOption(name="mode_conteneur_actif1", doc="No change", default=Calculation(func.calc_val, Params((ParamValue("quote\"")))), properties=frozenset({"normal"}))
+option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default=Calculation(func.calc_val, Params((ParamValue("quote\"'")))), properties=frozenset({"normal"}))
+option_6 = StrOption(name="mode_conteneur_actif3", doc="No change", default=Calculation(func.calc_val, Params((ParamValue("quote\"\\'")))), properties=frozenset({"normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5, option_6], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/01fill_target_optional/00-base.xml b/tests/dictionaries_old/01fill_target_optional/00-base.xml
new file mode 100644
index 00000000..d2421162
--- /dev/null
+++ b/tests/dictionaries_old/01fill_target_optional/00-base.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="variable">mode_conteneur_actif1</param>
+      <target optional="True">mode_conteneur_actif</target>
+    </fill>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/01fill_target_optional/__init__.py b/tests/dictionaries_old/01fill_target_optional/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/01fill_target_optional/makedict/after.json b/tests/dictionaries_old/01fill_target_optional/makedict/after.json
new file mode 100644
index 00000000..45961373
--- /dev/null
+++ b/tests/dictionaries_old/01fill_target_optional/makedict/after.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif1": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/01fill_target_optional/makedict/base.json b/tests/dictionaries_old/01fill_target_optional/makedict/base.json
new file mode 100644
index 00000000..6cbc4d6b
--- /dev/null
+++ b/tests/dictionaries_old/01fill_target_optional/makedict/base.json
@@ -0,0 +1,3 @@
+{
+    "rougail.general.mode_conteneur_actif1": "non"
+}
diff --git a/tests/dictionaries_old/01fill_target_optional/makedict/before.json b/tests/dictionaries_old/01fill_target_optional/makedict/before.json
new file mode 100644
index 00000000..45961373
--- /dev/null
+++ b/tests/dictionaries_old/01fill_target_optional/makedict/before.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif1": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/01fill_target_optional/tiramisu/base.py b/tests/dictionaries_old/01fill_target_optional/tiramisu/base.py
new file mode 100644
index 00000000..204d9cb6
--- /dev/null
+++ b/tests/dictionaries_old/01fill_target_optional/tiramisu/base.py
@@ -0,0 +1,17 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/01hidden_if_in_autofreeze/00-base.xml b/tests/dictionaries_old/01hidden_if_in_autofreeze/00-base.xml
new file mode 100644
index 00000000..2626d61c
--- /dev/null
+++ b/tests/dictionaries_old/01hidden_if_in_autofreeze/00-base.xml
@@ -0,0 +1,21 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <variable name="server_deployed" type="boolean">
+      <value>False</value>
+    </variable>
+    <variable name="my_var" type="string" auto_freeze="True">
+      <value>no</value>
+    </variable>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param>yes</param>
+      <target>my_var</target>
+    </fill>
+    <condition name="hidden_if_in" source="server_deployed">
+      <param>True</param>
+      <target type="variable">my_var</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/01hidden_if_in_autofreeze/__init__.py b/tests/dictionaries_old/01hidden_if_in_autofreeze/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/01hidden_if_in_autofreeze/makedict/after.json b/tests/dictionaries_old/01hidden_if_in_autofreeze/makedict/after.json
new file mode 100644
index 00000000..bb359545
--- /dev/null
+++ b/tests/dictionaries_old/01hidden_if_in_autofreeze/makedict/after.json
@@ -0,0 +1,10 @@
+{
+    "rougail.server_deployed": {
+        "owner": "default",
+        "value": false
+    },
+    "rougail.my_var": {
+        "owner": "forced",
+        "value": "yes"
+    }
+}
diff --git a/tests/dictionaries_old/01hidden_if_in_autofreeze/makedict/base.json b/tests/dictionaries_old/01hidden_if_in_autofreeze/makedict/base.json
new file mode 100644
index 00000000..465c3cba
--- /dev/null
+++ b/tests/dictionaries_old/01hidden_if_in_autofreeze/makedict/base.json
@@ -0,0 +1,4 @@
+{
+    "rougail.server_deployed": false,
+    "rougail.my_var": "yes"
+}
diff --git a/tests/dictionaries_old/01hidden_if_in_autofreeze/makedict/before.json b/tests/dictionaries_old/01hidden_if_in_autofreeze/makedict/before.json
new file mode 100644
index 00000000..a35981a8
--- /dev/null
+++ b/tests/dictionaries_old/01hidden_if_in_autofreeze/makedict/before.json
@@ -0,0 +1,10 @@
+{
+    "rougail.server_deployed": {
+        "owner": "default",
+        "value": false
+    },
+    "rougail.my_var": {
+        "owner": "default",
+        "value": "yes"
+    }
+}
diff --git a/tests/dictionaries_old/01hidden_if_in_autofreeze/tiramisu/base.py b/tests/dictionaries_old/01hidden_if_in_autofreeze/tiramisu/base.py
new file mode 100644
index 00000000..2fc25e86
--- /dev/null
+++ b/tests/dictionaries_old/01hidden_if_in_autofreeze/tiramisu/base.py
@@ -0,0 +1,17 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_2 = BoolOption(name="server_deployed", doc="server_deployed", default=False, properties=frozenset({"mandatory", "normal"}))
+option_3 = StrOption(name="my_var", doc="my_var", default=Calculation(func.calc_val, Params((ParamValue("yes")))), properties=frozenset({"basic", "force_store_value", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue(True)}))}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_3])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/01test/00-base.xml b/tests/dictionaries_old/01test/00-base.xml
new file mode 100644
index 00000000..a3d9a16c
--- /dev/null
+++ b/tests/dictionaries_old/01test/00-base.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" test="test">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/01test/__init__.py b/tests/dictionaries_old/01test/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/01test/makedict/after.json b/tests/dictionaries_old/01test/makedict/after.json
new file mode 100644
index 00000000..2e6c541d
--- /dev/null
+++ b/tests/dictionaries_old/01test/makedict/after.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/01test/makedict/base.json b/tests/dictionaries_old/01test/makedict/base.json
new file mode 100644
index 00000000..25056378
--- /dev/null
+++ b/tests/dictionaries_old/01test/makedict/base.json
@@ -0,0 +1,3 @@
+{
+    "rougail.general.mode_conteneur_actif": "non"
+}
diff --git a/tests/dictionaries_old/01test/makedict/before.json b/tests/dictionaries_old/01test/makedict/before.json
new file mode 100644
index 00000000..2e6c541d
--- /dev/null
+++ b/tests/dictionaries_old/01test/makedict/before.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/01test/tiramisu/base.py b/tests/dictionaries_old/01test/tiramisu/base.py
new file mode 100644
index 00000000..85a77cad
--- /dev/null
+++ b/tests/dictionaries_old/01test/tiramisu/base.py
@@ -0,0 +1,18 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="mode_conteneur_actif", default="non", properties=frozenset({"mandatory", "normal"}))
+option_3.impl_set_information('test', ('test',))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/01test_multi/00-base.xml b/tests/dictionaries_old/01test_multi/00-base.xml
new file mode 100644
index 00000000..3fbe4b85
--- /dev/null
+++ b/tests/dictionaries_old/01test_multi/00-base.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" test="test1|test2">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/01test_multi/__init__.py b/tests/dictionaries_old/01test_multi/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/01test_multi/makedict/after.json b/tests/dictionaries_old/01test_multi/makedict/after.json
new file mode 100644
index 00000000..2e6c541d
--- /dev/null
+++ b/tests/dictionaries_old/01test_multi/makedict/after.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/01test_multi/makedict/base.json b/tests/dictionaries_old/01test_multi/makedict/base.json
new file mode 100644
index 00000000..25056378
--- /dev/null
+++ b/tests/dictionaries_old/01test_multi/makedict/base.json
@@ -0,0 +1,3 @@
+{
+    "rougail.general.mode_conteneur_actif": "non"
+}
diff --git a/tests/dictionaries_old/01test_multi/makedict/before.json b/tests/dictionaries_old/01test_multi/makedict/before.json
new file mode 100644
index 00000000..2e6c541d
--- /dev/null
+++ b/tests/dictionaries_old/01test_multi/makedict/before.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/01test_multi/tiramisu/base.py b/tests/dictionaries_old/01test_multi/tiramisu/base.py
new file mode 100644
index 00000000..6df6797c
--- /dev/null
+++ b/tests/dictionaries_old/01test_multi/tiramisu/base.py
@@ -0,0 +1,18 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="mode_conteneur_actif", default="non", properties=frozenset({"mandatory", "normal"}))
+option_3.impl_set_information('test', ('test1', 'test2'))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/01test_multi_none/00-base.xml b/tests/dictionaries_old/01test_multi_none/00-base.xml
new file mode 100644
index 00000000..eef0cf6e
--- /dev/null
+++ b/tests/dictionaries_old/01test_multi_none/00-base.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" test="|test1|test2">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/01test_multi_none/__init__.py b/tests/dictionaries_old/01test_multi_none/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/01test_multi_none/makedict/after.json b/tests/dictionaries_old/01test_multi_none/makedict/after.json
new file mode 100644
index 00000000..2e6c541d
--- /dev/null
+++ b/tests/dictionaries_old/01test_multi_none/makedict/after.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/01test_multi_none/makedict/base.json b/tests/dictionaries_old/01test_multi_none/makedict/base.json
new file mode 100644
index 00000000..25056378
--- /dev/null
+++ b/tests/dictionaries_old/01test_multi_none/makedict/base.json
@@ -0,0 +1,3 @@
+{
+    "rougail.general.mode_conteneur_actif": "non"
+}
diff --git a/tests/dictionaries_old/01test_multi_none/makedict/before.json b/tests/dictionaries_old/01test_multi_none/makedict/before.json
new file mode 100644
index 00000000..2e6c541d
--- /dev/null
+++ b/tests/dictionaries_old/01test_multi_none/makedict/before.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/01test_multi_none/tiramisu/base.py b/tests/dictionaries_old/01test_multi_none/tiramisu/base.py
new file mode 100644
index 00000000..2e260b40
--- /dev/null
+++ b/tests/dictionaries_old/01test_multi_none/tiramisu/base.py
@@ -0,0 +1,18 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="mode_conteneur_actif", default="non", properties=frozenset({"mandatory", "normal"}))
+option_3.impl_set_information('test', (None, 'test1', 'test2'))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/01test_redefine/00-base.xml b/tests/dictionaries_old/01test_redefine/00-base.xml
new file mode 100644
index 00000000..a3d9a16c
--- /dev/null
+++ b/tests/dictionaries_old/01test_redefine/00-base.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" test="test">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/01test_redefine/10-base.xml b/tests/dictionaries_old/01test_redefine/10-base.xml
new file mode 100644
index 00000000..131db74e
--- /dev/null
+++ b/tests/dictionaries_old/01test_redefine/10-base.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" redefine="True" test="test1"/>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/01test_redefine/__init__.py b/tests/dictionaries_old/01test_redefine/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/01test_redefine/makedict/after.json b/tests/dictionaries_old/01test_redefine/makedict/after.json
new file mode 100644
index 00000000..2e6c541d
--- /dev/null
+++ b/tests/dictionaries_old/01test_redefine/makedict/after.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/01test_redefine/makedict/base.json b/tests/dictionaries_old/01test_redefine/makedict/base.json
new file mode 100644
index 00000000..25056378
--- /dev/null
+++ b/tests/dictionaries_old/01test_redefine/makedict/base.json
@@ -0,0 +1,3 @@
+{
+    "rougail.general.mode_conteneur_actif": "non"
+}
diff --git a/tests/dictionaries_old/01test_redefine/makedict/before.json b/tests/dictionaries_old/01test_redefine/makedict/before.json
new file mode 100644
index 00000000..2e6c541d
--- /dev/null
+++ b/tests/dictionaries_old/01test_redefine/makedict/before.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/01test_redefine/tiramisu/base.py b/tests/dictionaries_old/01test_redefine/tiramisu/base.py
new file mode 100644
index 00000000..62b88448
--- /dev/null
+++ b/tests/dictionaries_old/01test_redefine/tiramisu/base.py
@@ -0,0 +1,18 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="mode_conteneur_actif", default="non", properties=frozenset({"mandatory", "normal"}))
+option_3.impl_set_information('test', ('test1',))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/01test_redefine_base/00-base.xml b/tests/dictionaries_old/01test_redefine_base/00-base.xml
new file mode 100644
index 00000000..51e932bf
--- /dev/null
+++ b/tests/dictionaries_old/01test_redefine_base/00-base.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <variable name="my_variable"/>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/01test_redefine_base/10-base.xml b/tests/dictionaries_old/01test_redefine_base/10-base.xml
new file mode 100644
index 00000000..ca929f57
--- /dev/null
+++ b/tests/dictionaries_old/01test_redefine_base/10-base.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <variable name="my_variable" redefine="True" test="test1"/>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/01test_redefine_base/__init__.py b/tests/dictionaries_old/01test_redefine_base/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/01test_redefine_base/makedict/after.json b/tests/dictionaries_old/01test_redefine_base/makedict/after.json
new file mode 100644
index 00000000..bd891042
--- /dev/null
+++ b/tests/dictionaries_old/01test_redefine_base/makedict/after.json
@@ -0,0 +1,6 @@
+{
+    "rougail.my_variable": {
+        "owner": "default",
+        "value": null
+    }
+}
diff --git a/tests/dictionaries_old/01test_redefine_base/makedict/base.json b/tests/dictionaries_old/01test_redefine_base/makedict/base.json
new file mode 100644
index 00000000..9b3f9ac4
--- /dev/null
+++ b/tests/dictionaries_old/01test_redefine_base/makedict/base.json
@@ -0,0 +1,3 @@
+{
+    "rougail.my_variable": null
+}
diff --git a/tests/dictionaries_old/01test_redefine_base/makedict/before.json b/tests/dictionaries_old/01test_redefine_base/makedict/before.json
new file mode 100644
index 00000000..bd891042
--- /dev/null
+++ b/tests/dictionaries_old/01test_redefine_base/makedict/before.json
@@ -0,0 +1,6 @@
+{
+    "rougail.my_variable": {
+        "owner": "default",
+        "value": null
+    }
+}
diff --git a/tests/dictionaries_old/01test_redefine_base/tiramisu/base.py b/tests/dictionaries_old/01test_redefine_base/tiramisu/base.py
new file mode 100644
index 00000000..3240ec23
--- /dev/null
+++ b/tests/dictionaries_old/01test_redefine_base/tiramisu/base.py
@@ -0,0 +1,17 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_2 = StrOption(name="my_variable", doc="my_variable", properties=frozenset({"normal"}))
+option_2.impl_set_information('test', ('test1',))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/01test_redefine_remove/00-base.xml b/tests/dictionaries_old/01test_redefine_remove/00-base.xml
new file mode 100644
index 00000000..a3d9a16c
--- /dev/null
+++ b/tests/dictionaries_old/01test_redefine_remove/00-base.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" test="test">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/01test_redefine_remove/10-base.xml b/tests/dictionaries_old/01test_redefine_remove/10-base.xml
new file mode 100644
index 00000000..b1c12995
--- /dev/null
+++ b/tests/dictionaries_old/01test_redefine_remove/10-base.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" redefine="True" test=""/>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/01test_redefine_remove/__init__.py b/tests/dictionaries_old/01test_redefine_remove/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/01test_redefine_remove/makedict/after.json b/tests/dictionaries_old/01test_redefine_remove/makedict/after.json
new file mode 100644
index 00000000..2e6c541d
--- /dev/null
+++ b/tests/dictionaries_old/01test_redefine_remove/makedict/after.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/01test_redefine_remove/makedict/base.json b/tests/dictionaries_old/01test_redefine_remove/makedict/base.json
new file mode 100644
index 00000000..25056378
--- /dev/null
+++ b/tests/dictionaries_old/01test_redefine_remove/makedict/base.json
@@ -0,0 +1,3 @@
+{
+    "rougail.general.mode_conteneur_actif": "non"
+}
diff --git a/tests/dictionaries_old/01test_redefine_remove/makedict/before.json b/tests/dictionaries_old/01test_redefine_remove/makedict/before.json
new file mode 100644
index 00000000..2e6c541d
--- /dev/null
+++ b/tests/dictionaries_old/01test_redefine_remove/makedict/before.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/01test_redefine_remove/tiramisu/base.py b/tests/dictionaries_old/01test_redefine_remove/tiramisu/base.py
new file mode 100644
index 00000000..e5d6f0c2
--- /dev/null
+++ b/tests/dictionaries_old/01test_redefine_remove/tiramisu/base.py
@@ -0,0 +1,17 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="mode_conteneur_actif", default="non", properties=frozenset({"mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/02autosave_hidden_frozenifin/00-base.xml b/tests/dictionaries_old/02autosave_hidden_frozenifin/00-base.xml
new file mode 100644
index 00000000..6f811c34
--- /dev/null
+++ b/tests/dictionaries_old/02autosave_hidden_frozenifin/00-base.xml
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <variable name="server_deployed" type="boolean"/>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="autosavevar" type="string" description="autosave variable" auto_save="True"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param>oui</param>
+      <target>autosavevar</target>
+    </fill>
+    <condition name="hidden_if_in" source="mode_conteneur_actif">
+      <param>oui</param>
+      <target type="variable">autosavevar</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/02autosave_hidden_frozenifin/__init__.py b/tests/dictionaries_old/02autosave_hidden_frozenifin/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/02autosave_hidden_frozenifin/makedict/after.json b/tests/dictionaries_old/02autosave_hidden_frozenifin/makedict/after.json
new file mode 100644
index 00000000..8319f7ad
--- /dev/null
+++ b/tests/dictionaries_old/02autosave_hidden_frozenifin/makedict/after.json
@@ -0,0 +1,14 @@
+{
+    "rougail.server_deployed": {
+        "owner": "default",
+        "value": true
+    },
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.autosavevar": {
+        "owner": "forced",
+        "value": "oui"
+    }
+}
diff --git a/tests/dictionaries_old/02autosave_hidden_frozenifin/makedict/base.json b/tests/dictionaries_old/02autosave_hidden_frozenifin/makedict/base.json
new file mode 100644
index 00000000..7e87c083
--- /dev/null
+++ b/tests/dictionaries_old/02autosave_hidden_frozenifin/makedict/base.json
@@ -0,0 +1,5 @@
+{
+    "rougail.server_deployed": true,
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general.autosavevar": "oui"
+}
diff --git a/tests/dictionaries_old/02autosave_hidden_frozenifin/makedict/before.json b/tests/dictionaries_old/02autosave_hidden_frozenifin/makedict/before.json
new file mode 100644
index 00000000..8f22388a
--- /dev/null
+++ b/tests/dictionaries_old/02autosave_hidden_frozenifin/makedict/before.json
@@ -0,0 +1,14 @@
+{
+    "rougail.server_deployed": {
+        "owner": "default",
+        "value": true
+    },
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.autosavevar": {
+        "owner": "default",
+        "value": "oui"
+    }
+}
diff --git a/tests/dictionaries_old/02autosave_hidden_frozenifin/tiramisu/base.py b/tests/dictionaries_old/02autosave_hidden_frozenifin/tiramisu/base.py
new file mode 100644
index 00000000..42347403
--- /dev/null
+++ b/tests/dictionaries_old/02autosave_hidden_frozenifin/tiramisu/base.py
@@ -0,0 +1,19 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_2 = BoolOption(name="server_deployed", doc="server_deployed", default=True, properties=frozenset({"mandatory", "normal"}))
+option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_5 = StrOption(name="autosavevar", doc="autosave variable", default=Calculation(func.calc_val, Params((ParamValue("oui")))), properties=frozenset({"basic", "force_store_value", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_4, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))}))
+option_3 = OptionDescription(name="general", doc="général", children=[option_4, option_5], properties=frozenset({"basic"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_3])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/02fill_multi_calc_val/00-base.xml b/tests/dictionaries_old/02fill_multi_calc_val/00-base.xml
new file mode 100644
index 00000000..66876828
--- /dev/null
+++ b/tests/dictionaries_old/02fill_multi_calc_val/00-base.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <variable name="var1">
+      <value>no</value>
+    </variable>
+    <variable name="var2" multi="True"/>
+  </variables>
+  <constraints>
+    <fill name="calc_value">
+      <param type="variable">var1</param>
+      <param type="boolean" name="multi">True</param>
+      <target>var2</target>
+    </fill>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/02fill_multi_calc_val/__init__.py b/tests/dictionaries_old/02fill_multi_calc_val/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/02fill_multi_calc_val/makedict/after.json b/tests/dictionaries_old/02fill_multi_calc_val/makedict/after.json
new file mode 100644
index 00000000..2b3a9e6f
--- /dev/null
+++ b/tests/dictionaries_old/02fill_multi_calc_val/makedict/after.json
@@ -0,0 +1,12 @@
+{
+    "rougail.var1": {
+        "owner": "default",
+        "value": "no"
+    },
+    "rougail.var2": {
+        "owner": "default",
+        "value": [
+            "no"
+        ]
+    }
+}
diff --git a/tests/dictionaries_old/02fill_multi_calc_val/makedict/base.json b/tests/dictionaries_old/02fill_multi_calc_val/makedict/base.json
new file mode 100644
index 00000000..7bf9abe0
--- /dev/null
+++ b/tests/dictionaries_old/02fill_multi_calc_val/makedict/base.json
@@ -0,0 +1,6 @@
+{
+    "rougail.var1": "no",
+    "rougail.var2": [
+        "no"
+    ]
+}
diff --git a/tests/dictionaries_old/02fill_multi_calc_val/makedict/before.json b/tests/dictionaries_old/02fill_multi_calc_val/makedict/before.json
new file mode 100644
index 00000000..2b3a9e6f
--- /dev/null
+++ b/tests/dictionaries_old/02fill_multi_calc_val/makedict/before.json
@@ -0,0 +1,12 @@
+{
+    "rougail.var1": {
+        "owner": "default",
+        "value": "no"
+    },
+    "rougail.var2": {
+        "owner": "default",
+        "value": [
+            "no"
+        ]
+    }
+}
diff --git a/tests/dictionaries_old/02fill_multi_calc_val/tiramisu/base.py b/tests/dictionaries_old/02fill_multi_calc_val/tiramisu/base.py
new file mode 100644
index 00000000..db712d76
--- /dev/null
+++ b/tests/dictionaries_old/02fill_multi_calc_val/tiramisu/base.py
@@ -0,0 +1,17 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_2 = StrOption(name="var1", doc="var1", default="no", properties=frozenset({"mandatory", "normal"}))
+option_3 = StrOption(name="var2", doc="var2", multi=True, default=Calculation(func.calc_value, Params((ParamOption(option_2)), kwargs={'multi': ParamValue(True)})), properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_3])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/02fill_multi_calc_val_multi/00-base.xml b/tests/dictionaries_old/02fill_multi_calc_val_multi/00-base.xml
new file mode 100644
index 00000000..f260758a
--- /dev/null
+++ b/tests/dictionaries_old/02fill_multi_calc_val_multi/00-base.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <variable name="var1" multi="True">
+      <value>no</value>
+      <value>yes</value>
+      <value>maybe</value>
+    </variable>
+    <variable name="var2" multi="True"/>
+  </variables>
+  <constraints>
+    <fill name="calc_value">
+      <param type="variable">var1</param>
+      <target>var2</target>
+    </fill>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/02fill_multi_calc_val_multi/__init__.py b/tests/dictionaries_old/02fill_multi_calc_val_multi/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/02fill_multi_calc_val_multi/makedict/after.json b/tests/dictionaries_old/02fill_multi_calc_val_multi/makedict/after.json
new file mode 100644
index 00000000..e0b9759c
--- /dev/null
+++ b/tests/dictionaries_old/02fill_multi_calc_val_multi/makedict/after.json
@@ -0,0 +1,18 @@
+{
+    "rougail.var1": {
+        "owner": "default",
+        "value": [
+            "no",
+            "yes",
+            "maybe"
+        ]
+    },
+    "rougail.var2": {
+        "owner": "default",
+        "value": [
+            "no",
+            "yes",
+            "maybe"
+        ]
+    }
+}
diff --git a/tests/dictionaries_old/02fill_multi_calc_val_multi/makedict/base.json b/tests/dictionaries_old/02fill_multi_calc_val_multi/makedict/base.json
new file mode 100644
index 00000000..6e46ffd3
--- /dev/null
+++ b/tests/dictionaries_old/02fill_multi_calc_val_multi/makedict/base.json
@@ -0,0 +1,12 @@
+{
+    "rougail.var1": [
+        "no",
+        "yes",
+        "maybe"
+    ],
+    "rougail.var2": [
+        "no",
+        "yes",
+        "maybe"
+    ]
+}
diff --git a/tests/dictionaries_old/02fill_multi_calc_val_multi/makedict/before.json b/tests/dictionaries_old/02fill_multi_calc_val_multi/makedict/before.json
new file mode 100644
index 00000000..e0b9759c
--- /dev/null
+++ b/tests/dictionaries_old/02fill_multi_calc_val_multi/makedict/before.json
@@ -0,0 +1,18 @@
+{
+    "rougail.var1": {
+        "owner": "default",
+        "value": [
+            "no",
+            "yes",
+            "maybe"
+        ]
+    },
+    "rougail.var2": {
+        "owner": "default",
+        "value": [
+            "no",
+            "yes",
+            "maybe"
+        ]
+    }
+}
diff --git a/tests/dictionaries_old/02fill_multi_calc_val_multi/tiramisu/base.py b/tests/dictionaries_old/02fill_multi_calc_val_multi/tiramisu/base.py
new file mode 100644
index 00000000..1f9559b1
--- /dev/null
+++ b/tests/dictionaries_old/02fill_multi_calc_val_multi/tiramisu/base.py
@@ -0,0 +1,17 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_2 = StrOption(name="var1", doc="var1", multi=True, default=['no', 'yes', 'maybe'], default_multi="no", properties=frozenset({"mandatory", "normal"}))
+option_3 = StrOption(name="var2", doc="var2", multi=True, default=Calculation(func.calc_value, Params((ParamOption(option_2)))), properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_3])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10autosave_hidden/00-base.xml b/tests/dictionaries_old/10autosave_hidden/00-base.xml
new file mode 100644
index 00000000..f3248ec3
--- /dev/null
+++ b/tests/dictionaries_old/10autosave_hidden/00-base.xml
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <variable name="server_deployed" type="boolean"/>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="autosavevar" type="string" description="autosave variable" hidden="True" auto_save="True"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param>oui</param>
+      <target>autosavevar</target>
+    </fill>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10autosave_hidden/__init__.py b/tests/dictionaries_old/10autosave_hidden/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10autosave_hidden/makedict/after.json b/tests/dictionaries_old/10autosave_hidden/makedict/after.json
new file mode 100644
index 00000000..8319f7ad
--- /dev/null
+++ b/tests/dictionaries_old/10autosave_hidden/makedict/after.json
@@ -0,0 +1,14 @@
+{
+    "rougail.server_deployed": {
+        "owner": "default",
+        "value": true
+    },
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.autosavevar": {
+        "owner": "forced",
+        "value": "oui"
+    }
+}
diff --git a/tests/dictionaries_old/10autosave_hidden/makedict/base.json b/tests/dictionaries_old/10autosave_hidden/makedict/base.json
new file mode 100644
index 00000000..7e87c083
--- /dev/null
+++ b/tests/dictionaries_old/10autosave_hidden/makedict/base.json
@@ -0,0 +1,5 @@
+{
+    "rougail.server_deployed": true,
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general.autosavevar": "oui"
+}
diff --git a/tests/dictionaries_old/10autosave_hidden/makedict/before.json b/tests/dictionaries_old/10autosave_hidden/makedict/before.json
new file mode 100644
index 00000000..8f22388a
--- /dev/null
+++ b/tests/dictionaries_old/10autosave_hidden/makedict/before.json
@@ -0,0 +1,14 @@
+{
+    "rougail.server_deployed": {
+        "owner": "default",
+        "value": true
+    },
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.autosavevar": {
+        "owner": "default",
+        "value": "oui"
+    }
+}
diff --git a/tests/dictionaries_old/10autosave_hidden/tiramisu/base.py b/tests/dictionaries_old/10autosave_hidden/tiramisu/base.py
new file mode 100644
index 00000000..cdc1d842
--- /dev/null
+++ b/tests/dictionaries_old/10autosave_hidden/tiramisu/base.py
@@ -0,0 +1,19 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_2 = BoolOption(name="server_deployed", doc="server_deployed", default=True, properties=frozenset({"mandatory", "normal"}))
+option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_5 = StrOption(name="autosavevar", doc="autosave variable", default=Calculation(func.calc_val, Params((ParamValue("oui")))), properties=frozenset({"basic", "force_store_value", "frozen", "hidden"}))
+option_3 = OptionDescription(name="general", doc="général", children=[option_4, option_5], properties=frozenset({"basic"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_3])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10check_base/00-base.xml b/tests/dictionaries_old/10check_base/00-base.xml
new file mode 100644
index 00000000..ca0c8803
--- /dev/null
+++ b/tests/dictionaries_old/10check_base/00-base.xml
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>b</value>
+      </variable>
+      <variable name="int" type="number" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_entier">
+      <param name="mini" type="number">0</param>
+      <param name="maxi" type="number">100</param>
+      <target>int</target>
+    </check>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10check_base/__init__.py b/tests/dictionaries_old/10check_base/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10check_base/makedict/after.json b/tests/dictionaries_old/10check_base/makedict/after.json
new file mode 100644
index 00000000..8f6bb3c1
--- /dev/null
+++ b/tests/dictionaries_old/10check_base/makedict/after.json
@@ -0,0 +1,10 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "b"
+    },
+    "rougail.general.int": {
+        "owner": "default",
+        "value": null
+    }
+}
diff --git a/tests/dictionaries_old/10check_base/makedict/base.json b/tests/dictionaries_old/10check_base/makedict/base.json
new file mode 100644
index 00000000..46bb5ef4
--- /dev/null
+++ b/tests/dictionaries_old/10check_base/makedict/base.json
@@ -0,0 +1,4 @@
+{
+    "rougail.general.mode_conteneur_actif": "b",
+    "rougail.general.int": null
+}
diff --git a/tests/dictionaries_old/10check_base/makedict/before.json b/tests/dictionaries_old/10check_base/makedict/before.json
new file mode 100644
index 00000000..8f6bb3c1
--- /dev/null
+++ b/tests/dictionaries_old/10check_base/makedict/before.json
@@ -0,0 +1,10 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "b"
+    },
+    "rougail.general.int": {
+        "owner": "default",
+        "value": null
+    }
+}
diff --git a/tests/dictionaries_old/10check_base/tiramisu/base.py b/tests/dictionaries_old/10check_base/tiramisu/base.py
new file mode 100644
index 00000000..6b96bfc4
--- /dev/null
+++ b/tests/dictionaries_old/10check_base/tiramisu/base.py
@@ -0,0 +1,18 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="b", properties=frozenset({"mandatory", "normal"}))
+option_4 = IntOption(name="int", doc="No change", min_number=0, max_number=100, properties=frozenset({"normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10check_base_target_optional/00-base.xml b/tests/dictionaries_old/10check_base_target_optional/00-base.xml
new file mode 100644
index 00000000..ff050721
--- /dev/null
+++ b/tests/dictionaries_old/10check_base_target_optional/00-base.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <variable name="my_variable"/>
+  </variables>
+  <constraints>
+    <check name="valid_entier">
+      <param name="mini" type="number">0</param>
+      <param name="maxi" type="number">100</param>
+      <target optional="True">int</target>
+    </check>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10check_base_target_optional/__init__.py b/tests/dictionaries_old/10check_base_target_optional/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10check_base_target_optional/makedict/after.json b/tests/dictionaries_old/10check_base_target_optional/makedict/after.json
new file mode 100644
index 00000000..bd891042
--- /dev/null
+++ b/tests/dictionaries_old/10check_base_target_optional/makedict/after.json
@@ -0,0 +1,6 @@
+{
+    "rougail.my_variable": {
+        "owner": "default",
+        "value": null
+    }
+}
diff --git a/tests/dictionaries_old/10check_base_target_optional/makedict/base.json b/tests/dictionaries_old/10check_base_target_optional/makedict/base.json
new file mode 100644
index 00000000..9b3f9ac4
--- /dev/null
+++ b/tests/dictionaries_old/10check_base_target_optional/makedict/base.json
@@ -0,0 +1,3 @@
+{
+    "rougail.my_variable": null
+}
diff --git a/tests/dictionaries_old/10check_base_target_optional/makedict/before.json b/tests/dictionaries_old/10check_base_target_optional/makedict/before.json
new file mode 100644
index 00000000..bd891042
--- /dev/null
+++ b/tests/dictionaries_old/10check_base_target_optional/makedict/before.json
@@ -0,0 +1,6 @@
+{
+    "rougail.my_variable": {
+        "owner": "default",
+        "value": null
+    }
+}
diff --git a/tests/dictionaries_old/10check_base_target_optional/tiramisu/base.py b/tests/dictionaries_old/10check_base_target_optional/tiramisu/base.py
new file mode 100644
index 00000000..0da19d84
--- /dev/null
+++ b/tests/dictionaries_old/10check_base_target_optional/tiramisu/base.py
@@ -0,0 +1,16 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_2 = StrOption(name="my_variable", doc="my_variable", properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10check_no_param/00-base.xml b/tests/dictionaries_old/10check_no_param/00-base.xml
new file mode 100644
index 00000000..dbc7ff3d
--- /dev/null
+++ b/tests/dictionaries_old/10check_no_param/00-base.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>b</value>
+      </variable>
+      <variable name="int" type="number" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_lower">
+      <target>int</target>
+    </check>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10check_no_param/__init__.py b/tests/dictionaries_old/10check_no_param/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10check_no_param/makedict/after.json b/tests/dictionaries_old/10check_no_param/makedict/after.json
new file mode 100644
index 00000000..8f6bb3c1
--- /dev/null
+++ b/tests/dictionaries_old/10check_no_param/makedict/after.json
@@ -0,0 +1,10 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "b"
+    },
+    "rougail.general.int": {
+        "owner": "default",
+        "value": null
+    }
+}
diff --git a/tests/dictionaries_old/10check_no_param/makedict/base.json b/tests/dictionaries_old/10check_no_param/makedict/base.json
new file mode 100644
index 00000000..46bb5ef4
--- /dev/null
+++ b/tests/dictionaries_old/10check_no_param/makedict/base.json
@@ -0,0 +1,4 @@
+{
+    "rougail.general.mode_conteneur_actif": "b",
+    "rougail.general.int": null
+}
diff --git a/tests/dictionaries_old/10check_no_param/makedict/before.json b/tests/dictionaries_old/10check_no_param/makedict/before.json
new file mode 100644
index 00000000..8f6bb3c1
--- /dev/null
+++ b/tests/dictionaries_old/10check_no_param/makedict/before.json
@@ -0,0 +1,10 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "b"
+    },
+    "rougail.general.int": {
+        "owner": "default",
+        "value": null
+    }
+}
diff --git a/tests/dictionaries_old/10check_no_param/tiramisu/base.py b/tests/dictionaries_old/10check_no_param/tiramisu/base.py
new file mode 100644
index 00000000..f4d2cc56
--- /dev/null
+++ b/tests/dictionaries_old/10check_no_param/tiramisu/base.py
@@ -0,0 +1,18 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="b", properties=frozenset({"mandatory", "normal"}))
+option_4 = IntOption(name="int", doc="No change", validators=[Calculation(func.valid_lower, Params((ParamSelfOption(whole=False))), warnings_only=False)], properties=frozenset({"normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10check_option/00-base.xml b/tests/dictionaries_old/10check_option/00-base.xml
new file mode 100644
index 00000000..90decd5f
--- /dev/null
+++ b/tests/dictionaries_old/10check_option/00-base.xml
@@ -0,0 +1,21 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>b</value>
+      </variable>
+      <variable name="int2" type="number" description="No change">
+        <value>100</value>
+      </variable>
+      <variable name="int" type="number" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_lower">
+      <param name="mini" type="number">0</param>
+      <param name="maxi" type="variable">int2</param>
+      <target>int</target>
+    </check>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10check_option/__init__.py b/tests/dictionaries_old/10check_option/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10check_option/makedict/after.json b/tests/dictionaries_old/10check_option/makedict/after.json
new file mode 100644
index 00000000..44ed70b4
--- /dev/null
+++ b/tests/dictionaries_old/10check_option/makedict/after.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "b"
+    },
+    "rougail.general.int2": {
+        "owner": "default",
+        "value": 100
+    },
+    "rougail.general.int": {
+        "owner": "default",
+        "value": null
+    }
+}
diff --git a/tests/dictionaries_old/10check_option/makedict/base.json b/tests/dictionaries_old/10check_option/makedict/base.json
new file mode 100644
index 00000000..df55d4f3
--- /dev/null
+++ b/tests/dictionaries_old/10check_option/makedict/base.json
@@ -0,0 +1,5 @@
+{
+    "rougail.general.mode_conteneur_actif": "b",
+    "rougail.general.int2": 100,
+    "rougail.general.int": null
+}
diff --git a/tests/dictionaries_old/10check_option/makedict/before.json b/tests/dictionaries_old/10check_option/makedict/before.json
new file mode 100644
index 00000000..44ed70b4
--- /dev/null
+++ b/tests/dictionaries_old/10check_option/makedict/before.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "b"
+    },
+    "rougail.general.int2": {
+        "owner": "default",
+        "value": 100
+    },
+    "rougail.general.int": {
+        "owner": "default",
+        "value": null
+    }
+}
diff --git a/tests/dictionaries_old/10check_option/tiramisu/base.py b/tests/dictionaries_old/10check_option/tiramisu/base.py
new file mode 100644
index 00000000..d84c7409
--- /dev/null
+++ b/tests/dictionaries_old/10check_option/tiramisu/base.py
@@ -0,0 +1,19 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="b", properties=frozenset({"mandatory", "normal"}))
+option_4 = IntOption(name="int2", doc="No change", default=100, properties=frozenset({"mandatory", "normal"}))
+option_5 = IntOption(name="int", doc="No change", validators=[Calculation(func.valid_lower, Params((ParamSelfOption(whole=False)), kwargs={'mini': ParamValue(0), 'maxi': ParamOption(option_4)}), warnings_only=False)], properties=frozenset({"normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10check_optional/00-base.xml b/tests/dictionaries_old/10check_optional/00-base.xml
new file mode 100644
index 00000000..2492a5b8
--- /dev/null
+++ b/tests/dictionaries_old/10check_optional/00-base.xml
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>b</value>
+      </variable>
+      <variable name="int" type="number" description="No change"/>
+      <variable name="int2" type="number" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_differ">
+      <param type="variable" optional="True">int2</param>
+      <target>int</target>
+    </check>
+    <check name="valid_differ">
+      <param type="variable" optional="True">int3</param>
+      <target>int</target>
+    </check>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10check_optional/__init__.py b/tests/dictionaries_old/10check_optional/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10check_optional/makedict/after.json b/tests/dictionaries_old/10check_optional/makedict/after.json
new file mode 100644
index 00000000..2645e635
--- /dev/null
+++ b/tests/dictionaries_old/10check_optional/makedict/after.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "b"
+    },
+    "rougail.general.int": {
+        "owner": "default",
+        "value": null
+    },
+    "rougail.general.int2": {
+        "owner": "default",
+        "value": null
+    }
+}
diff --git a/tests/dictionaries_old/10check_optional/makedict/base.json b/tests/dictionaries_old/10check_optional/makedict/base.json
new file mode 100644
index 00000000..20ba7242
--- /dev/null
+++ b/tests/dictionaries_old/10check_optional/makedict/base.json
@@ -0,0 +1,5 @@
+{
+    "rougail.general.mode_conteneur_actif": "b",
+    "rougail.general.int": null,
+    "rougail.general.int2": null
+}
diff --git a/tests/dictionaries_old/10check_optional/makedict/before.json b/tests/dictionaries_old/10check_optional/makedict/before.json
new file mode 100644
index 00000000..2645e635
--- /dev/null
+++ b/tests/dictionaries_old/10check_optional/makedict/before.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "b"
+    },
+    "rougail.general.int": {
+        "owner": "default",
+        "value": null
+    },
+    "rougail.general.int2": {
+        "owner": "default",
+        "value": null
+    }
+}
diff --git a/tests/dictionaries_old/10check_optional/tiramisu/base.py b/tests/dictionaries_old/10check_optional/tiramisu/base.py
new file mode 100644
index 00000000..473dfcd5
--- /dev/null
+++ b/tests/dictionaries_old/10check_optional/tiramisu/base.py
@@ -0,0 +1,19 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="b", properties=frozenset({"mandatory", "normal"}))
+option_5 = IntOption(name="int2", doc="No change", properties=frozenset({"normal"}))
+option_4 = IntOption(name="int", doc="No change", validators=[Calculation(func.valid_differ, Params((ParamSelfOption(whole=False), ParamOption(option_5))), warnings_only=False)], properties=frozenset({"normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10check_valid_differ/00-base.xml b/tests/dictionaries_old/10check_valid_differ/00-base.xml
new file mode 100644
index 00000000..66c5cdb2
--- /dev/null
+++ b/tests/dictionaries_old/10check_valid_differ/00-base.xml
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>oui</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_differ">
+      <param type="variable">mode_conteneur_actif1</param>
+      <target>mode_conteneur_actif</target>
+    </check>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10check_valid_differ/__init__.py b/tests/dictionaries_old/10check_valid_differ/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10check_valid_differ/makedict/after.json b/tests/dictionaries_old/10check_valid_differ/makedict/after.json
new file mode 100644
index 00000000..f0a909af
--- /dev/null
+++ b/tests/dictionaries_old/10check_valid_differ/makedict/after.json
@@ -0,0 +1,10 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "oui"
+    },
+    "rougail.general.mode_conteneur_actif1": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/10check_valid_differ/makedict/base.json b/tests/dictionaries_old/10check_valid_differ/makedict/base.json
new file mode 100644
index 00000000..a13f65aa
--- /dev/null
+++ b/tests/dictionaries_old/10check_valid_differ/makedict/base.json
@@ -0,0 +1,4 @@
+{
+    "rougail.general.mode_conteneur_actif": "oui",
+    "rougail.general.mode_conteneur_actif1": "non"
+}
diff --git a/tests/dictionaries_old/10check_valid_differ/makedict/before.json b/tests/dictionaries_old/10check_valid_differ/makedict/before.json
new file mode 100644
index 00000000..f0a909af
--- /dev/null
+++ b/tests/dictionaries_old/10check_valid_differ/makedict/before.json
@@ -0,0 +1,10 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "oui"
+    },
+    "rougail.general.mode_conteneur_actif1": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/10check_valid_differ/tiramisu/base.py b/tests/dictionaries_old/10check_valid_differ/tiramisu/base.py
new file mode 100644
index 00000000..4d5cb900
--- /dev/null
+++ b/tests/dictionaries_old/10check_valid_differ/tiramisu/base.py
@@ -0,0 +1,18 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_4 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", validators=[Calculation(func.valid_differ, Params((ParamSelfOption(whole=False), ParamOption(option_4))), warnings_only=False)], properties=frozenset({"mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10check_valid_differ_add/00-base.xml b/tests/dictionaries_old/10check_valid_differ_add/00-base.xml
new file mode 100644
index 00000000..8f7d0d62
--- /dev/null
+++ b/tests/dictionaries_old/10check_valid_differ_add/00-base.xml
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>oui</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif3" type="string" description="No change">
+        <value>oui</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_differ">
+      <param type="variable">mode_conteneur_actif1</param>
+      <target>mode_conteneur_actif3</target>
+    </check>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10check_valid_differ_add/01-base.xml b/tests/dictionaries_old/10check_valid_differ_add/01-base.xml
new file mode 100644
index 00000000..cb008e7c
--- /dev/null
+++ b/tests/dictionaries_old/10check_valid_differ_add/01-base.xml
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif3" redefine="True"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_differ">
+      <param type="variable">mode_conteneur_actif1</param>
+      <target>mode_conteneur_actif3</target>
+    </check>
+    <check name="valid_differ">
+      <param type="variable">mode_conteneur_actif2</param>
+      <target>mode_conteneur_actif3</target>
+    </check>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10check_valid_differ_add/__init__.py b/tests/dictionaries_old/10check_valid_differ_add/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10check_valid_differ_add/makedict/after.json b/tests/dictionaries_old/10check_valid_differ_add/makedict/after.json
new file mode 100644
index 00000000..fa95be87
--- /dev/null
+++ b/tests/dictionaries_old/10check_valid_differ_add/makedict/after.json
@@ -0,0 +1,18 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "oui"
+    },
+    "rougail.general.mode_conteneur_actif1": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif3": {
+        "owner": "default",
+        "value": "oui"
+    }
+}
diff --git a/tests/dictionaries_old/10check_valid_differ_add/makedict/base.json b/tests/dictionaries_old/10check_valid_differ_add/makedict/base.json
new file mode 100644
index 00000000..69769780
--- /dev/null
+++ b/tests/dictionaries_old/10check_valid_differ_add/makedict/base.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": "oui",
+    "rougail.general.mode_conteneur_actif1": "non",
+    "rougail.general.mode_conteneur_actif2": "non",
+    "rougail.general.mode_conteneur_actif3": "oui"
+}
diff --git a/tests/dictionaries_old/10check_valid_differ_add/makedict/before.json b/tests/dictionaries_old/10check_valid_differ_add/makedict/before.json
new file mode 100644
index 00000000..fa95be87
--- /dev/null
+++ b/tests/dictionaries_old/10check_valid_differ_add/makedict/before.json
@@ -0,0 +1,18 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "oui"
+    },
+    "rougail.general.mode_conteneur_actif1": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif3": {
+        "owner": "default",
+        "value": "oui"
+    }
+}
diff --git a/tests/dictionaries_old/10check_valid_differ_add/tiramisu/base.py b/tests/dictionaries_old/10check_valid_differ_add/tiramisu/base.py
new file mode 100644
index 00000000..990e977f
--- /dev/null
+++ b/tests/dictionaries_old/10check_valid_differ_add/tiramisu/base.py
@@ -0,0 +1,20 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"mandatory", "normal"}))
+option_4 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_6 = StrOption(name="mode_conteneur_actif3", doc="No change", default="oui", validators=[Calculation(func.valid_differ, Params((ParamSelfOption(whole=False), ParamOption(option_4))), warnings_only=False), Calculation(func.valid_differ, Params((ParamSelfOption(whole=False), ParamOption(option_4))), warnings_only=False), Calculation(func.valid_differ, Params((ParamSelfOption(whole=False), ParamOption(option_5))), warnings_only=False)], properties=frozenset({"mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5, option_6], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10check_valid_differ_removecheck/00-base.xml b/tests/dictionaries_old/10check_valid_differ_removecheck/00-base.xml
new file mode 100644
index 00000000..8f7d0d62
--- /dev/null
+++ b/tests/dictionaries_old/10check_valid_differ_removecheck/00-base.xml
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>oui</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif3" type="string" description="No change">
+        <value>oui</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_differ">
+      <param type="variable">mode_conteneur_actif1</param>
+      <target>mode_conteneur_actif3</target>
+    </check>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10check_valid_differ_removecheck/01-base.xml b/tests/dictionaries_old/10check_valid_differ_removecheck/01-base.xml
new file mode 100644
index 00000000..f60d9d42
--- /dev/null
+++ b/tests/dictionaries_old/10check_valid_differ_removecheck/01-base.xml
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif3" redefine="True" remove_check="True">
+        <value>oui</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_differ">
+      <param type="variable">mode_conteneur_actif1</param>
+      <target>mode_conteneur_actif3</target>
+    </check>
+    <check name="valid_differ">
+      <param type="variable">mode_conteneur_actif2</param>
+      <target>mode_conteneur_actif3</target>
+    </check>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10check_valid_differ_removecheck/__init__.py b/tests/dictionaries_old/10check_valid_differ_removecheck/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10check_valid_differ_removecheck/makedict/after.json b/tests/dictionaries_old/10check_valid_differ_removecheck/makedict/after.json
new file mode 100644
index 00000000..fa95be87
--- /dev/null
+++ b/tests/dictionaries_old/10check_valid_differ_removecheck/makedict/after.json
@@ -0,0 +1,18 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "oui"
+    },
+    "rougail.general.mode_conteneur_actif1": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif3": {
+        "owner": "default",
+        "value": "oui"
+    }
+}
diff --git a/tests/dictionaries_old/10check_valid_differ_removecheck/makedict/base.json b/tests/dictionaries_old/10check_valid_differ_removecheck/makedict/base.json
new file mode 100644
index 00000000..69769780
--- /dev/null
+++ b/tests/dictionaries_old/10check_valid_differ_removecheck/makedict/base.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": "oui",
+    "rougail.general.mode_conteneur_actif1": "non",
+    "rougail.general.mode_conteneur_actif2": "non",
+    "rougail.general.mode_conteneur_actif3": "oui"
+}
diff --git a/tests/dictionaries_old/10check_valid_differ_removecheck/makedict/before.json b/tests/dictionaries_old/10check_valid_differ_removecheck/makedict/before.json
new file mode 100644
index 00000000..fa95be87
--- /dev/null
+++ b/tests/dictionaries_old/10check_valid_differ_removecheck/makedict/before.json
@@ -0,0 +1,18 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "oui"
+    },
+    "rougail.general.mode_conteneur_actif1": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif3": {
+        "owner": "default",
+        "value": "oui"
+    }
+}
diff --git a/tests/dictionaries_old/10check_valid_differ_removecheck/tiramisu/base.py b/tests/dictionaries_old/10check_valid_differ_removecheck/tiramisu/base.py
new file mode 100644
index 00000000..07b78f1b
--- /dev/null
+++ b/tests/dictionaries_old/10check_valid_differ_removecheck/tiramisu/base.py
@@ -0,0 +1,20 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"mandatory", "normal"}))
+option_4 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_6 = StrOption(name="mode_conteneur_actif3", doc="No change", default="oui", validators=[Calculation(func.valid_differ, Params((ParamSelfOption(whole=False), ParamOption(option_4))), warnings_only=False), Calculation(func.valid_differ, Params((ParamSelfOption(whole=False), ParamOption(option_5))), warnings_only=False)], properties=frozenset({"mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5, option_6], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10check_valid_in_network/00-base.xml b/tests/dictionaries_old/10check_valid_in_network/00-base.xml
new file mode 100644
index 00000000..5b807fc8
--- /dev/null
+++ b/tests/dictionaries_old/10check_valid_in_network/00-base.xml
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>oui</value>
+      </variable>
+      <variable name="adresse_ip_eth0" type="local_ip" description="Adresse IP de la carte" mandatory="True" mode="basic"/>
+      <variable name="adresse_netmask_eth0" type="netmask" description="Masque de sous réseau de la carte" mandatory="True" mode="basic"/>
+      <variable name="adresse_ip" type="local_ip" description="IP" mandatory="True" mode="basic"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_in_network" level="warning">
+      <param type="variable">adresse_ip_eth0</param>
+      <param type="variable">adresse_netmask_eth0</param>
+      <target>adresse_ip</target>
+    </check>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10check_valid_in_network/__init__.py b/tests/dictionaries_old/10check_valid_in_network/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10check_valid_in_network/makedict/after.json b/tests/dictionaries_old/10check_valid_in_network/makedict/after.json
new file mode 100644
index 00000000..1852a520
--- /dev/null
+++ b/tests/dictionaries_old/10check_valid_in_network/makedict/after.json
@@ -0,0 +1,18 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "oui"
+    },
+    "rougail.general.adresse_ip_eth0": {
+        "owner": "default",
+        "value": null
+    },
+    "rougail.general.adresse_netmask_eth0": {
+        "owner": "default",
+        "value": null
+    },
+    "rougail.general.adresse_ip": {
+        "owner": "default",
+        "value": null
+    }
+}
diff --git a/tests/dictionaries_old/10check_valid_in_network/makedict/base.json b/tests/dictionaries_old/10check_valid_in_network/makedict/base.json
new file mode 100644
index 00000000..dca555a4
--- /dev/null
+++ b/tests/dictionaries_old/10check_valid_in_network/makedict/base.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": "oui",
+    "rougail.general.adresse_ip_eth0": null,
+    "rougail.general.adresse_netmask_eth0": null,
+    "rougail.general.adresse_ip": null
+}
diff --git a/tests/dictionaries_old/10check_valid_in_network/makedict/before.json b/tests/dictionaries_old/10check_valid_in_network/makedict/before.json
new file mode 100644
index 00000000..1852a520
--- /dev/null
+++ b/tests/dictionaries_old/10check_valid_in_network/makedict/before.json
@@ -0,0 +1,18 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "oui"
+    },
+    "rougail.general.adresse_ip_eth0": {
+        "owner": "default",
+        "value": null
+    },
+    "rougail.general.adresse_netmask_eth0": {
+        "owner": "default",
+        "value": null
+    },
+    "rougail.general.adresse_ip": {
+        "owner": "default",
+        "value": null
+    }
+}
diff --git a/tests/dictionaries_old/10check_valid_in_network/tiramisu/base.py b/tests/dictionaries_old/10check_valid_in_network/tiramisu/base.py
new file mode 100644
index 00000000..cdcd205c
--- /dev/null
+++ b/tests/dictionaries_old/10check_valid_in_network/tiramisu/base.py
@@ -0,0 +1,20 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"mandatory", "normal"}))
+option_4 = IPOption(name="adresse_ip_eth0", doc="Adresse IP de la carte", private_only=True, warnings_only=True, properties=frozenset({"basic", "mandatory"}))
+option_5 = NetmaskOption(name="adresse_netmask_eth0", doc="Masque de sous réseau de la carte", properties=frozenset({"basic", "mandatory"}))
+option_6 = IPOption(name="adresse_ip", doc="IP", validators=[Calculation(func.valid_in_network, Params((ParamSelfOption(whole=False), ParamOption(option_4), ParamOption(option_5))), warnings_only=True)], private_only=True, warnings_only=True, properties=frozenset({"basic", "mandatory"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5, option_6], properties=frozenset({"basic"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10check_valid_in_network_cidr/00-base.xml b/tests/dictionaries_old/10check_valid_in_network_cidr/00-base.xml
new file mode 100644
index 00000000..b46fc733
--- /dev/null
+++ b/tests/dictionaries_old/10check_valid_in_network_cidr/00-base.xml
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>oui</value>
+      </variable>
+      <variable name="adresse_ip_eth0" type="cidr" description="Adresse IP de la carte" mandatory="True" mode="basic"/>
+      <variable name="adresse_ip" type="local_ip" description="IP" mandatory="True" mode="basic"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_in_network" level="warning">
+      <param type="variable">adresse_ip_eth0</param>
+      <target>adresse_ip</target>
+    </check>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10check_valid_in_network_cidr/__init__.py b/tests/dictionaries_old/10check_valid_in_network_cidr/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10check_valid_in_network_cidr/makedict/after.json b/tests/dictionaries_old/10check_valid_in_network_cidr/makedict/after.json
new file mode 100644
index 00000000..46238ef1
--- /dev/null
+++ b/tests/dictionaries_old/10check_valid_in_network_cidr/makedict/after.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "oui"
+    },
+    "rougail.general.adresse_ip_eth0": {
+        "owner": "default",
+        "value": null
+    },
+    "rougail.general.adresse_ip": {
+        "owner": "default",
+        "value": null
+    }
+}
diff --git a/tests/dictionaries_old/10check_valid_in_network_cidr/makedict/base.json b/tests/dictionaries_old/10check_valid_in_network_cidr/makedict/base.json
new file mode 100644
index 00000000..814a2f1a
--- /dev/null
+++ b/tests/dictionaries_old/10check_valid_in_network_cidr/makedict/base.json
@@ -0,0 +1,5 @@
+{
+    "rougail.general.mode_conteneur_actif": "oui",
+    "rougail.general.adresse_ip_eth0": null,
+    "rougail.general.adresse_ip": null
+}
diff --git a/tests/dictionaries_old/10check_valid_in_network_cidr/makedict/before.json b/tests/dictionaries_old/10check_valid_in_network_cidr/makedict/before.json
new file mode 100644
index 00000000..46238ef1
--- /dev/null
+++ b/tests/dictionaries_old/10check_valid_in_network_cidr/makedict/before.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "oui"
+    },
+    "rougail.general.adresse_ip_eth0": {
+        "owner": "default",
+        "value": null
+    },
+    "rougail.general.adresse_ip": {
+        "owner": "default",
+        "value": null
+    }
+}
diff --git a/tests/dictionaries_old/10check_valid_in_network_cidr/tiramisu/base.py b/tests/dictionaries_old/10check_valid_in_network_cidr/tiramisu/base.py
new file mode 100644
index 00000000..7a9f5198
--- /dev/null
+++ b/tests/dictionaries_old/10check_valid_in_network_cidr/tiramisu/base.py
@@ -0,0 +1,19 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"mandatory", "normal"}))
+option_4 = IPOption(name="adresse_ip_eth0", doc="Adresse IP de la carte", cidr=True, properties=frozenset({"basic", "mandatory"}))
+option_5 = IPOption(name="adresse_ip", doc="IP", validators=[Calculation(func.valid_in_network, Params((ParamSelfOption(whole=False), ParamOption(option_4))), warnings_only=True)], private_only=True, warnings_only=True, properties=frozenset({"basic", "mandatory"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"basic"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10check_valid_ipnetmask/00-base.xml b/tests/dictionaries_old/10check_valid_ipnetmask/00-base.xml
new file mode 100644
index 00000000..62e76c06
--- /dev/null
+++ b/tests/dictionaries_old/10check_valid_ipnetmask/00-base.xml
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>oui</value>
+      </variable>
+      <variable name="adresse_ip_eth0" type="local_ip" description="Adresse IP de la carte" mandatory="True" mode="basic"/>
+      <variable name="adresse_netmask_eth0" type="netmask" description="Masque de sous réseau de la carte" mandatory="True" mode="basic"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_ipnetmask" level="warning">
+      <param type="variable">adresse_ip_eth0</param>
+      <target>adresse_netmask_eth0</target>
+    </check>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10check_valid_ipnetmask/__init__.py b/tests/dictionaries_old/10check_valid_ipnetmask/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10check_valid_ipnetmask/makedict/after.json b/tests/dictionaries_old/10check_valid_ipnetmask/makedict/after.json
new file mode 100644
index 00000000..7b297e37
--- /dev/null
+++ b/tests/dictionaries_old/10check_valid_ipnetmask/makedict/after.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "oui"
+    },
+    "rougail.general.adresse_ip_eth0": {
+        "owner": "default",
+        "value": null
+    },
+    "rougail.general.adresse_netmask_eth0": {
+        "owner": "default",
+        "value": null
+    }
+}
diff --git a/tests/dictionaries_old/10check_valid_ipnetmask/makedict/base.json b/tests/dictionaries_old/10check_valid_ipnetmask/makedict/base.json
new file mode 100644
index 00000000..145e7424
--- /dev/null
+++ b/tests/dictionaries_old/10check_valid_ipnetmask/makedict/base.json
@@ -0,0 +1,5 @@
+{
+    "rougail.general.mode_conteneur_actif": "oui",
+    "rougail.general.adresse_ip_eth0": null,
+    "rougail.general.adresse_netmask_eth0": null
+}
diff --git a/tests/dictionaries_old/10check_valid_ipnetmask/makedict/before.json b/tests/dictionaries_old/10check_valid_ipnetmask/makedict/before.json
new file mode 100644
index 00000000..7b297e37
--- /dev/null
+++ b/tests/dictionaries_old/10check_valid_ipnetmask/makedict/before.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "oui"
+    },
+    "rougail.general.adresse_ip_eth0": {
+        "owner": "default",
+        "value": null
+    },
+    "rougail.general.adresse_netmask_eth0": {
+        "owner": "default",
+        "value": null
+    }
+}
diff --git a/tests/dictionaries_old/10check_valid_ipnetmask/tiramisu/base.py b/tests/dictionaries_old/10check_valid_ipnetmask/tiramisu/base.py
new file mode 100644
index 00000000..51c47409
--- /dev/null
+++ b/tests/dictionaries_old/10check_valid_ipnetmask/tiramisu/base.py
@@ -0,0 +1,19 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"mandatory", "normal"}))
+option_4 = IPOption(name="adresse_ip_eth0", doc="Adresse IP de la carte", private_only=True, warnings_only=True, properties=frozenset({"basic", "mandatory"}))
+option_5 = NetmaskOption(name="adresse_netmask_eth0", doc="Masque de sous réseau de la carte", validators=[Calculation(func.valid_ipnetmask, Params((ParamSelfOption(whole=False), ParamOption(option_4))), warnings_only=True)], properties=frozenset({"basic", "mandatory"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"basic"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10fill_information/00-base.xml b/tests/dictionaries_old/10fill_information/00-base.xml
new file mode 100644
index 00000000..a8bdb066
--- /dev/null
+++ b/tests/dictionaries_old/10fill_information/00-base.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="information">test_information</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10fill_information/__init__.py b/tests/dictionaries_old/10fill_information/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10fill_information/makedict/after.json b/tests/dictionaries_old/10fill_information/makedict/after.json
new file mode 100644
index 00000000..6f4a21e7
--- /dev/null
+++ b/tests/dictionaries_old/10fill_information/makedict/after.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "value"
+    }
+}
diff --git a/tests/dictionaries_old/10fill_information/makedict/base.json b/tests/dictionaries_old/10fill_information/makedict/base.json
new file mode 100644
index 00000000..904ffb4e
--- /dev/null
+++ b/tests/dictionaries_old/10fill_information/makedict/base.json
@@ -0,0 +1,3 @@
+{
+    "rougail.general.mode_conteneur_actif": "value"
+}
diff --git a/tests/dictionaries_old/10fill_information/makedict/before.json b/tests/dictionaries_old/10fill_information/makedict/before.json
new file mode 100644
index 00000000..6f4a21e7
--- /dev/null
+++ b/tests/dictionaries_old/10fill_information/makedict/before.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "value"
+    }
+}
diff --git a/tests/dictionaries_old/10fill_information/tiramisu/base.py b/tests/dictionaries_old/10fill_information/tiramisu/base.py
new file mode 100644
index 00000000..1c0d2c51
--- /dev/null
+++ b/tests/dictionaries_old/10fill_information/tiramisu/base.py
@@ -0,0 +1,17 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params((ParamInformation("test_information", None)))), properties=frozenset({"normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10frozenifin_unknown_valid_enum_number/00-base.xml b/tests/dictionaries_old/10frozenifin_unknown_valid_enum_number/00-base.xml
new file mode 100644
index 00000000..96e87d8f
--- /dev/null
+++ b/tests/dictionaries_old/10frozenifin_unknown_valid_enum_number/00-base.xml
@@ -0,0 +1,26 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="enumfam" mode="expert">
+      <variable name="enumvar" type="number" description="enumvar" help="bla bla bla"/>
+      <variable name="test_variable" type="number" description="test variable"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>1</param>
+      <param>2</param>
+      <param>3</param>
+      <target>enumvar</target>
+    </check>
+    <condition name="hidden_if_in" source="enumvar">
+      <param>4</param>
+      <target type="variable">test_variable</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10frozenifin_unknown_valid_enum_number/__init__.py b/tests/dictionaries_old/10frozenifin_unknown_valid_enum_number/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10frozenifin_unknown_valid_enum_number/makedict/after.json b/tests/dictionaries_old/10frozenifin_unknown_valid_enum_number/makedict/after.json
new file mode 100644
index 00000000..5094f008
--- /dev/null
+++ b/tests/dictionaries_old/10frozenifin_unknown_valid_enum_number/makedict/after.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.enumfam.enumvar": {
+        "owner": "default",
+        "value": 1
+    },
+    "rougail.enumfam.test_variable": {
+        "owner": "default",
+        "value": null
+    }
+}
diff --git a/tests/dictionaries_old/10frozenifin_unknown_valid_enum_number/makedict/base.json b/tests/dictionaries_old/10frozenifin_unknown_valid_enum_number/makedict/base.json
new file mode 100644
index 00000000..7a9ad41b
--- /dev/null
+++ b/tests/dictionaries_old/10frozenifin_unknown_valid_enum_number/makedict/base.json
@@ -0,0 +1,5 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.enumfam.enumvar": 1,
+    "rougail.enumfam.test_variable": null
+}
diff --git a/tests/dictionaries_old/10frozenifin_unknown_valid_enum_number/makedict/before.json b/tests/dictionaries_old/10frozenifin_unknown_valid_enum_number/makedict/before.json
new file mode 100644
index 00000000..5094f008
--- /dev/null
+++ b/tests/dictionaries_old/10frozenifin_unknown_valid_enum_number/makedict/before.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.enumfam.enumvar": {
+        "owner": "default",
+        "value": 1
+    },
+    "rougail.enumfam.test_variable": {
+        "owner": "default",
+        "value": null
+    }
+}
diff --git a/tests/dictionaries_old/10frozenifin_unknown_valid_enum_number/tiramisu/base.py b/tests/dictionaries_old/10frozenifin_unknown_valid_enum_number/tiramisu/base.py
new file mode 100644
index 00000000..466244f9
--- /dev/null
+++ b/tests/dictionaries_old/10frozenifin_unknown_valid_enum_number/tiramisu/base.py
@@ -0,0 +1,21 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"expert", "mandatory"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"expert"}))
+option_5 = ChoiceOption(name="enumvar", doc="enumvar", values=(1, 2, 3), default=1, properties=frozenset({"expert", "mandatory"}))
+option_5.impl_set_information('help', "bla bla bla")
+option_6 = IntOption(name="test_variable", doc="test variable", properties=frozenset({"expert"}))
+option_4 = OptionDescription(name="enumfam", doc="enumfam", children=[option_5, option_6], properties=frozenset({"expert"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_4])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10leadership_append/00-base.xml b/tests/dictionaries_old/10leadership_append/00-base.xml
new file mode 100644
index 00000000..2b7726a5
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_append/00-base.xml
@@ -0,0 +1,29 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="general1">
+      <variable name="leader" type="string" description="leader" multi="True"/>
+      <variable name="follower1" type="string" description="follower1"/>
+      <variable name="follower2" type="string" description="follower2"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valfill</param>
+      <target>follower1</target>
+    </fill>
+    <fill name="calc_val">
+      <param type="variable">follower1</param>
+      <target>follower2</target>
+    </fill>
+    <group leader="leader">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+    </group>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10leadership_append/01-base.xml b/tests/dictionaries_old/10leadership_append/01-base.xml
new file mode 100644
index 00000000..b271772b
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_append/01-base.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general1">
+      <variable name="follower3" type="string" description="follower3"/>
+    </family>
+  </variables>
+  <constraints>
+    <group leader="leader">
+      <follower>follower3</follower>
+    </group>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10leadership_append/__init__.py b/tests/dictionaries_old/10leadership_append/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10leadership_append/makedict/after.json b/tests/dictionaries_old/10leadership_append/makedict/after.json
new file mode 100644
index 00000000..6dedaf65
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_append/makedict/after.json
@@ -0,0 +1,22 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general1.leader.leader": {
+        "owner": "default",
+        "value": []
+    },
+    "rougail.general1.leader.follower1": {
+        "owner": [],
+        "value": []
+    },
+    "rougail.general1.leader.follower2": {
+        "owner": [],
+        "value": []
+    },
+    "rougail.general1.leader.follower3": {
+        "owner": [],
+        "value": []
+    }
+}
diff --git a/tests/dictionaries_old/10leadership_append/makedict/base.json b/tests/dictionaries_old/10leadership_append/makedict/base.json
new file mode 100644
index 00000000..14aaf55f
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_append/makedict/base.json
@@ -0,0 +1,4 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general1.leader.leader": []
+}
diff --git a/tests/dictionaries_old/10leadership_append/makedict/before.json b/tests/dictionaries_old/10leadership_append/makedict/before.json
new file mode 100644
index 00000000..6dedaf65
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_append/makedict/before.json
@@ -0,0 +1,22 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general1.leader.leader": {
+        "owner": "default",
+        "value": []
+    },
+    "rougail.general1.leader.follower1": {
+        "owner": [],
+        "value": []
+    },
+    "rougail.general1.leader.follower2": {
+        "owner": [],
+        "value": []
+    },
+    "rougail.general1.leader.follower3": {
+        "owner": [],
+        "value": []
+    }
+}
diff --git a/tests/dictionaries_old/10leadership_append/tiramisu/base.py b/tests/dictionaries_old/10leadership_append/tiramisu/base.py
new file mode 100644
index 00000000..ca5b56b2
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_append/tiramisu/base.py
@@ -0,0 +1,23 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
+option_6 = StrOption(name="leader", doc="leader", multi=True)
+option_7 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"normal"}))
+option_8 = StrOption(name="follower2", doc="follower2", multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_7)))), properties=frozenset({"normal"}))
+option_9 = StrOption(name="follower3", doc="follower3", multi=True, properties=frozenset({"normal"}))
+option_5 = Leadership(name="leader", doc="leader", children=[option_6, option_7, option_8, option_9], properties=frozenset({"normal"}))
+option_4 = OptionDescription(name="general1", doc="general1", children=[option_5], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_4])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10leadership_append_hidden/00-base.xml b/tests/dictionaries_old/10leadership_append_hidden/00-base.xml
new file mode 100644
index 00000000..605a5b15
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_append_hidden/00-base.xml
@@ -0,0 +1,29 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="general1">
+      <variable name="leader" type="string" description="leader" multi="True" hidden="True"/>
+      <variable name="follower1" type="string" description="follower1"/>
+      <variable name="follower2" type="string" description="follower2"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valfill</param>
+      <target>follower1</target>
+    </fill>
+    <fill name="calc_val">
+      <param type="variable">follower1</param>
+      <target>follower2</target>
+    </fill>
+    <group leader="leader">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+    </group>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10leadership_append_hidden/01-base.xml b/tests/dictionaries_old/10leadership_append_hidden/01-base.xml
new file mode 100644
index 00000000..b271772b
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_append_hidden/01-base.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general1">
+      <variable name="follower3" type="string" description="follower3"/>
+    </family>
+  </variables>
+  <constraints>
+    <group leader="leader">
+      <follower>follower3</follower>
+    </group>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10leadership_append_hidden/__init__.py b/tests/dictionaries_old/10leadership_append_hidden/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10leadership_append_hidden/makedict/after.json b/tests/dictionaries_old/10leadership_append_hidden/makedict/after.json
new file mode 100644
index 00000000..6dedaf65
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_append_hidden/makedict/after.json
@@ -0,0 +1,22 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general1.leader.leader": {
+        "owner": "default",
+        "value": []
+    },
+    "rougail.general1.leader.follower1": {
+        "owner": [],
+        "value": []
+    },
+    "rougail.general1.leader.follower2": {
+        "owner": [],
+        "value": []
+    },
+    "rougail.general1.leader.follower3": {
+        "owner": [],
+        "value": []
+    }
+}
diff --git a/tests/dictionaries_old/10leadership_append_hidden/makedict/base.json b/tests/dictionaries_old/10leadership_append_hidden/makedict/base.json
new file mode 100644
index 00000000..14aaf55f
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_append_hidden/makedict/base.json
@@ -0,0 +1,4 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general1.leader.leader": []
+}
diff --git a/tests/dictionaries_old/10leadership_append_hidden/makedict/before.json b/tests/dictionaries_old/10leadership_append_hidden/makedict/before.json
new file mode 100644
index 00000000..6dedaf65
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_append_hidden/makedict/before.json
@@ -0,0 +1,22 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general1.leader.leader": {
+        "owner": "default",
+        "value": []
+    },
+    "rougail.general1.leader.follower1": {
+        "owner": [],
+        "value": []
+    },
+    "rougail.general1.leader.follower2": {
+        "owner": [],
+        "value": []
+    },
+    "rougail.general1.leader.follower3": {
+        "owner": [],
+        "value": []
+    }
+}
diff --git a/tests/dictionaries_old/10leadership_append_hidden/tiramisu/base.py b/tests/dictionaries_old/10leadership_append_hidden/tiramisu/base.py
new file mode 100644
index 00000000..4bb89fbd
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_append_hidden/tiramisu/base.py
@@ -0,0 +1,23 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
+option_6 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({"force_default_on_freeze", "frozen"}))
+option_7 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"force_default_on_freeze", "frozen", "normal"}))
+option_8 = StrOption(name="follower2", doc="follower2", multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_7)))), properties=frozenset({"force_default_on_freeze", "frozen", "normal"}))
+option_9 = StrOption(name="follower3", doc="follower3", multi=True, properties=frozenset({"force_default_on_freeze", "frozen", "normal"}))
+option_5 = Leadership(name="leader", doc="leader", children=[option_6, option_7, option_8, option_9], properties=frozenset({"hidden", "normal"}))
+option_4 = OptionDescription(name="general1", doc="general1", children=[option_5], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_4])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10leadership_append_name/00-base.xml b/tests/dictionaries_old/10leadership_append_name/00-base.xml
new file mode 100644
index 00000000..8dc3f441
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_append_name/00-base.xml
@@ -0,0 +1,29 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="general1">
+      <variable name="leader" type="string" description="leader" multi="True"/>
+      <variable name="follower1" type="string" description="follower1"/>
+      <variable name="follower2" type="string" description="follower2"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valfill</param>
+      <target>follower1</target>
+    </fill>
+    <fill name="calc_val">
+      <param type="variable">follower1</param>
+      <target>follower2</target>
+    </fill>
+    <group leader="leader" name="leadership">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+    </group>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10leadership_append_name/01-base.xml b/tests/dictionaries_old/10leadership_append_name/01-base.xml
new file mode 100644
index 00000000..da032727
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_append_name/01-base.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general1">
+      <variable name="follower3" type="string" description="follower3"/>
+    </family>
+  </variables>
+  <constraints>
+    <group leader="leadership">
+      <follower>follower3</follower>
+    </group>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10leadership_append_name/__init__.py b/tests/dictionaries_old/10leadership_append_name/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10leadership_append_name/makedict/after.json b/tests/dictionaries_old/10leadership_append_name/makedict/after.json
new file mode 100644
index 00000000..00346093
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_append_name/makedict/after.json
@@ -0,0 +1,22 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general1.leadership.leader": {
+        "owner": "default",
+        "value": []
+    },
+    "rougail.general1.leadership.follower1": {
+        "owner": [],
+        "value": []
+    },
+    "rougail.general1.leadership.follower2": {
+        "owner": [],
+        "value": []
+    },
+    "rougail.general1.leadership.follower3": {
+        "owner": [],
+        "value": []
+    }
+}
diff --git a/tests/dictionaries_old/10leadership_append_name/makedict/base.json b/tests/dictionaries_old/10leadership_append_name/makedict/base.json
new file mode 100644
index 00000000..1b3a3e8e
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_append_name/makedict/base.json
@@ -0,0 +1,4 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general1.leadership.leader": []
+}
diff --git a/tests/dictionaries_old/10leadership_append_name/makedict/before.json b/tests/dictionaries_old/10leadership_append_name/makedict/before.json
new file mode 100644
index 00000000..00346093
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_append_name/makedict/before.json
@@ -0,0 +1,22 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general1.leadership.leader": {
+        "owner": "default",
+        "value": []
+    },
+    "rougail.general1.leadership.follower1": {
+        "owner": [],
+        "value": []
+    },
+    "rougail.general1.leadership.follower2": {
+        "owner": [],
+        "value": []
+    },
+    "rougail.general1.leadership.follower3": {
+        "owner": [],
+        "value": []
+    }
+}
diff --git a/tests/dictionaries_old/10leadership_append_name/tiramisu/base.py b/tests/dictionaries_old/10leadership_append_name/tiramisu/base.py
new file mode 100644
index 00000000..ceadc27f
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_append_name/tiramisu/base.py
@@ -0,0 +1,23 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
+option_6 = StrOption(name="leader", doc="leader", multi=True)
+option_7 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"normal"}))
+option_8 = StrOption(name="follower2", doc="follower2", multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_7)))), properties=frozenset({"normal"}))
+option_9 = StrOption(name="follower3", doc="follower3", multi=True, properties=frozenset({"normal"}))
+option_5 = Leadership(name="leadership", doc="leadership", children=[option_6, option_7, option_8, option_9], properties=frozenset({"normal"}))
+option_4 = OptionDescription(name="general1", doc="general1", children=[option_5], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_4])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10leadership_auto/00-base.xml b/tests/dictionaries_old/10leadership_auto/00-base.xml
new file mode 100644
index 00000000..abdc42df
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_auto/00-base.xml
@@ -0,0 +1,33 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="leader" type="string" description="leader" multi="True"/>
+      <variable name="follower1" type="string" description="follower1" hidden="True"/>
+      <variable name="follower2" type="string" description="follower2" hidden="True"/>
+      <variable name="follower3" type="string" description="follower3" hidden="True"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valfill</param>
+      <target>follower1</target>
+    </fill>
+    <fill name="calc_val">
+      <param type="variable">follower1</param>
+      <target>follower2</target>
+    </fill>
+    <fill name="calc_val">
+      <param type="variable">leader</param>
+      <target>follower3</target>
+    </fill>
+    <group leader="leader">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+      <follower>follower3</follower>
+    </group>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10leadership_auto/__init__.py b/tests/dictionaries_old/10leadership_auto/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10leadership_auto/makedict/after.json b/tests/dictionaries_old/10leadership_auto/makedict/after.json
new file mode 100644
index 00000000..6810558b
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_auto/makedict/after.json
@@ -0,0 +1,22 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.leader.leader": {
+        "owner": "default",
+        "value": []
+    },
+    "rougail.general.leader.follower1": {
+        "owner": [],
+        "value": []
+    },
+    "rougail.general.leader.follower2": {
+        "owner": [],
+        "value": []
+    },
+    "rougail.general.leader.follower3": {
+        "owner": [],
+        "value": []
+    }
+}
diff --git a/tests/dictionaries_old/10leadership_auto/makedict/base.json b/tests/dictionaries_old/10leadership_auto/makedict/base.json
new file mode 100644
index 00000000..9031a92a
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_auto/makedict/base.json
@@ -0,0 +1,4 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general.leader.leader": []
+}
diff --git a/tests/dictionaries_old/10leadership_auto/makedict/before.json b/tests/dictionaries_old/10leadership_auto/makedict/before.json
new file mode 100644
index 00000000..6810558b
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_auto/makedict/before.json
@@ -0,0 +1,22 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.leader.leader": {
+        "owner": "default",
+        "value": []
+    },
+    "rougail.general.leader.follower1": {
+        "owner": [],
+        "value": []
+    },
+    "rougail.general.leader.follower2": {
+        "owner": [],
+        "value": []
+    },
+    "rougail.general.leader.follower3": {
+        "owner": [],
+        "value": []
+    }
+}
diff --git a/tests/dictionaries_old/10leadership_auto/tiramisu/base.py b/tests/dictionaries_old/10leadership_auto/tiramisu/base.py
new file mode 100644
index 00000000..e4603ed1
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_auto/tiramisu/base.py
@@ -0,0 +1,22 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_5 = StrOption(name="leader", doc="leader", multi=True)
+option_6 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal"}))
+option_7 = StrOption(name="follower2", doc="follower2", multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_6)))), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal"}))
+option_8 = StrOption(name="follower3", doc="follower3", multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_5)))), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal"}))
+option_4 = Leadership(name="leader", doc="leader", children=[option_5, option_6, option_7, option_8], properties=frozenset({"normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10leadership_auto_index/00-base.xml b/tests/dictionaries_old/10leadership_auto_index/00-base.xml
new file mode 100644
index 00000000..cd8979cb
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_auto_index/00-base.xml
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <variable name="leader" multi="True">
+      <value>a</value>
+      <value>b</value>
+      <value>c</value>
+    </variable>
+    <variable name="follower1" type="number"/>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="index"/>
+      <target>follower1</target>
+    </fill>
+    <group leader="leader">
+      <follower>follower1</follower>
+    </group>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10leadership_auto_index/__init__.py b/tests/dictionaries_old/10leadership_auto_index/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10leadership_auto_index/makedict/after.json b/tests/dictionaries_old/10leadership_auto_index/makedict/after.json
new file mode 100644
index 00000000..153afde0
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_auto_index/makedict/after.json
@@ -0,0 +1,22 @@
+{
+    "rougail.leader.leader": {
+        "owner": "default",
+        "value": [
+            "a",
+            "b",
+            "c"
+        ]
+    },
+    "rougail.leader.follower1": {
+        "owner": [
+            "default",
+            "default",
+            "default"
+        ],
+        "value": [
+            0,
+            1,
+            2
+        ]
+    }
+}
diff --git a/tests/dictionaries_old/10leadership_auto_index/makedict/base.json b/tests/dictionaries_old/10leadership_auto_index/makedict/base.json
new file mode 100644
index 00000000..33b6cf4f
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_auto_index/makedict/base.json
@@ -0,0 +1,16 @@
+{
+    "rougail.leader.leader": [
+        {
+            "rougail.leader.leader": "a",
+            "rougail.leader.follower1": 0
+        },
+        {
+            "rougail.leader.leader": "b",
+            "rougail.leader.follower1": 1
+        },
+        {
+            "rougail.leader.leader": "c",
+            "rougail.leader.follower1": 2
+        }
+    ]
+}
diff --git a/tests/dictionaries_old/10leadership_auto_index/makedict/before.json b/tests/dictionaries_old/10leadership_auto_index/makedict/before.json
new file mode 100644
index 00000000..153afde0
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_auto_index/makedict/before.json
@@ -0,0 +1,22 @@
+{
+    "rougail.leader.leader": {
+        "owner": "default",
+        "value": [
+            "a",
+            "b",
+            "c"
+        ]
+    },
+    "rougail.leader.follower1": {
+        "owner": [
+            "default",
+            "default",
+            "default"
+        ],
+        "value": [
+            0,
+            1,
+            2
+        ]
+    }
+}
diff --git a/tests/dictionaries_old/10leadership_auto_index/tiramisu/base.py b/tests/dictionaries_old/10leadership_auto_index/tiramisu/base.py
new file mode 100644
index 00000000..24c130f3
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_auto_index/tiramisu/base.py
@@ -0,0 +1,18 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="leader", doc="leader", multi=True, default=['a', 'b', 'c'], properties=frozenset({"mandatory"}))
+option_4 = IntOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((ParamIndex()))), properties=frozenset({"normal"}))
+option_2 = Leadership(name="leader", doc="leader", children=[option_3, option_4], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10leadership_autoleader/00-base.xml b/tests/dictionaries_old/10leadership_autoleader/00-base.xml
new file mode 100644
index 00000000..08f97723
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_autoleader/00-base.xml
@@ -0,0 +1,27 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="leader" type="string" description="leader" multi="True"/>
+      <variable name="follower1" type="string" description="follower1" hidden="True"/>
+      <variable name="follower2" type="string" description="follower2" hidden="True"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valfill</param>
+      <target>follower1</target>
+    </fill>
+    <fill name="calc_val">
+      <param type="variable">leader</param>
+      <target>follower2</target>
+    </fill>
+    <group leader="leader">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+    </group>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10leadership_autoleader/__init__.py b/tests/dictionaries_old/10leadership_autoleader/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10leadership_autoleader/makedict/after.json b/tests/dictionaries_old/10leadership_autoleader/makedict/after.json
new file mode 100644
index 00000000..dd62b980
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_autoleader/makedict/after.json
@@ -0,0 +1,18 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.leader.leader": {
+        "owner": "default",
+        "value": []
+    },
+    "rougail.general.leader.follower1": {
+        "owner": [],
+        "value": []
+    },
+    "rougail.general.leader.follower2": {
+        "owner": [],
+        "value": []
+    }
+}
diff --git a/tests/dictionaries_old/10leadership_autoleader/makedict/base.json b/tests/dictionaries_old/10leadership_autoleader/makedict/base.json
new file mode 100644
index 00000000..9031a92a
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_autoleader/makedict/base.json
@@ -0,0 +1,4 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general.leader.leader": []
+}
diff --git a/tests/dictionaries_old/10leadership_autoleader/makedict/before.json b/tests/dictionaries_old/10leadership_autoleader/makedict/before.json
new file mode 100644
index 00000000..dd62b980
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_autoleader/makedict/before.json
@@ -0,0 +1,18 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.leader.leader": {
+        "owner": "default",
+        "value": []
+    },
+    "rougail.general.leader.follower1": {
+        "owner": [],
+        "value": []
+    },
+    "rougail.general.leader.follower2": {
+        "owner": [],
+        "value": []
+    }
+}
diff --git a/tests/dictionaries_old/10leadership_autoleader/tiramisu/base.py b/tests/dictionaries_old/10leadership_autoleader/tiramisu/base.py
new file mode 100644
index 00000000..275327c8
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_autoleader/tiramisu/base.py
@@ -0,0 +1,21 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_5 = StrOption(name="leader", doc="leader", multi=True)
+option_6 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal"}))
+option_7 = StrOption(name="follower2", doc="follower2", multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_5)))), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal"}))
+option_4 = Leadership(name="leader", doc="leader", children=[option_5, option_6, option_7], properties=frozenset({"normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10leadership_autoleader_expert/00-base.xml b/tests/dictionaries_old/10leadership_autoleader_expert/00-base.xml
new file mode 100644
index 00000000..231c29f3
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_autoleader_expert/00-base.xml
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="leadermode">
+      <variable name="leader" type="string" description="leader" multi="True" mode="expert"/>
+      <variable name="follower1" type="string" description="follower1"/>
+      <variable name="follower2" type="string" description="follower2"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_list">
+      <param name="valeur">valfill</param>
+      <target>leader</target>
+    </fill>
+    <group leader="leader">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+    </group>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10leadership_autoleader_expert/__init__.py b/tests/dictionaries_old/10leadership_autoleader_expert/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10leadership_autoleader_expert/makedict/after.json b/tests/dictionaries_old/10leadership_autoleader_expert/makedict/after.json
new file mode 100644
index 00000000..34eba3d5
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_autoleader_expert/makedict/after.json
@@ -0,0 +1,18 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.leadermode.leader.leader": {
+        "owner": "default",
+        "value": []
+    },
+    "rougail.leadermode.leader.follower1": {
+        "owner": [],
+        "value": []
+    },
+    "rougail.leadermode.leader.follower2": {
+        "owner": [],
+        "value": []
+    }
+}
diff --git a/tests/dictionaries_old/10leadership_autoleader_expert/makedict/base.json b/tests/dictionaries_old/10leadership_autoleader_expert/makedict/base.json
new file mode 100644
index 00000000..fe8a1c7a
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_autoleader_expert/makedict/base.json
@@ -0,0 +1,4 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.leadermode.leader.leader": []
+}
diff --git a/tests/dictionaries_old/10leadership_autoleader_expert/makedict/before.json b/tests/dictionaries_old/10leadership_autoleader_expert/makedict/before.json
new file mode 100644
index 00000000..34eba3d5
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_autoleader_expert/makedict/before.json
@@ -0,0 +1,18 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.leadermode.leader.leader": {
+        "owner": "default",
+        "value": []
+    },
+    "rougail.leadermode.leader.follower1": {
+        "owner": [],
+        "value": []
+    },
+    "rougail.leadermode.leader.follower2": {
+        "owner": [],
+        "value": []
+    }
+}
diff --git a/tests/dictionaries_old/10leadership_autoleader_expert/tiramisu/base.py b/tests/dictionaries_old/10leadership_autoleader_expert/tiramisu/base.py
new file mode 100644
index 00000000..3315b7bc
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_autoleader_expert/tiramisu/base.py
@@ -0,0 +1,22 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"expert", "mandatory"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"expert"}))
+option_6 = StrOption(name="leader", doc="leader", multi=True, default=Calculation(func.calc_list, Params((), kwargs={'valeur': ParamValue("valfill")})))
+option_7 = StrOption(name="follower1", doc="follower1", multi=True, properties=frozenset({"expert"}))
+option_8 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"expert"}))
+option_5 = Leadership(name="leader", doc="leader", children=[option_6, option_7, option_8], properties=frozenset({"expert"}))
+option_4 = OptionDescription(name="leadermode", doc="leadermode", children=[option_5], properties=frozenset({"expert"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_4])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10leadership_autosaveexpert/00-base.xml b/tests/dictionaries_old/10leadership_autosaveexpert/00-base.xml
new file mode 100644
index 00000000..fab4877d
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_autosaveexpert/00-base.xml
@@ -0,0 +1,27 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="leader" type="string" description="leader" multi="True"/>
+      <variable name="follower1" type="string" description="follower1"/>
+      <variable name="follower2" type="string" description="follower2" mode="expert"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valfill</param>
+      <target>follower1</target>
+    </fill>
+    <fill name="calc_val">
+      <param type="variable">follower1</param>
+      <target>follower2</target>
+    </fill>
+    <group leader="leader">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+    </group>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10leadership_autosaveexpert/__init__.py b/tests/dictionaries_old/10leadership_autosaveexpert/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10leadership_autosaveexpert/makedict/after.json b/tests/dictionaries_old/10leadership_autosaveexpert/makedict/after.json
new file mode 100644
index 00000000..dd62b980
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_autosaveexpert/makedict/after.json
@@ -0,0 +1,18 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.leader.leader": {
+        "owner": "default",
+        "value": []
+    },
+    "rougail.general.leader.follower1": {
+        "owner": [],
+        "value": []
+    },
+    "rougail.general.leader.follower2": {
+        "owner": [],
+        "value": []
+    }
+}
diff --git a/tests/dictionaries_old/10leadership_autosaveexpert/makedict/base.json b/tests/dictionaries_old/10leadership_autosaveexpert/makedict/base.json
new file mode 100644
index 00000000..9031a92a
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_autosaveexpert/makedict/base.json
@@ -0,0 +1,4 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general.leader.leader": []
+}
diff --git a/tests/dictionaries_old/10leadership_autosaveexpert/makedict/before.json b/tests/dictionaries_old/10leadership_autosaveexpert/makedict/before.json
new file mode 100644
index 00000000..dd62b980
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_autosaveexpert/makedict/before.json
@@ -0,0 +1,18 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.leader.leader": {
+        "owner": "default",
+        "value": []
+    },
+    "rougail.general.leader.follower1": {
+        "owner": [],
+        "value": []
+    },
+    "rougail.general.leader.follower2": {
+        "owner": [],
+        "value": []
+    }
+}
diff --git a/tests/dictionaries_old/10leadership_autosaveexpert/tiramisu/base.py b/tests/dictionaries_old/10leadership_autosaveexpert/tiramisu/base.py
new file mode 100644
index 00000000..a5ac66b3
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_autosaveexpert/tiramisu/base.py
@@ -0,0 +1,21 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_5 = StrOption(name="leader", doc="leader", multi=True)
+option_6 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"normal"}))
+option_7 = StrOption(name="follower2", doc="follower2", multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_6)))), properties=frozenset({"expert"}))
+option_4 = Leadership(name="leader", doc="leader", children=[option_5, option_6, option_7], properties=frozenset({"normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10leadership_leader_hidden/00-base.xml b/tests/dictionaries_old/10leadership_leader_hidden/00-base.xml
new file mode 100644
index 00000000..baa6de82
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_leader_hidden/00-base.xml
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="leadermode">
+      <variable name="leader" type="string" description="leader" multi="True" hidden="True"/>
+      <variable name="follower1" type="string" description="follower1"/>
+      <variable name="follower2" type="string" description="follower2"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_list">
+      <param name="valeur">valfill</param>
+      <target>leader</target>
+    </fill>
+    <group leader="leader">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+    </group>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10leadership_leader_hidden/__init__.py b/tests/dictionaries_old/10leadership_leader_hidden/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10leadership_leader_hidden/makedict/after.json b/tests/dictionaries_old/10leadership_leader_hidden/makedict/after.json
new file mode 100644
index 00000000..34eba3d5
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_leader_hidden/makedict/after.json
@@ -0,0 +1,18 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.leadermode.leader.leader": {
+        "owner": "default",
+        "value": []
+    },
+    "rougail.leadermode.leader.follower1": {
+        "owner": [],
+        "value": []
+    },
+    "rougail.leadermode.leader.follower2": {
+        "owner": [],
+        "value": []
+    }
+}
diff --git a/tests/dictionaries_old/10leadership_leader_hidden/makedict/base.json b/tests/dictionaries_old/10leadership_leader_hidden/makedict/base.json
new file mode 100644
index 00000000..fe8a1c7a
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_leader_hidden/makedict/base.json
@@ -0,0 +1,4 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.leadermode.leader.leader": []
+}
diff --git a/tests/dictionaries_old/10leadership_leader_hidden/makedict/before.json b/tests/dictionaries_old/10leadership_leader_hidden/makedict/before.json
new file mode 100644
index 00000000..34eba3d5
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_leader_hidden/makedict/before.json
@@ -0,0 +1,18 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.leadermode.leader.leader": {
+        "owner": "default",
+        "value": []
+    },
+    "rougail.leadermode.leader.follower1": {
+        "owner": [],
+        "value": []
+    },
+    "rougail.leadermode.leader.follower2": {
+        "owner": [],
+        "value": []
+    }
+}
diff --git a/tests/dictionaries_old/10leadership_leader_hidden/tiramisu/base.py b/tests/dictionaries_old/10leadership_leader_hidden/tiramisu/base.py
new file mode 100644
index 00000000..4faab53d
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_leader_hidden/tiramisu/base.py
@@ -0,0 +1,22 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"expert", "mandatory"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"expert"}))
+option_6 = StrOption(name="leader", doc="leader", multi=True, default=Calculation(func.calc_list, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"force_default_on_freeze", "frozen"}))
+option_7 = StrOption(name="follower1", doc="follower1", multi=True, properties=frozenset({"force_default_on_freeze", "frozen", "normal"}))
+option_8 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"force_default_on_freeze", "frozen", "normal"}))
+option_5 = Leadership(name="leader", doc="leader", children=[option_6, option_7, option_8], properties=frozenset({"hidden", "normal"}))
+option_4 = OptionDescription(name="leadermode", doc="leadermode", children=[option_5], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_4])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10leadership_leader_hidden_if_in/00-base.xml b/tests/dictionaries_old/10leadership_leader_hidden_if_in/00-base.xml
new file mode 100644
index 00000000..0b344865
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_leader_hidden_if_in/00-base.xml
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="leadermode">
+      <variable name="leader" type="string" description="leader" multi="True"/>
+      <variable name="follower1" type="string" description="follower1"/>
+      <variable name="follower2" type="string" description="follower2"/>
+    </family>
+  </variables>
+  <constraints>
+    <group leader="leader">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+    </group>
+    <condition name="hidden_if_in" source="mode_conteneur_actif">
+      <param>non</param>
+      <target type="variable">leader</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10leadership_leader_hidden_if_in/__init__.py b/tests/dictionaries_old/10leadership_leader_hidden_if_in/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10leadership_leader_hidden_if_in/makedict/after.json b/tests/dictionaries_old/10leadership_leader_hidden_if_in/makedict/after.json
new file mode 100644
index 00000000..34eba3d5
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_leader_hidden_if_in/makedict/after.json
@@ -0,0 +1,18 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.leadermode.leader.leader": {
+        "owner": "default",
+        "value": []
+    },
+    "rougail.leadermode.leader.follower1": {
+        "owner": [],
+        "value": []
+    },
+    "rougail.leadermode.leader.follower2": {
+        "owner": [],
+        "value": []
+    }
+}
diff --git a/tests/dictionaries_old/10leadership_leader_hidden_if_in/makedict/base.json b/tests/dictionaries_old/10leadership_leader_hidden_if_in/makedict/base.json
new file mode 100644
index 00000000..fe8a1c7a
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_leader_hidden_if_in/makedict/base.json
@@ -0,0 +1,4 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.leadermode.leader.leader": []
+}
diff --git a/tests/dictionaries_old/10leadership_leader_hidden_if_in/makedict/before.json b/tests/dictionaries_old/10leadership_leader_hidden_if_in/makedict/before.json
new file mode 100644
index 00000000..34eba3d5
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_leader_hidden_if_in/makedict/before.json
@@ -0,0 +1,18 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.leadermode.leader.leader": {
+        "owner": "default",
+        "value": []
+    },
+    "rougail.leadermode.leader.follower1": {
+        "owner": [],
+        "value": []
+    },
+    "rougail.leadermode.leader.follower2": {
+        "owner": [],
+        "value": []
+    }
+}
diff --git a/tests/dictionaries_old/10leadership_leader_hidden_if_in/tiramisu/base.py b/tests/dictionaries_old/10leadership_leader_hidden_if_in/tiramisu/base.py
new file mode 100644
index 00000000..52c54258
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_leader_hidden_if_in/tiramisu/base.py
@@ -0,0 +1,22 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"expert", "mandatory"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"expert"}))
+option_6 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")}))}))
+option_7 = StrOption(name="follower1", doc="follower1", multi=True, properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")}))}))
+option_8 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")}))}))
+option_5 = Leadership(name="leader", doc="leader", children=[option_6, option_7, option_8], properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")}))}))
+option_4 = OptionDescription(name="leadermode", doc="leadermode", children=[option_5], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_4])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10leadership_leader_hidden_if_in_name/00-base.xml b/tests/dictionaries_old/10leadership_leader_hidden_if_in_name/00-base.xml
new file mode 100644
index 00000000..9a5818a5
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_leader_hidden_if_in_name/00-base.xml
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="leadermode">
+      <variable name="leader" type="string" description="leader" multi="True"/>
+      <variable name="follower1" type="string" description="follower1"/>
+      <variable name="follower2" type="string" description="follower2"/>
+    </family>
+  </variables>
+  <constraints>
+    <group leader="leader" name="other">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+    </group>
+    <condition name="hidden_if_in" source="mode_conteneur_actif">
+      <param>non</param>
+      <target type="variable">leader</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10leadership_leader_hidden_if_in_name/__init__.py b/tests/dictionaries_old/10leadership_leader_hidden_if_in_name/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10leadership_leader_hidden_if_in_name/makedict/after.json b/tests/dictionaries_old/10leadership_leader_hidden_if_in_name/makedict/after.json
new file mode 100644
index 00000000..05ecdcd2
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_leader_hidden_if_in_name/makedict/after.json
@@ -0,0 +1,18 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.leadermode.other.leader": {
+        "owner": "default",
+        "value": []
+    },
+    "rougail.leadermode.other.follower1": {
+        "owner": [],
+        "value": []
+    },
+    "rougail.leadermode.other.follower2": {
+        "owner": [],
+        "value": []
+    }
+}
diff --git a/tests/dictionaries_old/10leadership_leader_hidden_if_in_name/makedict/base.json b/tests/dictionaries_old/10leadership_leader_hidden_if_in_name/makedict/base.json
new file mode 100644
index 00000000..ba697460
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_leader_hidden_if_in_name/makedict/base.json
@@ -0,0 +1,4 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.leadermode.other.leader": []
+}
diff --git a/tests/dictionaries_old/10leadership_leader_hidden_if_in_name/makedict/before.json b/tests/dictionaries_old/10leadership_leader_hidden_if_in_name/makedict/before.json
new file mode 100644
index 00000000..05ecdcd2
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_leader_hidden_if_in_name/makedict/before.json
@@ -0,0 +1,18 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.leadermode.other.leader": {
+        "owner": "default",
+        "value": []
+    },
+    "rougail.leadermode.other.follower1": {
+        "owner": [],
+        "value": []
+    },
+    "rougail.leadermode.other.follower2": {
+        "owner": [],
+        "value": []
+    }
+}
diff --git a/tests/dictionaries_old/10leadership_leader_hidden_if_in_name/tiramisu/base.py b/tests/dictionaries_old/10leadership_leader_hidden_if_in_name/tiramisu/base.py
new file mode 100644
index 00000000..cc41553d
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_leader_hidden_if_in_name/tiramisu/base.py
@@ -0,0 +1,22 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"expert", "mandatory"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"expert"}))
+option_6 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")}))}))
+option_7 = StrOption(name="follower1", doc="follower1", multi=True, properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")}))}))
+option_8 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")}))}))
+option_5 = Leadership(name="other", doc="other", children=[option_6, option_7, option_8], properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")}))}))
+option_4 = OptionDescription(name="leadermode", doc="leadermode", children=[option_5], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_4])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10leadership_leadermandatory/00-base.xml b/tests/dictionaries_old/10leadership_leadermandatory/00-base.xml
new file mode 100644
index 00000000..b8d1b813
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_leadermandatory/00-base.xml
@@ -0,0 +1,27 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="leader" type="string" description="leader" multi="True" mandatory="True"/>
+      <variable name="follower1" type="string" description="follower1"/>
+      <variable name="follower2" type="string" description="follower2"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valfill</param>
+      <target>follower1</target>
+    </fill>
+    <fill name="calc_val">
+      <param type="variable">follower1</param>
+      <target>follower2</target>
+    </fill>
+    <group leader="leader">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+    </group>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10leadership_leadermandatory/__init__.py b/tests/dictionaries_old/10leadership_leadermandatory/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10leadership_leadermandatory/makedict/after.json b/tests/dictionaries_old/10leadership_leadermandatory/makedict/after.json
new file mode 100644
index 00000000..dd62b980
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_leadermandatory/makedict/after.json
@@ -0,0 +1,18 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.leader.leader": {
+        "owner": "default",
+        "value": []
+    },
+    "rougail.general.leader.follower1": {
+        "owner": [],
+        "value": []
+    },
+    "rougail.general.leader.follower2": {
+        "owner": [],
+        "value": []
+    }
+}
diff --git a/tests/dictionaries_old/10leadership_leadermandatory/makedict/base.json b/tests/dictionaries_old/10leadership_leadermandatory/makedict/base.json
new file mode 100644
index 00000000..9031a92a
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_leadermandatory/makedict/base.json
@@ -0,0 +1,4 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general.leader.leader": []
+}
diff --git a/tests/dictionaries_old/10leadership_leadermandatory/makedict/before.json b/tests/dictionaries_old/10leadership_leadermandatory/makedict/before.json
new file mode 100644
index 00000000..dd62b980
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_leadermandatory/makedict/before.json
@@ -0,0 +1,18 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.leader.leader": {
+        "owner": "default",
+        "value": []
+    },
+    "rougail.general.leader.follower1": {
+        "owner": [],
+        "value": []
+    },
+    "rougail.general.leader.follower2": {
+        "owner": [],
+        "value": []
+    }
+}
diff --git a/tests/dictionaries_old/10leadership_leadermandatory/tiramisu/base.py b/tests/dictionaries_old/10leadership_leadermandatory/tiramisu/base.py
new file mode 100644
index 00000000..673a952b
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_leadermandatory/tiramisu/base.py
@@ -0,0 +1,21 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_5 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({"mandatory"}))
+option_6 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"normal"}))
+option_7 = StrOption(name="follower2", doc="follower2", multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_6)))), properties=frozenset({"normal"}))
+option_4 = Leadership(name="leader", doc="leader", children=[option_5, option_6, option_7], properties=frozenset({"basic"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4], properties=frozenset({"basic"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10leadership_mandatory/00-base.xml b/tests/dictionaries_old/10leadership_mandatory/00-base.xml
new file mode 100644
index 00000000..07d8f068
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_mandatory/00-base.xml
@@ -0,0 +1,27 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="leader" type="string" description="leader" multi="True"/>
+      <variable name="follower1" type="string" description="follower1" mandatory="True"/>
+      <variable name="follower2" type="string" description="follower2"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valfill</param>
+      <target>follower1</target>
+    </fill>
+    <fill name="calc_val">
+      <param type="variable">follower1</param>
+      <target>follower2</target>
+    </fill>
+    <group leader="leader">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+    </group>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10leadership_mandatory/__init__.py b/tests/dictionaries_old/10leadership_mandatory/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10leadership_mandatory/makedict/after.json b/tests/dictionaries_old/10leadership_mandatory/makedict/after.json
new file mode 100644
index 00000000..dd62b980
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_mandatory/makedict/after.json
@@ -0,0 +1,18 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.leader.leader": {
+        "owner": "default",
+        "value": []
+    },
+    "rougail.general.leader.follower1": {
+        "owner": [],
+        "value": []
+    },
+    "rougail.general.leader.follower2": {
+        "owner": [],
+        "value": []
+    }
+}
diff --git a/tests/dictionaries_old/10leadership_mandatory/makedict/base.json b/tests/dictionaries_old/10leadership_mandatory/makedict/base.json
new file mode 100644
index 00000000..9031a92a
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_mandatory/makedict/base.json
@@ -0,0 +1,4 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general.leader.leader": []
+}
diff --git a/tests/dictionaries_old/10leadership_mandatory/makedict/before.json b/tests/dictionaries_old/10leadership_mandatory/makedict/before.json
new file mode 100644
index 00000000..dd62b980
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_mandatory/makedict/before.json
@@ -0,0 +1,18 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.leader.leader": {
+        "owner": "default",
+        "value": []
+    },
+    "rougail.general.leader.follower1": {
+        "owner": [],
+        "value": []
+    },
+    "rougail.general.leader.follower2": {
+        "owner": [],
+        "value": []
+    }
+}
diff --git a/tests/dictionaries_old/10leadership_mandatory/tiramisu/base.py b/tests/dictionaries_old/10leadership_mandatory/tiramisu/base.py
new file mode 100644
index 00000000..72421be5
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_mandatory/tiramisu/base.py
@@ -0,0 +1,21 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_5 = StrOption(name="leader", doc="leader", multi=True)
+option_6 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"mandatory", "normal"}))
+option_7 = StrOption(name="follower2", doc="follower2", multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_6)))), properties=frozenset({"normal"}))
+option_4 = Leadership(name="leader", doc="leader", children=[option_5, option_6, option_7], properties=frozenset({"normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10leadership_mandatoryfollower/00-base.xml b/tests/dictionaries_old/10leadership_mandatoryfollower/00-base.xml
new file mode 100644
index 00000000..6865c331
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_mandatoryfollower/00-base.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>oui</value>
+      </variable>
+      <variable name="nut_monitor_netmask" type="netmask" description="Masque de l'IP du réseau de l'esclave" multi="True"/>
+      <variable name="nut_monitor_host" type="network" description="Adresse IP du réseau de l'esclave" mandatory="True"/>
+    </family>
+  </variables>
+  <constraints>
+    <group leader="nut_monitor_netmask">
+      <follower>nut_monitor_host</follower>
+    </group>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10leadership_mandatoryfollower/__init__.py b/tests/dictionaries_old/10leadership_mandatoryfollower/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10leadership_mandatoryfollower/makedict/after.json b/tests/dictionaries_old/10leadership_mandatoryfollower/makedict/after.json
new file mode 100644
index 00000000..c66326da
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_mandatoryfollower/makedict/after.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "oui"
+    },
+    "rougail.general.nut_monitor_netmask.nut_monitor_netmask": {
+        "owner": "default",
+        "value": []
+    },
+    "rougail.general.nut_monitor_netmask.nut_monitor_host": {
+        "owner": [],
+        "value": []
+    }
+}
diff --git a/tests/dictionaries_old/10leadership_mandatoryfollower/makedict/base.json b/tests/dictionaries_old/10leadership_mandatoryfollower/makedict/base.json
new file mode 100644
index 00000000..af7d636d
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_mandatoryfollower/makedict/base.json
@@ -0,0 +1,4 @@
+{
+    "rougail.general.mode_conteneur_actif": "oui",
+    "rougail.general.nut_monitor_netmask.nut_monitor_netmask": []
+}
diff --git a/tests/dictionaries_old/10leadership_mandatoryfollower/makedict/before.json b/tests/dictionaries_old/10leadership_mandatoryfollower/makedict/before.json
new file mode 100644
index 00000000..c66326da
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_mandatoryfollower/makedict/before.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "oui"
+    },
+    "rougail.general.nut_monitor_netmask.nut_monitor_netmask": {
+        "owner": "default",
+        "value": []
+    },
+    "rougail.general.nut_monitor_netmask.nut_monitor_host": {
+        "owner": [],
+        "value": []
+    }
+}
diff --git a/tests/dictionaries_old/10leadership_mandatoryfollower/tiramisu/base.py b/tests/dictionaries_old/10leadership_mandatoryfollower/tiramisu/base.py
new file mode 100644
index 00000000..f7ddf727
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_mandatoryfollower/tiramisu/base.py
@@ -0,0 +1,20 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_5 = NetmaskOption(name="nut_monitor_netmask", doc="Masque de l'IP du réseau de l'esclave", multi=True)
+option_6 = NetworkOption(name="nut_monitor_host", doc="Adresse IP du réseau de l'esclave", multi=True, properties=frozenset({"basic", "mandatory"}))
+option_4 = Leadership(name="nut_monitor_netmask", doc="Masque de l'IP du réseau de l'esclave", children=[option_5, option_6], properties=frozenset({"normal"}))
+option_2 = OptionDescription(name="general", doc="général", children=[option_3, option_4], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10leadership_multi/00-base.xml b/tests/dictionaries_old/10leadership_multi/00-base.xml
new file mode 100644
index 00000000..8bb071cf
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_multi/00-base.xml
@@ -0,0 +1,36 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="general1">
+      <variable name="leader" type="string" description="leader" multi="True"/>
+      <variable name="follower1" type="string" description="follower1"/>
+      <variable name="follower2" type="string" description="follower2"/>
+      <variable name="leader1" type="string" description="leader" multi="True"/>
+      <variable name="follower11" type="string" description="follower1"/>
+      <variable name="follower21" type="string" description="follower2"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valfill</param>
+      <target>follower1</target>
+    </fill>
+    <fill name="calc_val">
+      <param type="variable">follower1</param>
+      <target>follower2</target>
+    </fill>
+    <group leader="leader">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+    </group>
+    <group leader="leader1">
+      <follower>follower11</follower>
+      <follower>follower21</follower>
+    </group>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10leadership_multi/__init__.py b/tests/dictionaries_old/10leadership_multi/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10leadership_multi/makedict/after.json b/tests/dictionaries_old/10leadership_multi/makedict/after.json
new file mode 100644
index 00000000..84e0751c
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_multi/makedict/after.json
@@ -0,0 +1,30 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general1.leader.leader": {
+        "owner": "default",
+        "value": []
+    },
+    "rougail.general1.leader.follower1": {
+        "owner": [],
+        "value": []
+    },
+    "rougail.general1.leader.follower2": {
+        "owner": [],
+        "value": []
+    },
+    "rougail.general1.leader1.leader1": {
+        "owner": "default",
+        "value": []
+    },
+    "rougail.general1.leader1.follower11": {
+        "owner": [],
+        "value": []
+    },
+    "rougail.general1.leader1.follower21": {
+        "owner": [],
+        "value": []
+    }
+}
diff --git a/tests/dictionaries_old/10leadership_multi/makedict/base.json b/tests/dictionaries_old/10leadership_multi/makedict/base.json
new file mode 100644
index 00000000..53442331
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_multi/makedict/base.json
@@ -0,0 +1,5 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general1.leader.leader": [],
+    "rougail.general1.leader1.leader1": []
+}
diff --git a/tests/dictionaries_old/10leadership_multi/makedict/before.json b/tests/dictionaries_old/10leadership_multi/makedict/before.json
new file mode 100644
index 00000000..84e0751c
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_multi/makedict/before.json
@@ -0,0 +1,30 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general1.leader.leader": {
+        "owner": "default",
+        "value": []
+    },
+    "rougail.general1.leader.follower1": {
+        "owner": [],
+        "value": []
+    },
+    "rougail.general1.leader.follower2": {
+        "owner": [],
+        "value": []
+    },
+    "rougail.general1.leader1.leader1": {
+        "owner": "default",
+        "value": []
+    },
+    "rougail.general1.leader1.follower11": {
+        "owner": [],
+        "value": []
+    },
+    "rougail.general1.leader1.follower21": {
+        "owner": [],
+        "value": []
+    }
+}
diff --git a/tests/dictionaries_old/10leadership_multi/tiramisu/base.py b/tests/dictionaries_old/10leadership_multi/tiramisu/base.py
new file mode 100644
index 00000000..62b3dd1b
--- /dev/null
+++ b/tests/dictionaries_old/10leadership_multi/tiramisu/base.py
@@ -0,0 +1,26 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
+option_6 = StrOption(name="leader", doc="leader", multi=True)
+option_7 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"normal"}))
+option_8 = StrOption(name="follower2", doc="follower2", multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_7)))), properties=frozenset({"normal"}))
+option_5 = Leadership(name="leader", doc="leader", children=[option_6, option_7, option_8], properties=frozenset({"normal"}))
+option_10 = StrOption(name="leader1", doc="leader", multi=True)
+option_11 = StrOption(name="follower11", doc="follower1", multi=True, properties=frozenset({"normal"}))
+option_12 = StrOption(name="follower21", doc="follower2", multi=True, properties=frozenset({"normal"}))
+option_9 = Leadership(name="leader1", doc="leader", children=[option_10, option_11, option_12], properties=frozenset({"normal"}))
+option_4 = OptionDescription(name="general1", doc="general1", children=[option_5, option_9], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_4])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10load_disabled_if_in/00-base.xml b/tests/dictionaries_old/10load_disabled_if_in/00-base.xml
new file mode 100644
index 00000000..b9d71687
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in/00-base.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10load_disabled_if_in/__init__.py b/tests/dictionaries_old/10load_disabled_if_in/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10load_disabled_if_in/makedict/after.json b/tests/dictionaries_old/10load_disabled_if_in/makedict/after.json
new file mode 100644
index 00000000..f51f5230
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in/makedict/after.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/10load_disabled_if_in/makedict/base.json b/tests/dictionaries_old/10load_disabled_if_in/makedict/base.json
new file mode 100644
index 00000000..c6e0314e
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in/makedict/base.json
@@ -0,0 +1,5 @@
+{
+    "rougail.general.condition": "non",
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general.mode_conteneur_actif2": "non"
+}
diff --git a/tests/dictionaries_old/10load_disabled_if_in/makedict/before.json b/tests/dictionaries_old/10load_disabled_if_in/makedict/before.json
new file mode 100644
index 00000000..f51f5230
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in/makedict/before.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/10load_disabled_if_in/tiramisu/base.py b/tests/dictionaries_old/10load_disabled_if_in/tiramisu/base.py
new file mode 100644
index 00000000..5a8968d0
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in/tiramisu/base.py
@@ -0,0 +1,19 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))}))
+option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10load_disabled_if_in_fill/00-base.xml b/tests/dictionaries_old/10load_disabled_if_in_fill/00-base.xml
new file mode 100644
index 00000000..4488de32
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in_fill/00-base.xml
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string">
+        <value>no</value>
+      </variable>
+      <variable name="variable1" type="string"/>
+      <variable name="variable2" type="string"/>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>no</param>
+      <target type="variable">variable1</target>
+    </condition>
+    <fill name="calc_val">
+      <param type="variable" propertyerror="False">variable1</param>
+      <target>variable2</target>
+    </fill>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10load_disabled_if_in_fill/__init__.py b/tests/dictionaries_old/10load_disabled_if_in_fill/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10load_disabled_if_in_fill/makedict/after.json b/tests/dictionaries_old/10load_disabled_if_in_fill/makedict/after.json
new file mode 100644
index 00000000..b022f1f2
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in_fill/makedict/after.json
@@ -0,0 +1,10 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "no"
+    },
+    "rougail.general.variable2": {
+        "owner": "default",
+        "value": null
+    }
+}
diff --git a/tests/dictionaries_old/10load_disabled_if_in_fill/makedict/base.json b/tests/dictionaries_old/10load_disabled_if_in_fill/makedict/base.json
new file mode 100644
index 00000000..60b5bb4c
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in_fill/makedict/base.json
@@ -0,0 +1,4 @@
+{
+    "rougail.general.condition": "no",
+    "rougail.general.variable2": null
+}
diff --git a/tests/dictionaries_old/10load_disabled_if_in_fill/makedict/before.json b/tests/dictionaries_old/10load_disabled_if_in_fill/makedict/before.json
new file mode 100644
index 00000000..b022f1f2
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in_fill/makedict/before.json
@@ -0,0 +1,10 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "no"
+    },
+    "rougail.general.variable2": {
+        "owner": "default",
+        "value": null
+    }
+}
diff --git a/tests/dictionaries_old/10load_disabled_if_in_fill/tiramisu/base.py b/tests/dictionaries_old/10load_disabled_if_in_fill/tiramisu/base.py
new file mode 100644
index 00000000..837e6ebc
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in_fill/tiramisu/base.py
@@ -0,0 +1,19 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="condition", doc="condition", default="no", properties=frozenset({"mandatory", "normal"}))
+option_4 = StrOption(name="variable1", doc="variable1", properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("no")}))}))
+option_5 = StrOption(name="variable2", doc="variable2", default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=True)))), properties=frozenset({"normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10load_disabled_if_in_list_optional/00-base.xml b/tests/dictionaries_old/10load_disabled_if_in_list_optional/00-base.xml
new file mode 100644
index 00000000..51927ae8
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in_list_optional/00-base.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <variable name="condition" type="boolean"/>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>True</param>
+      <target type="filelist" optional="True">unknown</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10load_disabled_if_in_list_optional/__init__.py b/tests/dictionaries_old/10load_disabled_if_in_list_optional/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10load_disabled_if_in_list_optional/makedict/after.json b/tests/dictionaries_old/10load_disabled_if_in_list_optional/makedict/after.json
new file mode 100644
index 00000000..5995efe9
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in_list_optional/makedict/after.json
@@ -0,0 +1,6 @@
+{
+    "rougail.condition": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/10load_disabled_if_in_list_optional/makedict/base.json b/tests/dictionaries_old/10load_disabled_if_in_list_optional/makedict/base.json
new file mode 100644
index 00000000..18b52fac
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in_list_optional/makedict/base.json
@@ -0,0 +1,3 @@
+{
+    "rougail.condition": true
+}
diff --git a/tests/dictionaries_old/10load_disabled_if_in_list_optional/makedict/before.json b/tests/dictionaries_old/10load_disabled_if_in_list_optional/makedict/before.json
new file mode 100644
index 00000000..5995efe9
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in_list_optional/makedict/before.json
@@ -0,0 +1,6 @@
+{
+    "rougail.condition": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/10load_disabled_if_in_list_optional/tiramisu/base.py b/tests/dictionaries_old/10load_disabled_if_in_list_optional/tiramisu/base.py
new file mode 100644
index 00000000..b73e0e6f
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in_list_optional/tiramisu/base.py
@@ -0,0 +1,16 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_2 = BoolOption(name="condition", doc="condition", default=True, properties=frozenset({"mandatory", "normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param/00-base.xml b/tests/dictionaries_old/10load_disabled_if_in_multi_param/00-base.xml
new file mode 100644
index 00000000..e2481205
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in_multi_param/00-base.xml
@@ -0,0 +1,30 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="test">
+      <file filelist="afilllist">/tmp/file1</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>oui</param>
+      <param>maybe</param>
+      <target type="variable">mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+      <target type="filelist">afilllist</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param/__init__.py b/tests/dictionaries_old/10load_disabled_if_in_multi_param/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param/makedict/after.json b/tests/dictionaries_old/10load_disabled_if_in_multi_param/makedict/after.json
new file mode 100644
index 00000000..465294dd
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in_multi_param/makedict/after.json
@@ -0,0 +1,30 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "non"
+    },
+    "services.test.files.file1.name": {
+        "owner": "default",
+        "value": "/tmp/file1"
+    },
+    "services.test.files.file1.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param/makedict/base.json b/tests/dictionaries_old/10load_disabled_if_in_multi_param/makedict/base.json
new file mode 100644
index 00000000..f4ceb046
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in_multi_param/makedict/base.json
@@ -0,0 +1,9 @@
+{
+    "rougail.general.condition": "non",
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general.mode_conteneur_actif2": "non",
+    "services.test.files.file1.name": "/tmp/file1",
+    "services.test.files.file1.activate": true,
+    "services.test.activate": true,
+    "services.test.manage": true
+}
diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param/makedict/before.json b/tests/dictionaries_old/10load_disabled_if_in_multi_param/makedict/before.json
new file mode 100644
index 00000000..465294dd
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in_multi_param/makedict/before.json
@@ -0,0 +1,30 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "non"
+    },
+    "services.test.files.file1.name": {
+        "owner": "default",
+        "value": "/tmp/file1"
+    },
+    "services.test.files.file1.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param/tiramisu/base.py b/tests/dictionaries_old/10load_disabled_if_in_multi_param/tiramisu/base.py
new file mode 100644
index 00000000..32973eeb
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in_multi_param/tiramisu/base.py
@@ -0,0 +1,28 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe")}))}))
+option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe")}))}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_10 = FilenameOption(name="name", doc="name", default="/tmp/file1")
+option_11 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, notraisepropertyerror=True), 'expected_0': ParamValue(["oui", "maybe"]), 'condition_operator': ParamValue("OR")})))
+option_9 = OptionDescription(name="file1", doc="file1", children=[option_10, option_11])
+option_9.impl_set_information('source', "file1")
+option_8 = OptionDescription(name="files", doc="files", children=[option_9])
+option_12 = BoolOption(name="activate", doc="activate", default=True)
+option_13 = BoolOption(name="manage", doc="manage", default=True)
+option_7 = OptionDescription(name="test", doc="test", children=[option_8, option_12, option_13])
+option_6 = OptionDescription(name="services", doc="services", children=[option_7], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_6])
diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param2/00-base.xml b/tests/dictionaries_old/10load_disabled_if_in_multi_param2/00-base.xml
new file mode 100644
index 00000000..484e1917
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in_multi_param2/00-base.xml
@@ -0,0 +1,35 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="test">
+      <file filelist="afilllist">/tmp/file1</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>no</value>
+      </variable>
+      <variable name="condition2" type="string" description="No change">
+        <value>no</value>
+      </variable>
+      <variable name="test_variable" type="string" description="No change" hidden="True">
+        <value>no</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>yes</param>
+      <param>maybe</param>
+      <target type="variable">test_variable</target>
+      <target type="filelist">afilllist</target>
+    </condition>
+    <condition name="disabled_if_in" source="condition2">
+      <param>yes</param>
+      <param>maybe</param>
+      <target type="variable">test_variable</target>
+      <target type="filelist">afilllist</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param2/__init__.py b/tests/dictionaries_old/10load_disabled_if_in_multi_param2/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param2/makedict/after.json b/tests/dictionaries_old/10load_disabled_if_in_multi_param2/makedict/after.json
new file mode 100644
index 00000000..c9549083
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in_multi_param2/makedict/after.json
@@ -0,0 +1,30 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "no"
+    },
+    "rougail.general.condition2": {
+        "owner": "default",
+        "value": "no"
+    },
+    "rougail.general.test_variable": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.files.file1.name": {
+        "owner": "default",
+        "value": "/tmp/file1"
+    },
+    "services.test.files.file1.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param2/makedict/base.json b/tests/dictionaries_old/10load_disabled_if_in_multi_param2/makedict/base.json
new file mode 100644
index 00000000..16da02ea
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in_multi_param2/makedict/base.json
@@ -0,0 +1,9 @@
+{
+    "rougail.general.condition": "no",
+    "rougail.general.condition2": "no",
+    "rougail.general.test_variable": "no",
+    "services.test.files.file1.name": "/tmp/file1",
+    "services.test.files.file1.activate": true,
+    "services.test.activate": true,
+    "services.test.manage": true
+}
diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param2/makedict/before.json b/tests/dictionaries_old/10load_disabled_if_in_multi_param2/makedict/before.json
new file mode 100644
index 00000000..c9549083
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in_multi_param2/makedict/before.json
@@ -0,0 +1,30 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "no"
+    },
+    "rougail.general.condition2": {
+        "owner": "default",
+        "value": "no"
+    },
+    "rougail.general.test_variable": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.files.file1.name": {
+        "owner": "default",
+        "value": "/tmp/file1"
+    },
+    "services.test.files.file1.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param2/tiramisu/base.py b/tests/dictionaries_old/10load_disabled_if_in_multi_param2/tiramisu/base.py
new file mode 100644
index 00000000..630e84d0
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in_multi_param2/tiramisu/base.py
@@ -0,0 +1,28 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="condition", doc="No change", default="no", properties=frozenset({"mandatory", "normal"}))
+option_4 = StrOption(name="condition2", doc="No change", default="no", properties=frozenset({"mandatory", "normal"}))
+option_5 = StrOption(name="test_variable", doc="No change", default="no", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("yes")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True, notraisepropertyerror=True), 'expected': ParamValue("yes")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe")}))}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_10 = FilenameOption(name="name", doc="name", default="/tmp/file1")
+option_11 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, notraisepropertyerror=True), 'expected_0': ParamValue(["yes", "maybe"]), 'condition_operator': ParamValue("OR"), 'condition_1': ParamOption(option_4, notraisepropertyerror=True), 'expected_1': ParamValue(["yes", "maybe"])})))
+option_9 = OptionDescription(name="file1", doc="file1", children=[option_10, option_11])
+option_9.impl_set_information('source', "file1")
+option_8 = OptionDescription(name="files", doc="files", children=[option_9])
+option_12 = BoolOption(name="activate", doc="activate", default=True)
+option_13 = BoolOption(name="manage", doc="manage", default=True)
+option_7 = OptionDescription(name="test", doc="test", children=[option_8, option_12, option_13])
+option_6 = OptionDescription(name="services", doc="services", children=[option_7], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_6])
diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param3/00-base.xml b/tests/dictionaries_old/10load_disabled_if_in_multi_param3/00-base.xml
new file mode 100644
index 00000000..6162a26e
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in_multi_param3/00-base.xml
@@ -0,0 +1,35 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="test">
+      <file filelist="afilllist">/tmp/file1</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>no</value>
+      </variable>
+      <variable name="condition2" type="string" description="No change">
+        <value>no</value>
+      </variable>
+      <variable name="test_variable" type="string" description="No change" hidden="True">
+        <value>no</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_not_in" source="condition">
+      <param>yes</param>
+      <param>maybe</param>
+      <target type="variable">test_variable</target>
+      <target type="filelist">afilllist</target>
+    </condition>
+    <condition name="disabled_if_in" source="condition2">
+      <param>yes</param>
+      <param>maybe</param>
+      <target type="variable">test_variable</target>
+      <target type="filelist">afilllist</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param3/__init__.py b/tests/dictionaries_old/10load_disabled_if_in_multi_param3/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param3/makedict/after.json b/tests/dictionaries_old/10load_disabled_if_in_multi_param3/makedict/after.json
new file mode 100644
index 00000000..fd86985c
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in_multi_param3/makedict/after.json
@@ -0,0 +1,26 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "no"
+    },
+    "rougail.general.condition2": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.files.file1.name": {
+        "owner": "default",
+        "value": "/tmp/file1"
+    },
+    "services.test.files.file1.activate": {
+        "owner": "default",
+        "value": false
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param3/makedict/base.json b/tests/dictionaries_old/10load_disabled_if_in_multi_param3/makedict/base.json
new file mode 100644
index 00000000..2d19d40a
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in_multi_param3/makedict/base.json
@@ -0,0 +1,8 @@
+{
+    "rougail.general.condition": "no",
+    "rougail.general.condition2": "no",
+    "services.test.files.file1.name": "/tmp/file1",
+    "services.test.files.file1.activate": false,
+    "services.test.activate": true,
+    "services.test.manage": true
+}
diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param3/makedict/before.json b/tests/dictionaries_old/10load_disabled_if_in_multi_param3/makedict/before.json
new file mode 100644
index 00000000..fd86985c
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in_multi_param3/makedict/before.json
@@ -0,0 +1,26 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "no"
+    },
+    "rougail.general.condition2": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.files.file1.name": {
+        "owner": "default",
+        "value": "/tmp/file1"
+    },
+    "services.test.files.file1.activate": {
+        "owner": "default",
+        "value": false
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param3/tiramisu/base.py b/tests/dictionaries_old/10load_disabled_if_in_multi_param3/tiramisu/base.py
new file mode 100644
index 00000000..3be64117
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in_multi_param3/tiramisu/base.py
@@ -0,0 +1,28 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="condition", doc="No change", default="no", properties=frozenset({"mandatory", "normal"}))
+option_4 = StrOption(name="condition2", doc="No change", default="no", properties=frozenset({"mandatory", "normal"}))
+option_5 = StrOption(name="test_variable", doc="No change", default="no", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("yes"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True, notraisepropertyerror=True), 'expected': ParamValue("yes")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe")}))}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_10 = FilenameOption(name="name", doc="name", default="/tmp/file1")
+option_11 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, notraisepropertyerror=True), 'expected_0': ParamValue(["yes", "maybe"]), 'reverse_condition_0': ParamValue(True), 'condition_operator': ParamValue("OR"), 'condition_1': ParamOption(option_4, notraisepropertyerror=True), 'expected_1': ParamValue(["yes", "maybe"])})))
+option_9 = OptionDescription(name="file1", doc="file1", children=[option_10, option_11])
+option_9.impl_set_information('source', "file1")
+option_8 = OptionDescription(name="files", doc="files", children=[option_9])
+option_12 = BoolOption(name="activate", doc="activate", default=True)
+option_13 = BoolOption(name="manage", doc="manage", default=True)
+option_7 = OptionDescription(name="test", doc="test", children=[option_8, option_12, option_13])
+option_6 = OptionDescription(name="services", doc="services", children=[option_7], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_6])
diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param4/00-base.xml b/tests/dictionaries_old/10load_disabled_if_in_multi_param4/00-base.xml
new file mode 100644
index 00000000..efd763d3
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in_multi_param4/00-base.xml
@@ -0,0 +1,35 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="test">
+      <file filelist="afilllist">/tmp/file1</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>yes</value>
+      </variable>
+      <variable name="condition2" type="string" description="No change">
+        <value>no</value>
+      </variable>
+      <variable name="test_variable" type="string" description="No change" hidden="True">
+        <value>no</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_not_in" source="condition">
+      <param>yes</param>
+      <param>maybe</param>
+      <target type="variable">test_variable</target>
+      <target type="filelist">afilllist</target>
+    </condition>
+    <condition name="disabled_if_in" source="condition2">
+      <param>yes</param>
+      <param>maybe</param>
+      <target type="variable">test_variable</target>
+      <target type="filelist">afilllist</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param4/__init__.py b/tests/dictionaries_old/10load_disabled_if_in_multi_param4/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param4/makedict/after.json b/tests/dictionaries_old/10load_disabled_if_in_multi_param4/makedict/after.json
new file mode 100644
index 00000000..15742a7a
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in_multi_param4/makedict/after.json
@@ -0,0 +1,26 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "yes"
+    },
+    "rougail.general.condition2": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.files.file1.name": {
+        "owner": "default",
+        "value": "/tmp/file1"
+    },
+    "services.test.files.file1.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param4/makedict/base.json b/tests/dictionaries_old/10load_disabled_if_in_multi_param4/makedict/base.json
new file mode 100644
index 00000000..728fe8b4
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in_multi_param4/makedict/base.json
@@ -0,0 +1,8 @@
+{
+    "rougail.general.condition": "yes",
+    "rougail.general.condition2": "no",
+    "services.test.files.file1.name": "/tmp/file1",
+    "services.test.files.file1.activate": true,
+    "services.test.activate": true,
+    "services.test.manage": true
+}
diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param4/makedict/before.json b/tests/dictionaries_old/10load_disabled_if_in_multi_param4/makedict/before.json
new file mode 100644
index 00000000..15742a7a
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in_multi_param4/makedict/before.json
@@ -0,0 +1,26 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "yes"
+    },
+    "rougail.general.condition2": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.files.file1.name": {
+        "owner": "default",
+        "value": "/tmp/file1"
+    },
+    "services.test.files.file1.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param4/tiramisu/base.py b/tests/dictionaries_old/10load_disabled_if_in_multi_param4/tiramisu/base.py
new file mode 100644
index 00000000..5aae7fb0
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in_multi_param4/tiramisu/base.py
@@ -0,0 +1,28 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="condition", doc="No change", default="yes", properties=frozenset({"mandatory", "normal"}))
+option_4 = StrOption(name="condition2", doc="No change", default="no", properties=frozenset({"mandatory", "normal"}))
+option_5 = StrOption(name="test_variable", doc="No change", default="no", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("yes"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True, notraisepropertyerror=True), 'expected': ParamValue("yes")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe")}))}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_10 = FilenameOption(name="name", doc="name", default="/tmp/file1")
+option_11 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, notraisepropertyerror=True), 'expected_0': ParamValue(["yes", "maybe"]), 'reverse_condition_0': ParamValue(True), 'condition_operator': ParamValue("OR"), 'condition_1': ParamOption(option_4, notraisepropertyerror=True), 'expected_1': ParamValue(["yes", "maybe"])})))
+option_9 = OptionDescription(name="file1", doc="file1", children=[option_10, option_11])
+option_9.impl_set_information('source', "file1")
+option_8 = OptionDescription(name="files", doc="files", children=[option_9])
+option_12 = BoolOption(name="activate", doc="activate", default=True)
+option_13 = BoolOption(name="manage", doc="manage", default=True)
+option_7 = OptionDescription(name="test", doc="test", children=[option_8, option_12, option_13])
+option_6 = OptionDescription(name="services", doc="services", children=[option_7], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_6])
diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param5/00-base.xml b/tests/dictionaries_old/10load_disabled_if_in_multi_param5/00-base.xml
new file mode 100644
index 00000000..927f5011
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in_multi_param5/00-base.xml
@@ -0,0 +1,35 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="test">
+      <file filelist="afilllist">/tmp/file1</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>yes</value>
+      </variable>
+      <variable name="condition2" type="string" description="No change">
+        <value>yes</value>
+      </variable>
+      <variable name="test_variable" type="string" description="No change" hidden="True">
+        <value>no</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_not_in" source="condition">
+      <param>yes</param>
+      <param>maybe</param>
+      <target type="variable">test_variable</target>
+      <target type="filelist">afilllist</target>
+    </condition>
+    <condition name="disabled_if_in" source="condition2">
+      <param>yes</param>
+      <param>maybe</param>
+      <target type="variable">test_variable</target>
+      <target type="filelist">afilllist</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param5/__init__.py b/tests/dictionaries_old/10load_disabled_if_in_multi_param5/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param5/makedict/after.json b/tests/dictionaries_old/10load_disabled_if_in_multi_param5/makedict/after.json
new file mode 100644
index 00000000..dfe546f1
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in_multi_param5/makedict/after.json
@@ -0,0 +1,26 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "yes"
+    },
+    "rougail.general.condition2": {
+        "owner": "default",
+        "value": "yes"
+    },
+    "services.test.files.file1.name": {
+        "owner": "default",
+        "value": "/tmp/file1"
+    },
+    "services.test.files.file1.activate": {
+        "owner": "default",
+        "value": false
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param5/makedict/base.json b/tests/dictionaries_old/10load_disabled_if_in_multi_param5/makedict/base.json
new file mode 100644
index 00000000..3c256d76
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in_multi_param5/makedict/base.json
@@ -0,0 +1,8 @@
+{
+    "rougail.general.condition": "yes",
+    "rougail.general.condition2": "yes",
+    "services.test.files.file1.name": "/tmp/file1",
+    "services.test.files.file1.activate": false,
+    "services.test.activate": true,
+    "services.test.manage": true
+}
diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param5/makedict/before.json b/tests/dictionaries_old/10load_disabled_if_in_multi_param5/makedict/before.json
new file mode 100644
index 00000000..dfe546f1
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in_multi_param5/makedict/before.json
@@ -0,0 +1,26 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "yes"
+    },
+    "rougail.general.condition2": {
+        "owner": "default",
+        "value": "yes"
+    },
+    "services.test.files.file1.name": {
+        "owner": "default",
+        "value": "/tmp/file1"
+    },
+    "services.test.files.file1.activate": {
+        "owner": "default",
+        "value": false
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param5/tiramisu/base.py b/tests/dictionaries_old/10load_disabled_if_in_multi_param5/tiramisu/base.py
new file mode 100644
index 00000000..39957266
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in_multi_param5/tiramisu/base.py
@@ -0,0 +1,28 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="condition", doc="No change", default="yes", properties=frozenset({"mandatory", "normal"}))
+option_4 = StrOption(name="condition2", doc="No change", default="yes", properties=frozenset({"mandatory", "normal"}))
+option_5 = StrOption(name="test_variable", doc="No change", default="no", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("yes"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True, notraisepropertyerror=True), 'expected': ParamValue("yes")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe")}))}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_10 = FilenameOption(name="name", doc="name", default="/tmp/file1")
+option_11 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, notraisepropertyerror=True), 'expected_0': ParamValue(["yes", "maybe"]), 'reverse_condition_0': ParamValue(True), 'condition_operator': ParamValue("OR"), 'condition_1': ParamOption(option_4, notraisepropertyerror=True), 'expected_1': ParamValue(["yes", "maybe"])})))
+option_9 = OptionDescription(name="file1", doc="file1", children=[option_10, option_11])
+option_9.impl_set_information('source', "file1")
+option_8 = OptionDescription(name="files", doc="files", children=[option_9])
+option_12 = BoolOption(name="activate", doc="activate", default=True)
+option_13 = BoolOption(name="manage", doc="manage", default=True)
+option_7 = OptionDescription(name="test", doc="test", children=[option_8, option_12, option_13])
+option_6 = OptionDescription(name="services", doc="services", children=[option_7], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_6])
diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param6/00-base.xml b/tests/dictionaries_old/10load_disabled_if_in_multi_param6/00-base.xml
new file mode 100644
index 00000000..260193cd
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in_multi_param6/00-base.xml
@@ -0,0 +1,35 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="test">
+      <file filelist="afilllist">/tmp/file1</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>no</value>
+      </variable>
+      <variable name="condition2" type="string" description="No change">
+        <value>yes</value>
+      </variable>
+      <variable name="test_variable" type="string" description="No change" hidden="True">
+        <value>no</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_not_in" source="condition">
+      <param>yes</param>
+      <param>maybe</param>
+      <target type="variable">test_variable</target>
+      <target type="filelist">afilllist</target>
+    </condition>
+    <condition name="disabled_if_in" source="condition2">
+      <param>yes</param>
+      <param>maybe</param>
+      <target type="variable">test_variable</target>
+      <target type="filelist">afilllist</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param6/__init__.py b/tests/dictionaries_old/10load_disabled_if_in_multi_param6/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param6/makedict/after.json b/tests/dictionaries_old/10load_disabled_if_in_multi_param6/makedict/after.json
new file mode 100644
index 00000000..1085d3ec
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in_multi_param6/makedict/after.json
@@ -0,0 +1,26 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "no"
+    },
+    "rougail.general.condition2": {
+        "owner": "default",
+        "value": "yes"
+    },
+    "services.test.files.file1.name": {
+        "owner": "default",
+        "value": "/tmp/file1"
+    },
+    "services.test.files.file1.activate": {
+        "owner": "default",
+        "value": false
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param6/makedict/base.json b/tests/dictionaries_old/10load_disabled_if_in_multi_param6/makedict/base.json
new file mode 100644
index 00000000..089759dc
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in_multi_param6/makedict/base.json
@@ -0,0 +1,8 @@
+{
+    "rougail.general.condition": "no",
+    "rougail.general.condition2": "yes",
+    "services.test.files.file1.name": "/tmp/file1",
+    "services.test.files.file1.activate": false,
+    "services.test.activate": true,
+    "services.test.manage": true
+}
diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param6/makedict/before.json b/tests/dictionaries_old/10load_disabled_if_in_multi_param6/makedict/before.json
new file mode 100644
index 00000000..1085d3ec
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in_multi_param6/makedict/before.json
@@ -0,0 +1,26 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "no"
+    },
+    "rougail.general.condition2": {
+        "owner": "default",
+        "value": "yes"
+    },
+    "services.test.files.file1.name": {
+        "owner": "default",
+        "value": "/tmp/file1"
+    },
+    "services.test.files.file1.activate": {
+        "owner": "default",
+        "value": false
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param6/tiramisu/base.py b/tests/dictionaries_old/10load_disabled_if_in_multi_param6/tiramisu/base.py
new file mode 100644
index 00000000..3f81787c
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in_multi_param6/tiramisu/base.py
@@ -0,0 +1,28 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="condition", doc="No change", default="no", properties=frozenset({"mandatory", "normal"}))
+option_4 = StrOption(name="condition2", doc="No change", default="yes", properties=frozenset({"mandatory", "normal"}))
+option_5 = StrOption(name="test_variable", doc="No change", default="no", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("yes"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True, notraisepropertyerror=True), 'expected': ParamValue("yes")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe")}))}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_10 = FilenameOption(name="name", doc="name", default="/tmp/file1")
+option_11 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, notraisepropertyerror=True), 'expected_0': ParamValue(["yes", "maybe"]), 'reverse_condition_0': ParamValue(True), 'condition_operator': ParamValue("OR"), 'condition_1': ParamOption(option_4, notraisepropertyerror=True), 'expected_1': ParamValue(["yes", "maybe"])})))
+option_9 = OptionDescription(name="file1", doc="file1", children=[option_10, option_11])
+option_9.impl_set_information('source', "file1")
+option_8 = OptionDescription(name="files", doc="files", children=[option_9])
+option_12 = BoolOption(name="activate", doc="activate", default=True)
+option_13 = BoolOption(name="manage", doc="manage", default=True)
+option_7 = OptionDescription(name="test", doc="test", children=[option_8, option_12, option_13])
+option_6 = OptionDescription(name="services", doc="services", children=[option_7], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_6])
diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param_disabled/00-base.xml b/tests/dictionaries_old/10load_disabled_if_in_multi_param_disabled/00-base.xml
new file mode 100644
index 00000000..08b06a1a
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in_multi_param_disabled/00-base.xml
@@ -0,0 +1,30 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="test">
+      <file filelist="afilllist">/tmp/file1</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>oui</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>oui</param>
+      <param>maybe</param>
+      <target type="variable">mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+      <target type="filelist">afilllist</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param_disabled/__init__.py b/tests/dictionaries_old/10load_disabled_if_in_multi_param_disabled/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param_disabled/makedict/after.json b/tests/dictionaries_old/10load_disabled_if_in_multi_param_disabled/makedict/after.json
new file mode 100644
index 00000000..3d60ca6a
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in_multi_param_disabled/makedict/after.json
@@ -0,0 +1,22 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "oui"
+    },
+    "services.test.files.file1.name": {
+        "owner": "default",
+        "value": "/tmp/file1"
+    },
+    "services.test.files.file1.activate": {
+        "owner": "default",
+        "value": false
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param_disabled/makedict/base.json b/tests/dictionaries_old/10load_disabled_if_in_multi_param_disabled/makedict/base.json
new file mode 100644
index 00000000..0190e501
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in_multi_param_disabled/makedict/base.json
@@ -0,0 +1,7 @@
+{
+    "rougail.general.condition": "oui",
+    "services.test.files.file1.name": "/tmp/file1",
+    "services.test.files.file1.activate": false,
+    "services.test.activate": true,
+    "services.test.manage": true
+}
diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param_disabled/makedict/before.json b/tests/dictionaries_old/10load_disabled_if_in_multi_param_disabled/makedict/before.json
new file mode 100644
index 00000000..3d60ca6a
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in_multi_param_disabled/makedict/before.json
@@ -0,0 +1,22 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "oui"
+    },
+    "services.test.files.file1.name": {
+        "owner": "default",
+        "value": "/tmp/file1"
+    },
+    "services.test.files.file1.activate": {
+        "owner": "default",
+        "value": false
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param_disabled/tiramisu/base.py b/tests/dictionaries_old/10load_disabled_if_in_multi_param_disabled/tiramisu/base.py
new file mode 100644
index 00000000..051e6a7c
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in_multi_param_disabled/tiramisu/base.py
@@ -0,0 +1,28 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="condition", doc="No change", default="oui", properties=frozenset({"mandatory", "normal"}))
+option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe")}))}))
+option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe")}))}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_10 = FilenameOption(name="name", doc="name", default="/tmp/file1")
+option_11 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, notraisepropertyerror=True), 'expected_0': ParamValue(["oui", "maybe"]), 'condition_operator': ParamValue("OR")})))
+option_9 = OptionDescription(name="file1", doc="file1", children=[option_10, option_11])
+option_9.impl_set_information('source', "file1")
+option_8 = OptionDescription(name="files", doc="files", children=[option_9])
+option_12 = BoolOption(name="activate", doc="activate", default=True)
+option_13 = BoolOption(name="manage", doc="manage", default=True)
+option_7 = OptionDescription(name="test", doc="test", children=[option_8, option_12, option_13])
+option_6 = OptionDescription(name="services", doc="services", children=[option_7], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_6])
diff --git a/tests/dictionaries_old/10load_disabled_if_in_none/00-base.xml b/tests/dictionaries_old/10load_disabled_if_in_none/00-base.xml
new file mode 100644
index 00000000..800f3a57
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in_none/00-base.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param type="nil"/>
+      <target type="variable">mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10load_disabled_if_in_none/__init__.py b/tests/dictionaries_old/10load_disabled_if_in_none/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10load_disabled_if_in_none/makedict/after.json b/tests/dictionaries_old/10load_disabled_if_in_none/makedict/after.json
new file mode 100644
index 00000000..f51f5230
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in_none/makedict/after.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/10load_disabled_if_in_none/makedict/base.json b/tests/dictionaries_old/10load_disabled_if_in_none/makedict/base.json
new file mode 100644
index 00000000..c6e0314e
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in_none/makedict/base.json
@@ -0,0 +1,5 @@
+{
+    "rougail.general.condition": "non",
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general.mode_conteneur_actif2": "non"
+}
diff --git a/tests/dictionaries_old/10load_disabled_if_in_none/makedict/before.json b/tests/dictionaries_old/10load_disabled_if_in_none/makedict/before.json
new file mode 100644
index 00000000..f51f5230
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in_none/makedict/before.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/10load_disabled_if_in_none/tiramisu/base.py b/tests/dictionaries_old/10load_disabled_if_in_none/tiramisu/base.py
new file mode 100644
index 00000000..fe7322c1
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in_none/tiramisu/base.py
@@ -0,0 +1,19 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue(None)}))}))
+option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue(None)}))}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10load_disabled_if_in_twice/00-base.xml b/tests/dictionaries_old/10load_disabled_if_in_twice/00-base.xml
new file mode 100644
index 00000000..62b61a96
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in_twice/00-base.xml
@@ -0,0 +1,24 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <variable name="my_var1">
+      <value>no</value>
+    </variable>
+    <variable name="my_var2">
+      <value>no</value>
+    </variable>
+    <variable name="my_var3">
+      <value>no</value>
+    </variable>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="my_var1">
+      <param>no</param>
+      <target type="variable">my_var2</target>
+    </condition>
+    <condition name="disabled_if_in" source="my_var2">
+      <param>no</param>
+      <target type="variable">my_var3</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10load_disabled_if_in_twice/__init__.py b/tests/dictionaries_old/10load_disabled_if_in_twice/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10load_disabled_if_in_twice/makedict/after.json b/tests/dictionaries_old/10load_disabled_if_in_twice/makedict/after.json
new file mode 100644
index 00000000..41b04961
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in_twice/makedict/after.json
@@ -0,0 +1,6 @@
+{
+    "rougail.my_var1": {
+        "owner": "default",
+        "value": "no"
+    }
+}
diff --git a/tests/dictionaries_old/10load_disabled_if_in_twice/makedict/base.json b/tests/dictionaries_old/10load_disabled_if_in_twice/makedict/base.json
new file mode 100644
index 00000000..1978f1f4
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in_twice/makedict/base.json
@@ -0,0 +1,3 @@
+{
+    "rougail.my_var1": "no"
+}
diff --git a/tests/dictionaries_old/10load_disabled_if_in_twice/makedict/before.json b/tests/dictionaries_old/10load_disabled_if_in_twice/makedict/before.json
new file mode 100644
index 00000000..41b04961
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in_twice/makedict/before.json
@@ -0,0 +1,6 @@
+{
+    "rougail.my_var1": {
+        "owner": "default",
+        "value": "no"
+    }
+}
diff --git a/tests/dictionaries_old/10load_disabled_if_in_twice/tiramisu/base.py b/tests/dictionaries_old/10load_disabled_if_in_twice/tiramisu/base.py
new file mode 100644
index 00000000..b0c31d57
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in_twice/tiramisu/base.py
@@ -0,0 +1,18 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_2 = StrOption(name="my_var1", doc="my_var1", default="no", properties=frozenset({"mandatory", "normal"}))
+option_3 = StrOption(name="my_var2", doc="my_var2", default="no", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("no")}))}))
+option_4 = StrOption(name="my_var3", doc="my_var3", default="no", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("no")}))}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_3, option_4])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10load_disabled_if_in_variable/00-base.xml b/tests/dictionaries_old/10load_disabled_if_in_variable/00-base.xml
new file mode 100644
index 00000000..72bcbb58
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in_variable/00-base.xml
@@ -0,0 +1,28 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>tous</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>tous</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>tous</param>
+      <param>authentifié</param>
+      <param>aucun</param>
+      <target>condition</target>
+    </check>
+    <condition name="disabled_if_in" source="condition">
+      <param type="variable">mode_conteneur_actif</param>
+      <target type="variable">mode_conteneur_actif2</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10load_disabled_if_in_variable/__init__.py b/tests/dictionaries_old/10load_disabled_if_in_variable/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10load_disabled_if_in_variable/makedict/after.json b/tests/dictionaries_old/10load_disabled_if_in_variable/makedict/after.json
new file mode 100644
index 00000000..685d00af
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in_variable/makedict/after.json
@@ -0,0 +1,10 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "tous"
+    },
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "tous"
+    }
+}
diff --git a/tests/dictionaries_old/10load_disabled_if_in_variable/makedict/base.json b/tests/dictionaries_old/10load_disabled_if_in_variable/makedict/base.json
new file mode 100644
index 00000000..7ae93283
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in_variable/makedict/base.json
@@ -0,0 +1,4 @@
+{
+    "rougail.general.condition": "tous",
+    "rougail.general.mode_conteneur_actif": "tous"
+}
diff --git a/tests/dictionaries_old/10load_disabled_if_in_variable/makedict/before.json b/tests/dictionaries_old/10load_disabled_if_in_variable/makedict/before.json
new file mode 100644
index 00000000..685d00af
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in_variable/makedict/before.json
@@ -0,0 +1,10 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "tous"
+    },
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "tous"
+    }
+}
diff --git a/tests/dictionaries_old/10load_disabled_if_in_variable/tiramisu/base.py b/tests/dictionaries_old/10load_disabled_if_in_variable/tiramisu/base.py
new file mode 100644
index 00000000..4d25c74b
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in_variable/tiramisu/base.py
@@ -0,0 +1,19 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = ChoiceOption(name="condition", doc="No change", values=('tous', 'authentifié', 'aucun'), default="tous", properties=frozenset({"mandatory", "normal"}))
+option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="tous", properties=frozenset({"mandatory", "normal"}))
+option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamOption(option_4)}))}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10load_disabled_if_in_variable2/00-base.xml b/tests/dictionaries_old/10load_disabled_if_in_variable2/00-base.xml
new file mode 100644
index 00000000..8ffd2b0f
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in_variable2/00-base.xml
@@ -0,0 +1,28 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>tous</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>aucun</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>tous</param>
+      <param>authentifié</param>
+      <param>aucun</param>
+      <target>condition</target>
+    </check>
+    <condition name="disabled_if_in" source="condition">
+      <param type="variable">mode_conteneur_actif</param>
+      <target type="variable">mode_conteneur_actif2</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10load_disabled_if_in_variable2/__init__.py b/tests/dictionaries_old/10load_disabled_if_in_variable2/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10load_disabled_if_in_variable2/makedict/after.json b/tests/dictionaries_old/10load_disabled_if_in_variable2/makedict/after.json
new file mode 100644
index 00000000..60ac9663
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in_variable2/makedict/after.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "tous"
+    },
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "aucun"
+    },
+    "rougail.general.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/10load_disabled_if_in_variable2/makedict/base.json b/tests/dictionaries_old/10load_disabled_if_in_variable2/makedict/base.json
new file mode 100644
index 00000000..450218a7
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in_variable2/makedict/base.json
@@ -0,0 +1,5 @@
+{
+    "rougail.general.condition": "tous",
+    "rougail.general.mode_conteneur_actif": "aucun",
+    "rougail.general.mode_conteneur_actif2": "non"
+}
diff --git a/tests/dictionaries_old/10load_disabled_if_in_variable2/makedict/before.json b/tests/dictionaries_old/10load_disabled_if_in_variable2/makedict/before.json
new file mode 100644
index 00000000..60ac9663
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in_variable2/makedict/before.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "tous"
+    },
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "aucun"
+    },
+    "rougail.general.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/10load_disabled_if_in_variable2/tiramisu/base.py b/tests/dictionaries_old/10load_disabled_if_in_variable2/tiramisu/base.py
new file mode 100644
index 00000000..9299ae2b
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_in_variable2/tiramisu/base.py
@@ -0,0 +1,19 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = ChoiceOption(name="condition", doc="No change", values=('tous', 'authentifié', 'aucun'), default="tous", properties=frozenset({"mandatory", "normal"}))
+option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="aucun", properties=frozenset({"mandatory", "normal"}))
+option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamOption(option_4)}))}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10load_disabled_if_not_in_fallback/00-base.xml b/tests/dictionaries_old/10load_disabled_if_not_in_fallback/00-base.xml
new file mode 100644
index 00000000..71ba8102
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_not_in_fallback/00-base.xml
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="test">
+      <file filelist="afilllist">/tmp/file1</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>no</value>
+      </variable>
+      <variable name="disable_variable" type="string" description="No change">
+        <value>no</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_not_in" source="unknown" optional="True">
+      <param>no</param>
+      <target type="variable">disable_variable</target>
+      <target type="filelist">afilllist</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10load_disabled_if_not_in_fallback/__init__.py b/tests/dictionaries_old/10load_disabled_if_not_in_fallback/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10load_disabled_if_not_in_fallback/makedict/after.json b/tests/dictionaries_old/10load_disabled_if_not_in_fallback/makedict/after.json
new file mode 100644
index 00000000..4fc26870
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_not_in_fallback/makedict/after.json
@@ -0,0 +1,26 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "no"
+    },
+    "rougail.general.disable_variable": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.files.file1.name": {
+        "owner": "default",
+        "value": "/tmp/file1"
+    },
+    "services.test.files.file1.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/10load_disabled_if_not_in_fallback/makedict/base.json b/tests/dictionaries_old/10load_disabled_if_not_in_fallback/makedict/base.json
new file mode 100644
index 00000000..431665f1
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_not_in_fallback/makedict/base.json
@@ -0,0 +1,8 @@
+{
+    "rougail.general.condition": "no",
+    "rougail.general.disable_variable": "no",
+    "services.test.files.file1.name": "/tmp/file1",
+    "services.test.files.file1.activate": true,
+    "services.test.activate": true,
+    "services.test.manage": true
+}
diff --git a/tests/dictionaries_old/10load_disabled_if_not_in_fallback/makedict/before.json b/tests/dictionaries_old/10load_disabled_if_not_in_fallback/makedict/before.json
new file mode 100644
index 00000000..4fc26870
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_not_in_fallback/makedict/before.json
@@ -0,0 +1,26 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "no"
+    },
+    "rougail.general.disable_variable": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.files.file1.name": {
+        "owner": "default",
+        "value": "/tmp/file1"
+    },
+    "services.test.files.file1.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/10load_disabled_if_not_in_fallback/tiramisu/base.py b/tests/dictionaries_old/10load_disabled_if_not_in_fallback/tiramisu/base.py
new file mode 100644
index 00000000..11a6c060
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_not_in_fallback/tiramisu/base.py
@@ -0,0 +1,27 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="condition", doc="No change", default="no", properties=frozenset({"mandatory", "normal"}))
+option_4 = StrOption(name="disable_variable", doc="No change", default="no", properties=frozenset({"mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_9 = FilenameOption(name="name", doc="name", default="/tmp/file1")
+option_10 = BoolOption(name="activate", doc="activate", default=True)
+option_8 = OptionDescription(name="file1", doc="file1", children=[option_9, option_10])
+option_8.impl_set_information('source', "file1")
+option_7 = OptionDescription(name="files", doc="files", children=[option_8])
+option_11 = BoolOption(name="activate", doc="activate", default=True)
+option_12 = BoolOption(name="manage", doc="manage", default=True)
+option_6 = OptionDescription(name="test", doc="test", children=[option_7, option_11, option_12])
+option_5 = OptionDescription(name="services", doc="services", children=[option_6], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_5])
diff --git a/tests/dictionaries_old/10load_disabled_if_not_in_fallback_force/00-base.xml b/tests/dictionaries_old/10load_disabled_if_not_in_fallback_force/00-base.xml
new file mode 100644
index 00000000..9946d579
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_not_in_fallback_force/00-base.xml
@@ -0,0 +1,28 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_not_in" source="unknown" apply_on_fallback="True" optional="True">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+      <target type="filelist">afilllist</target>
+    </condition>
+    <condition name="disabled_if_not_in" source="activer_client_ldap" optional="True">
+      <param>non</param>
+      <target type="variable">mode_conteneur_actif</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10load_disabled_if_not_in_fallback_force/__init__.py b/tests/dictionaries_old/10load_disabled_if_not_in_fallback_force/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10load_disabled_if_not_in_fallback_force/makedict/after.json b/tests/dictionaries_old/10load_disabled_if_not_in_fallback_force/makedict/after.json
new file mode 100644
index 00000000..3ecfa661
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_not_in_fallback_force/makedict/after.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/10load_disabled_if_not_in_fallback_force/makedict/base.json b/tests/dictionaries_old/10load_disabled_if_not_in_fallback_force/makedict/base.json
new file mode 100644
index 00000000..c2441e80
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_not_in_fallback_force/makedict/base.json
@@ -0,0 +1,3 @@
+{
+    "rougail.general.condition": "non"
+}
diff --git a/tests/dictionaries_old/10load_disabled_if_not_in_fallback_force/makedict/before.json b/tests/dictionaries_old/10load_disabled_if_not_in_fallback_force/makedict/before.json
new file mode 100644
index 00000000..3ecfa661
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_not_in_fallback_force/makedict/before.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/10load_disabled_if_not_in_fallback_force/tiramisu/base.py b/tests/dictionaries_old/10load_disabled_if_not_in_fallback_force/tiramisu/base.py
new file mode 100644
index 00000000..f3e3b36c
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabled_if_not_in_fallback_force/tiramisu/base.py
@@ -0,0 +1,19 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"disabled", "mandatory", "normal"}))
+option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"disabled", "mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10load_disabledifin_fallback/00-base.xml b/tests/dictionaries_old/10load_disabledifin_fallback/00-base.xml
new file mode 100644
index 00000000..8a051838
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabledifin_fallback/00-base.xml
@@ -0,0 +1,27 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+    </condition>
+    <condition name="disabled_if_in" source="activer_client_ldap" optional="True">
+      <param>non</param>
+      <target type="variable">mode_conteneur_actif</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10load_disabledifin_fallback/__init__.py b/tests/dictionaries_old/10load_disabledifin_fallback/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10load_disabledifin_fallback/makedict/after.json b/tests/dictionaries_old/10load_disabledifin_fallback/makedict/after.json
new file mode 100644
index 00000000..c0cfea30
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabledifin_fallback/makedict/after.json
@@ -0,0 +1,10 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/10load_disabledifin_fallback/makedict/base.json b/tests/dictionaries_old/10load_disabledifin_fallback/makedict/base.json
new file mode 100644
index 00000000..afb429c0
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabledifin_fallback/makedict/base.json
@@ -0,0 +1,4 @@
+{
+    "rougail.general.condition": "non",
+    "rougail.general.mode_conteneur_actif2": "non"
+}
diff --git a/tests/dictionaries_old/10load_disabledifin_fallback/makedict/before.json b/tests/dictionaries_old/10load_disabledifin_fallback/makedict/before.json
new file mode 100644
index 00000000..c0cfea30
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabledifin_fallback/makedict/before.json
@@ -0,0 +1,10 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/10load_disabledifin_fallback/tiramisu/base.py b/tests/dictionaries_old/10load_disabledifin_fallback/tiramisu/base.py
new file mode 100644
index 00000000..3aed64dc
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabledifin_fallback/tiramisu/base.py
@@ -0,0 +1,19 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"disabled", "mandatory", "normal"}))
+option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10load_disabledifin_fallback_force/00-base.xml b/tests/dictionaries_old/10load_disabledifin_fallback_force/00-base.xml
new file mode 100644
index 00000000..16602a40
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabledifin_fallback_force/00-base.xml
@@ -0,0 +1,27 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+    </condition>
+    <condition name="disabled_if_in" source="activer_client_ldap" optional="True" apply_on_fallback="False">
+      <param>non</param>
+      <target type="variable">mode_conteneur_actif</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10load_disabledifin_fallback_force/__init__.py b/tests/dictionaries_old/10load_disabledifin_fallback_force/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10load_disabledifin_fallback_force/makedict/after.json b/tests/dictionaries_old/10load_disabledifin_fallback_force/makedict/after.json
new file mode 100644
index 00000000..f51f5230
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabledifin_fallback_force/makedict/after.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/10load_disabledifin_fallback_force/makedict/base.json b/tests/dictionaries_old/10load_disabledifin_fallback_force/makedict/base.json
new file mode 100644
index 00000000..c6e0314e
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabledifin_fallback_force/makedict/base.json
@@ -0,0 +1,5 @@
+{
+    "rougail.general.condition": "non",
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general.mode_conteneur_actif2": "non"
+}
diff --git a/tests/dictionaries_old/10load_disabledifin_fallback_force/makedict/before.json b/tests/dictionaries_old/10load_disabledifin_fallback_force/makedict/before.json
new file mode 100644
index 00000000..f51f5230
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabledifin_fallback_force/makedict/before.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/10load_disabledifin_fallback_force/tiramisu/base.py b/tests/dictionaries_old/10load_disabledifin_fallback_force/tiramisu/base.py
new file mode 100644
index 00000000..750899b5
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabledifin_fallback_force/tiramisu/base.py
@@ -0,0 +1,19 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))}))
+option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10load_disabledifin_whithouttype/00-base.xml b/tests/dictionaries_old/10load_disabledifin_whithouttype/00-base.xml
new file mode 100644
index 00000000..c94d3949
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabledifin_whithouttype/00-base.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>oui</param>
+      <target>mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10load_disabledifin_whithouttype/__init__.py b/tests/dictionaries_old/10load_disabledifin_whithouttype/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10load_disabledifin_whithouttype/makedict/after.json b/tests/dictionaries_old/10load_disabledifin_whithouttype/makedict/after.json
new file mode 100644
index 00000000..f51f5230
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabledifin_whithouttype/makedict/after.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/10load_disabledifin_whithouttype/makedict/base.json b/tests/dictionaries_old/10load_disabledifin_whithouttype/makedict/base.json
new file mode 100644
index 00000000..c6e0314e
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabledifin_whithouttype/makedict/base.json
@@ -0,0 +1,5 @@
+{
+    "rougail.general.condition": "non",
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general.mode_conteneur_actif2": "non"
+}
diff --git a/tests/dictionaries_old/10load_disabledifin_whithouttype/makedict/before.json b/tests/dictionaries_old/10load_disabledifin_whithouttype/makedict/before.json
new file mode 100644
index 00000000..f51f5230
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabledifin_whithouttype/makedict/before.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/10load_disabledifin_whithouttype/tiramisu/base.py b/tests/dictionaries_old/10load_disabledifin_whithouttype/tiramisu/base.py
new file mode 100644
index 00000000..750899b5
--- /dev/null
+++ b/tests/dictionaries_old/10load_disabledifin_whithouttype/tiramisu/base.py
@@ -0,0 +1,19 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))}))
+option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10load_emptyvalue/00-base.xml b/tests/dictionaries_old/10load_emptyvalue/00-base.xml
new file mode 100644
index 00000000..8e7d9ed6
--- /dev/null
+++ b/tests/dictionaries_old/10load_emptyvalue/00-base.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value/>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value/>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/10load_emptyvalue/__init__.py b/tests/dictionaries_old/10load_emptyvalue/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10load_emptyvalue/makedict/after.json b/tests/dictionaries_old/10load_emptyvalue/makedict/after.json
new file mode 100644
index 00000000..7539982e
--- /dev/null
+++ b/tests/dictionaries_old/10load_emptyvalue/makedict/after.json
@@ -0,0 +1,10 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": null
+    },
+    "rougail.general.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": null
+    }
+}
diff --git a/tests/dictionaries_old/10load_emptyvalue/makedict/base.json b/tests/dictionaries_old/10load_emptyvalue/makedict/base.json
new file mode 100644
index 00000000..121c737e
--- /dev/null
+++ b/tests/dictionaries_old/10load_emptyvalue/makedict/base.json
@@ -0,0 +1,4 @@
+{
+    "rougail.general.mode_conteneur_actif": null,
+    "rougail.general.mode_conteneur_actif2": null
+}
diff --git a/tests/dictionaries_old/10load_emptyvalue/makedict/before.json b/tests/dictionaries_old/10load_emptyvalue/makedict/before.json
new file mode 100644
index 00000000..7539982e
--- /dev/null
+++ b/tests/dictionaries_old/10load_emptyvalue/makedict/before.json
@@ -0,0 +1,10 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": null
+    },
+    "rougail.general.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": null
+    }
+}
diff --git a/tests/dictionaries_old/10load_emptyvalue/tiramisu/base.py b/tests/dictionaries_old/10load_emptyvalue/tiramisu/base.py
new file mode 100644
index 00000000..87b4d9e0
--- /dev/null
+++ b/tests/dictionaries_old/10load_emptyvalue/tiramisu/base.py
@@ -0,0 +1,18 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", properties=frozenset({"normal"}))
+option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", properties=frozenset({"normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10load_frozenifin/00-base.xml b/tests/dictionaries_old/10load_frozenifin/00-base.xml
new file mode 100644
index 00000000..7e7959f6
--- /dev/null
+++ b/tests/dictionaries_old/10load_frozenifin/00-base.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="hidden_if_in" source="condition">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10load_frozenifin/__init__.py b/tests/dictionaries_old/10load_frozenifin/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10load_frozenifin/makedict/after.json b/tests/dictionaries_old/10load_frozenifin/makedict/after.json
new file mode 100644
index 00000000..f51f5230
--- /dev/null
+++ b/tests/dictionaries_old/10load_frozenifin/makedict/after.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/10load_frozenifin/makedict/base.json b/tests/dictionaries_old/10load_frozenifin/makedict/base.json
new file mode 100644
index 00000000..c6e0314e
--- /dev/null
+++ b/tests/dictionaries_old/10load_frozenifin/makedict/base.json
@@ -0,0 +1,5 @@
+{
+    "rougail.general.condition": "non",
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general.mode_conteneur_actif2": "non"
+}
diff --git a/tests/dictionaries_old/10load_frozenifin/makedict/before.json b/tests/dictionaries_old/10load_frozenifin/makedict/before.json
new file mode 100644
index 00000000..f51f5230
--- /dev/null
+++ b/tests/dictionaries_old/10load_frozenifin/makedict/before.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/10load_frozenifin/tiramisu/base.py b/tests/dictionaries_old/10load_frozenifin/tiramisu/base.py
new file mode 100644
index 00000000..05a35bb4
--- /dev/null
+++ b/tests/dictionaries_old/10load_frozenifin/tiramisu/base.py
@@ -0,0 +1,19 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))}))
+option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10load_frozenifin_auto/00-base.xml b/tests/dictionaries_old/10load_frozenifin_auto/00-base.xml
new file mode 100644
index 00000000..1d11682a
--- /dev/null
+++ b/tests/dictionaries_old/10load_frozenifin_auto/00-base.xml
@@ -0,0 +1,27 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="hidden_if_in" source="condition">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+    </condition>
+    <fill name="calc_val">
+      <param>non</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10load_frozenifin_auto/__init__.py b/tests/dictionaries_old/10load_frozenifin_auto/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10load_frozenifin_auto/makedict/after.json b/tests/dictionaries_old/10load_frozenifin_auto/makedict/after.json
new file mode 100644
index 00000000..f51f5230
--- /dev/null
+++ b/tests/dictionaries_old/10load_frozenifin_auto/makedict/after.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/10load_frozenifin_auto/makedict/base.json b/tests/dictionaries_old/10load_frozenifin_auto/makedict/base.json
new file mode 100644
index 00000000..c6e0314e
--- /dev/null
+++ b/tests/dictionaries_old/10load_frozenifin_auto/makedict/base.json
@@ -0,0 +1,5 @@
+{
+    "rougail.general.condition": "non",
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general.mode_conteneur_actif2": "non"
+}
diff --git a/tests/dictionaries_old/10load_frozenifin_auto/makedict/before.json b/tests/dictionaries_old/10load_frozenifin_auto/makedict/before.json
new file mode 100644
index 00000000..f51f5230
--- /dev/null
+++ b/tests/dictionaries_old/10load_frozenifin_auto/makedict/before.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/10load_frozenifin_auto/tiramisu/base.py b/tests/dictionaries_old/10load_frozenifin_auto/tiramisu/base.py
new file mode 100644
index 00000000..48d2417e
--- /dev/null
+++ b/tests/dictionaries_old/10load_frozenifin_auto/tiramisu/base.py
@@ -0,0 +1,19 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params((ParamValue("non")))), properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))}))
+option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10load_frozenifin_multiparam/00-base.xml b/tests/dictionaries_old/10load_frozenifin_multiparam/00-base.xml
new file mode 100644
index 00000000..8a2d5d83
--- /dev/null
+++ b/tests/dictionaries_old/10load_frozenifin_multiparam/00-base.xml
@@ -0,0 +1,30 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>tous</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>tous</param>
+      <param>authentifié</param>
+      <param>aucun</param>
+      <target>condition</target>
+    </check>
+    <condition name="hidden_if_in" source="condition">
+      <param>tous</param>
+      <param>authentifié</param>
+      <target type="variable">mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10load_frozenifin_multiparam/__init__.py b/tests/dictionaries_old/10load_frozenifin_multiparam/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10load_frozenifin_multiparam/makedict/after.json b/tests/dictionaries_old/10load_frozenifin_multiparam/makedict/after.json
new file mode 100644
index 00000000..8647ce6a
--- /dev/null
+++ b/tests/dictionaries_old/10load_frozenifin_multiparam/makedict/after.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "tous"
+    },
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/10load_frozenifin_multiparam/makedict/base.json b/tests/dictionaries_old/10load_frozenifin_multiparam/makedict/base.json
new file mode 100644
index 00000000..13a9e66c
--- /dev/null
+++ b/tests/dictionaries_old/10load_frozenifin_multiparam/makedict/base.json
@@ -0,0 +1,5 @@
+{
+    "rougail.general.condition": "tous",
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general.mode_conteneur_actif2": "non"
+}
diff --git a/tests/dictionaries_old/10load_frozenifin_multiparam/makedict/before.json b/tests/dictionaries_old/10load_frozenifin_multiparam/makedict/before.json
new file mode 100644
index 00000000..8647ce6a
--- /dev/null
+++ b/tests/dictionaries_old/10load_frozenifin_multiparam/makedict/before.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "tous"
+    },
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/10load_frozenifin_multiparam/tiramisu/base.py b/tests/dictionaries_old/10load_frozenifin_multiparam/tiramisu/base.py
new file mode 100644
index 00000000..c42b9391
--- /dev/null
+++ b/tests/dictionaries_old/10load_frozenifin_multiparam/tiramisu/base.py
@@ -0,0 +1,19 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = ChoiceOption(name="condition", doc="No change", values=('tous', 'authentifié', 'aucun'), default="tous", properties=frozenset({"mandatory", "normal"}))
+option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("tous")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("tous")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("tous")})), Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("authentifié")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("authentifié")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("authentifié")}))}))
+option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("tous")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("tous")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("tous")})), Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("authentifié")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("authentifié")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("authentifié")}))}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10load_frozenifin_noexist/00-base.xml b/tests/dictionaries_old/10load_frozenifin_noexist/00-base.xml
new file mode 100644
index 00000000..83cac4d6
--- /dev/null
+++ b/tests/dictionaries_old/10load_frozenifin_noexist/00-base.xml
@@ -0,0 +1,30 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>tous</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>tous</param>
+      <param>authentifié</param>
+      <param>aucun</param>
+      <target>condition</target>
+    </check>
+    <condition name="hidden_if_in" source="condition">
+      <param>oui</param>
+      <param>non</param>
+      <target type="variable">mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10load_frozenifin_noexist/__init__.py b/tests/dictionaries_old/10load_frozenifin_noexist/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10load_frozenifin_noexist/makedict/after.json b/tests/dictionaries_old/10load_frozenifin_noexist/makedict/after.json
new file mode 100644
index 00000000..8647ce6a
--- /dev/null
+++ b/tests/dictionaries_old/10load_frozenifin_noexist/makedict/after.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "tous"
+    },
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/10load_frozenifin_noexist/makedict/base.json b/tests/dictionaries_old/10load_frozenifin_noexist/makedict/base.json
new file mode 100644
index 00000000..13a9e66c
--- /dev/null
+++ b/tests/dictionaries_old/10load_frozenifin_noexist/makedict/base.json
@@ -0,0 +1,5 @@
+{
+    "rougail.general.condition": "tous",
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general.mode_conteneur_actif2": "non"
+}
diff --git a/tests/dictionaries_old/10load_frozenifin_noexist/makedict/before.json b/tests/dictionaries_old/10load_frozenifin_noexist/makedict/before.json
new file mode 100644
index 00000000..8647ce6a
--- /dev/null
+++ b/tests/dictionaries_old/10load_frozenifin_noexist/makedict/before.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "tous"
+    },
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/10load_frozenifin_noexist/tiramisu/base.py b/tests/dictionaries_old/10load_frozenifin_noexist/tiramisu/base.py
new file mode 100644
index 00000000..969a0b76
--- /dev/null
+++ b/tests/dictionaries_old/10load_frozenifin_noexist/tiramisu/base.py
@@ -0,0 +1,19 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = ChoiceOption(name="condition", doc="No change", values=('tous', 'authentifié', 'aucun'), default="tous", properties=frozenset({"mandatory", "normal"}))
+option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10load_frozenifin_variable/00-base.xml b/tests/dictionaries_old/10load_frozenifin_variable/00-base.xml
new file mode 100644
index 00000000..907f6450
--- /dev/null
+++ b/tests/dictionaries_old/10load_frozenifin_variable/00-base.xml
@@ -0,0 +1,28 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>tous</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>tous</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>tous</param>
+      <param>authentifié</param>
+      <param>aucun</param>
+      <target>condition</target>
+    </check>
+    <condition name="hidden_if_in" source="condition">
+      <param type="variable">mode_conteneur_actif</param>
+      <target type="variable">mode_conteneur_actif2</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10load_frozenifin_variable/__init__.py b/tests/dictionaries_old/10load_frozenifin_variable/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10load_frozenifin_variable/makedict/after.json b/tests/dictionaries_old/10load_frozenifin_variable/makedict/after.json
new file mode 100644
index 00000000..1f7f53ed
--- /dev/null
+++ b/tests/dictionaries_old/10load_frozenifin_variable/makedict/after.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "tous"
+    },
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "tous"
+    },
+    "rougail.general.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/10load_frozenifin_variable/makedict/base.json b/tests/dictionaries_old/10load_frozenifin_variable/makedict/base.json
new file mode 100644
index 00000000..5b7d5b3a
--- /dev/null
+++ b/tests/dictionaries_old/10load_frozenifin_variable/makedict/base.json
@@ -0,0 +1,5 @@
+{
+    "rougail.general.condition": "tous",
+    "rougail.general.mode_conteneur_actif": "tous",
+    "rougail.general.mode_conteneur_actif2": "non"
+}
diff --git a/tests/dictionaries_old/10load_frozenifin_variable/makedict/before.json b/tests/dictionaries_old/10load_frozenifin_variable/makedict/before.json
new file mode 100644
index 00000000..1f7f53ed
--- /dev/null
+++ b/tests/dictionaries_old/10load_frozenifin_variable/makedict/before.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "tous"
+    },
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "tous"
+    },
+    "rougail.general.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/10load_frozenifin_variable/tiramisu/base.py b/tests/dictionaries_old/10load_frozenifin_variable/tiramisu/base.py
new file mode 100644
index 00000000..e3af4d3f
--- /dev/null
+++ b/tests/dictionaries_old/10load_frozenifin_variable/tiramisu/base.py
@@ -0,0 +1,19 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = ChoiceOption(name="condition", doc="No change", values=('tous', 'authentifié', 'aucun'), default="tous", properties=frozenset({"mandatory", "normal"}))
+option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="tous", properties=frozenset({"mandatory", "normal"}))
+option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamOption(option_4)})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamOption(option_4)})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamOption(option_4)}))}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10load_frozenifnotin/00-base.xml b/tests/dictionaries_old/10load_frozenifnotin/00-base.xml
new file mode 100644
index 00000000..cbd3f7f2
--- /dev/null
+++ b/tests/dictionaries_old/10load_frozenifnotin/00-base.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="hidden_if_not_in" source="condition">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10load_frozenifnotin/__init__.py b/tests/dictionaries_old/10load_frozenifnotin/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10load_frozenifnotin/makedict/after.json b/tests/dictionaries_old/10load_frozenifnotin/makedict/after.json
new file mode 100644
index 00000000..f51f5230
--- /dev/null
+++ b/tests/dictionaries_old/10load_frozenifnotin/makedict/after.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/10load_frozenifnotin/makedict/base.json b/tests/dictionaries_old/10load_frozenifnotin/makedict/base.json
new file mode 100644
index 00000000..c6e0314e
--- /dev/null
+++ b/tests/dictionaries_old/10load_frozenifnotin/makedict/base.json
@@ -0,0 +1,5 @@
+{
+    "rougail.general.condition": "non",
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general.mode_conteneur_actif2": "non"
+}
diff --git a/tests/dictionaries_old/10load_frozenifnotin/makedict/before.json b/tests/dictionaries_old/10load_frozenifnotin/makedict/before.json
new file mode 100644
index 00000000..f51f5230
--- /dev/null
+++ b/tests/dictionaries_old/10load_frozenifnotin/makedict/before.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/10load_frozenifnotin/tiramisu/base.py b/tests/dictionaries_old/10load_frozenifnotin/tiramisu/base.py
new file mode 100644
index 00000000..f289bc8d
--- /dev/null
+++ b/tests/dictionaries_old/10load_frozenifnotin/tiramisu/base.py
@@ -0,0 +1,19 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui"), 'reverse_condition': ParamValue(True)}))}))
+option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui"), 'reverse_condition': ParamValue(True)}))}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10load_frozenifnotin_noexist/00-base.xml b/tests/dictionaries_old/10load_frozenifnotin_noexist/00-base.xml
new file mode 100644
index 00000000..931722a4
--- /dev/null
+++ b/tests/dictionaries_old/10load_frozenifnotin_noexist/00-base.xml
@@ -0,0 +1,30 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>tous</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>tous</param>
+      <param>authentifié</param>
+      <param>aucun</param>
+      <target>condition</target>
+    </check>
+    <condition name="hidden_if_not_in" source="condition">
+      <param>oui</param>
+      <param>non</param>
+      <target type="variable">mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10load_frozenifnotin_noexist/__init__.py b/tests/dictionaries_old/10load_frozenifnotin_noexist/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10load_frozenifnotin_noexist/makedict/after.json b/tests/dictionaries_old/10load_frozenifnotin_noexist/makedict/after.json
new file mode 100644
index 00000000..8647ce6a
--- /dev/null
+++ b/tests/dictionaries_old/10load_frozenifnotin_noexist/makedict/after.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "tous"
+    },
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/10load_frozenifnotin_noexist/makedict/base.json b/tests/dictionaries_old/10load_frozenifnotin_noexist/makedict/base.json
new file mode 100644
index 00000000..13a9e66c
--- /dev/null
+++ b/tests/dictionaries_old/10load_frozenifnotin_noexist/makedict/base.json
@@ -0,0 +1,5 @@
+{
+    "rougail.general.condition": "tous",
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general.mode_conteneur_actif2": "non"
+}
diff --git a/tests/dictionaries_old/10load_frozenifnotin_noexist/makedict/before.json b/tests/dictionaries_old/10load_frozenifnotin_noexist/makedict/before.json
new file mode 100644
index 00000000..8647ce6a
--- /dev/null
+++ b/tests/dictionaries_old/10load_frozenifnotin_noexist/makedict/before.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "tous"
+    },
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/10load_frozenifnotin_noexist/tiramisu/base.py b/tests/dictionaries_old/10load_frozenifnotin_noexist/tiramisu/base.py
new file mode 100644
index 00000000..969a0b76
--- /dev/null
+++ b/tests/dictionaries_old/10load_frozenifnotin_noexist/tiramisu/base.py
@@ -0,0 +1,19 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = ChoiceOption(name="condition", doc="No change", values=('tous', 'authentifié', 'aucun'), default="tous", properties=frozenset({"mandatory", "normal"}))
+option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10load_hidden_if_empty_family/00-base.xml b/tests/dictionaries_old/10load_hidden_if_empty_family/00-base.xml
new file mode 100644
index 00000000..d1cdaf06
--- /dev/null
+++ b/tests/dictionaries_old/10load_hidden_if_empty_family/00-base.xml
@@ -0,0 +1,26 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general" description="Général">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="general2" description="Général2">
+        </family>
+  </variables>
+  <constraints>
+    <condition name="hidden_if_in" source="condition">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+      <target type="family">general2</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10load_hidden_if_empty_family/__init__.py b/tests/dictionaries_old/10load_hidden_if_empty_family/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10load_hidden_if_empty_family/makedict/after.json b/tests/dictionaries_old/10load_hidden_if_empty_family/makedict/after.json
new file mode 100644
index 00000000..f51f5230
--- /dev/null
+++ b/tests/dictionaries_old/10load_hidden_if_empty_family/makedict/after.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/10load_hidden_if_empty_family/makedict/base.json b/tests/dictionaries_old/10load_hidden_if_empty_family/makedict/base.json
new file mode 100644
index 00000000..c6e0314e
--- /dev/null
+++ b/tests/dictionaries_old/10load_hidden_if_empty_family/makedict/base.json
@@ -0,0 +1,5 @@
+{
+    "rougail.general.condition": "non",
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general.mode_conteneur_actif2": "non"
+}
diff --git a/tests/dictionaries_old/10load_hidden_if_empty_family/makedict/before.json b/tests/dictionaries_old/10load_hidden_if_empty_family/makedict/before.json
new file mode 100644
index 00000000..f51f5230
--- /dev/null
+++ b/tests/dictionaries_old/10load_hidden_if_empty_family/makedict/before.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/10load_hidden_if_empty_family/tiramisu/base.py b/tests/dictionaries_old/10load_hidden_if_empty_family/tiramisu/base.py
new file mode 100644
index 00000000..e07b4f4e
--- /dev/null
+++ b/tests/dictionaries_old/10load_hidden_if_empty_family/tiramisu/base.py
@@ -0,0 +1,19 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))}))
+option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))}))
+option_2 = OptionDescription(name="general", doc="Général", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10load_hidden_if_family/00-base.xml b/tests/dictionaries_old/10load_hidden_if_family/00-base.xml
new file mode 100644
index 00000000..8442dc85
--- /dev/null
+++ b/tests/dictionaries_old/10load_hidden_if_family/00-base.xml
@@ -0,0 +1,29 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general" description="Général">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="general2" description="Général2">
+      <variable name="mode_conteneur_actif3" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="hidden_if_in" source="condition">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+      <target type="family">general2</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10load_hidden_if_family/__init__.py b/tests/dictionaries_old/10load_hidden_if_family/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10load_hidden_if_family/makedict/after.json b/tests/dictionaries_old/10load_hidden_if_family/makedict/after.json
new file mode 100644
index 00000000..72ccdddc
--- /dev/null
+++ b/tests/dictionaries_old/10load_hidden_if_family/makedict/after.json
@@ -0,0 +1,18 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general2.mode_conteneur_actif3": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/10load_hidden_if_family/makedict/base.json b/tests/dictionaries_old/10load_hidden_if_family/makedict/base.json
new file mode 100644
index 00000000..14d8f805
--- /dev/null
+++ b/tests/dictionaries_old/10load_hidden_if_family/makedict/base.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.condition": "non",
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general.mode_conteneur_actif2": "non",
+    "rougail.general2.mode_conteneur_actif3": "non"
+}
diff --git a/tests/dictionaries_old/10load_hidden_if_family/makedict/before.json b/tests/dictionaries_old/10load_hidden_if_family/makedict/before.json
new file mode 100644
index 00000000..72ccdddc
--- /dev/null
+++ b/tests/dictionaries_old/10load_hidden_if_family/makedict/before.json
@@ -0,0 +1,18 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general2.mode_conteneur_actif3": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/10load_hidden_if_family/tiramisu/base.py b/tests/dictionaries_old/10load_hidden_if_family/tiramisu/base.py
new file mode 100644
index 00000000..d48d848c
--- /dev/null
+++ b/tests/dictionaries_old/10load_hidden_if_family/tiramisu/base.py
@@ -0,0 +1,21 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))}))
+option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))}))
+option_2 = OptionDescription(name="general", doc="Général", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
+option_7 = StrOption(name="mode_conteneur_actif3", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))}))
+option_6 = OptionDescription(name="general2", doc="Général2", children=[option_7], properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_6])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10load_leadership/00-base.xml b/tests/dictionaries_old/10load_leadership/00-base.xml
new file mode 100644
index 00000000..2b7726a5
--- /dev/null
+++ b/tests/dictionaries_old/10load_leadership/00-base.xml
@@ -0,0 +1,29 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="general1">
+      <variable name="leader" type="string" description="leader" multi="True"/>
+      <variable name="follower1" type="string" description="follower1"/>
+      <variable name="follower2" type="string" description="follower2"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valfill</param>
+      <target>follower1</target>
+    </fill>
+    <fill name="calc_val">
+      <param type="variable">follower1</param>
+      <target>follower2</target>
+    </fill>
+    <group leader="leader">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+    </group>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10load_leadership/__init__.py b/tests/dictionaries_old/10load_leadership/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10load_leadership/makedict/after.json b/tests/dictionaries_old/10load_leadership/makedict/after.json
new file mode 100644
index 00000000..f77abfc0
--- /dev/null
+++ b/tests/dictionaries_old/10load_leadership/makedict/after.json
@@ -0,0 +1,18 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general1.leader.leader": {
+        "owner": "default",
+        "value": []
+    },
+    "rougail.general1.leader.follower1": {
+        "owner": [],
+        "value": []
+    },
+    "rougail.general1.leader.follower2": {
+        "owner": [],
+        "value": []
+    }
+}
diff --git a/tests/dictionaries_old/10load_leadership/makedict/base.json b/tests/dictionaries_old/10load_leadership/makedict/base.json
new file mode 100644
index 00000000..14aaf55f
--- /dev/null
+++ b/tests/dictionaries_old/10load_leadership/makedict/base.json
@@ -0,0 +1,4 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general1.leader.leader": []
+}
diff --git a/tests/dictionaries_old/10load_leadership/makedict/before.json b/tests/dictionaries_old/10load_leadership/makedict/before.json
new file mode 100644
index 00000000..f77abfc0
--- /dev/null
+++ b/tests/dictionaries_old/10load_leadership/makedict/before.json
@@ -0,0 +1,18 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general1.leader.leader": {
+        "owner": "default",
+        "value": []
+    },
+    "rougail.general1.leader.follower1": {
+        "owner": [],
+        "value": []
+    },
+    "rougail.general1.leader.follower2": {
+        "owner": [],
+        "value": []
+    }
+}
diff --git a/tests/dictionaries_old/10load_leadership/tiramisu/base.py b/tests/dictionaries_old/10load_leadership/tiramisu/base.py
new file mode 100644
index 00000000..6649c56d
--- /dev/null
+++ b/tests/dictionaries_old/10load_leadership/tiramisu/base.py
@@ -0,0 +1,22 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
+option_6 = StrOption(name="leader", doc="leader", multi=True)
+option_7 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"normal"}))
+option_8 = StrOption(name="follower2", doc="follower2", multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_7)))), properties=frozenset({"normal"}))
+option_5 = Leadership(name="leader", doc="leader", children=[option_6, option_7, option_8], properties=frozenset({"normal"}))
+option_4 = OptionDescription(name="general1", doc="general1", children=[option_5], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_4])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10load_leadership_default_multi/00-base.xml b/tests/dictionaries_old/10load_leadership_default_multi/00-base.xml
new file mode 100644
index 00000000..f8403754
--- /dev/null
+++ b/tests/dictionaries_old/10load_leadership_default_multi/00-base.xml
@@ -0,0 +1,21 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="leader" multi="True">
+        <value>non</value>
+      </variable>
+      <variable name="leader" type="string" description="leader" multi="True"/>
+      <variable name="follower1" type="string" description="follower1">
+        <value>value</value>
+      </variable>
+      <variable name="follower2" type="string" description="follower2"/>
+    </family>
+  </variables>
+  <constraints>
+    <group leader="leader">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+    </group>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10load_leadership_default_multi/__init__.py b/tests/dictionaries_old/10load_leadership_default_multi/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10load_leadership_default_multi/makedict/after.json b/tests/dictionaries_old/10load_leadership_default_multi/makedict/after.json
new file mode 100644
index 00000000..bb1ba6d4
--- /dev/null
+++ b/tests/dictionaries_old/10load_leadership_default_multi/makedict/after.json
@@ -0,0 +1,20 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": [
+            "non"
+        ]
+    },
+    "rougail.general.leader.leader": {
+        "owner": "default",
+        "value": []
+    },
+    "rougail.general.leader.follower1": {
+        "owner": [],
+        "value": []
+    },
+    "rougail.general.leader.follower2": {
+        "owner": [],
+        "value": []
+    }
+}
diff --git a/tests/dictionaries_old/10load_leadership_default_multi/makedict/base.json b/tests/dictionaries_old/10load_leadership_default_multi/makedict/base.json
new file mode 100644
index 00000000..0b5a23e5
--- /dev/null
+++ b/tests/dictionaries_old/10load_leadership_default_multi/makedict/base.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": [
+        "non"
+    ],
+    "rougail.general.leader.leader": []
+}
diff --git a/tests/dictionaries_old/10load_leadership_default_multi/makedict/before.json b/tests/dictionaries_old/10load_leadership_default_multi/makedict/before.json
new file mode 100644
index 00000000..bb1ba6d4
--- /dev/null
+++ b/tests/dictionaries_old/10load_leadership_default_multi/makedict/before.json
@@ -0,0 +1,20 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": [
+            "non"
+        ]
+    },
+    "rougail.general.leader.leader": {
+        "owner": "default",
+        "value": []
+    },
+    "rougail.general.leader.follower1": {
+        "owner": [],
+        "value": []
+    },
+    "rougail.general.leader.follower2": {
+        "owner": [],
+        "value": []
+    }
+}
diff --git a/tests/dictionaries_old/10load_leadership_default_multi/tiramisu/base.py b/tests/dictionaries_old/10load_leadership_default_multi/tiramisu/base.py
new file mode 100644
index 00000000..b0b3366c
--- /dev/null
+++ b/tests/dictionaries_old/10load_leadership_default_multi/tiramisu/base.py
@@ -0,0 +1,21 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="leader", multi=True, default=['non'], default_multi="non", properties=frozenset({"mandatory", "normal"}))
+option_5 = StrOption(name="leader", doc="leader", multi=True)
+option_6 = StrOption(name="follower1", doc="follower1", multi=True, default_multi="value", properties=frozenset({"mandatory", "normal"}))
+option_7 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"normal"}))
+option_4 = Leadership(name="leader", doc="leader", children=[option_5, option_6, option_7], properties=frozenset({"normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10load_leadership_default_submulti/00-base.xml b/tests/dictionaries_old/10load_leadership_default_submulti/00-base.xml
new file mode 100644
index 00000000..13ff6f10
--- /dev/null
+++ b/tests/dictionaries_old/10load_leadership_default_submulti/00-base.xml
@@ -0,0 +1,26 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="leader" multi="True">
+        <value>non</value>
+      </variable>
+      <variable name="leader" type="string" description="leader" multi="True">
+        <value>leader</value>
+      </variable>
+      <variable name="follower1" type="string" description="follower1" multi="True">
+        <value>value</value>
+      </variable>
+      <variable name="follower2" type="string" description="follower2" multi="True">
+        <value>value1</value>
+        <value>value2</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <group leader="leader">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+    </group>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10load_leadership_default_submulti/__init__.py b/tests/dictionaries_old/10load_leadership_default_submulti/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10load_leadership_default_submulti/makedict/after.json b/tests/dictionaries_old/10load_leadership_default_submulti/makedict/after.json
new file mode 100644
index 00000000..980be29f
--- /dev/null
+++ b/tests/dictionaries_old/10load_leadership_default_submulti/makedict/after.json
@@ -0,0 +1,35 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": [
+            "non"
+        ]
+    },
+    "rougail.general.leader.leader": {
+        "owner": "default",
+        "value": [
+            "leader"
+        ]
+    },
+    "rougail.general.leader.follower1": {
+        "owner": [
+            "default"
+        ],
+        "value": [
+            [
+                "value"
+            ]
+        ]
+    },
+    "rougail.general.leader.follower2": {
+        "owner": [
+            "default"
+        ],
+        "value": [
+            [
+                "value1",
+                "value2"
+            ]
+        ]
+    }
+}
diff --git a/tests/dictionaries_old/10load_leadership_default_submulti/makedict/base.json b/tests/dictionaries_old/10load_leadership_default_submulti/makedict/base.json
new file mode 100644
index 00000000..a7343384
--- /dev/null
+++ b/tests/dictionaries_old/10load_leadership_default_submulti/makedict/base.json
@@ -0,0 +1,17 @@
+{
+    "rougail.general.mode_conteneur_actif": [
+        "non"
+    ],
+    "rougail.general.leader.leader": [
+        {
+            "rougail.general.leader.leader": "leader",
+            "rougail.general.leader.follower1": [
+                "value"
+            ],
+            "rougail.general.leader.follower2": [
+                "value1",
+                "value2"
+            ]
+        }
+    ]
+}
diff --git a/tests/dictionaries_old/10load_leadership_default_submulti/makedict/before.json b/tests/dictionaries_old/10load_leadership_default_submulti/makedict/before.json
new file mode 100644
index 00000000..980be29f
--- /dev/null
+++ b/tests/dictionaries_old/10load_leadership_default_submulti/makedict/before.json
@@ -0,0 +1,35 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": [
+            "non"
+        ]
+    },
+    "rougail.general.leader.leader": {
+        "owner": "default",
+        "value": [
+            "leader"
+        ]
+    },
+    "rougail.general.leader.follower1": {
+        "owner": [
+            "default"
+        ],
+        "value": [
+            [
+                "value"
+            ]
+        ]
+    },
+    "rougail.general.leader.follower2": {
+        "owner": [
+            "default"
+        ],
+        "value": [
+            [
+                "value1",
+                "value2"
+            ]
+        ]
+    }
+}
diff --git a/tests/dictionaries_old/10load_leadership_default_submulti/tiramisu/base.py b/tests/dictionaries_old/10load_leadership_default_submulti/tiramisu/base.py
new file mode 100644
index 00000000..2107608e
--- /dev/null
+++ b/tests/dictionaries_old/10load_leadership_default_submulti/tiramisu/base.py
@@ -0,0 +1,21 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="leader", multi=True, default=['non'], default_multi="non", properties=frozenset({"mandatory", "normal"}))
+option_5 = StrOption(name="leader", doc="leader", multi=True, default=['leader'], properties=frozenset({"mandatory"}))
+option_6 = StrOption(name="follower1", doc="follower1", multi=submulti, default_multi=['value'], properties=frozenset({"mandatory", "normal"}))
+option_7 = StrOption(name="follower2", doc="follower2", multi=submulti, default_multi=['value1', 'value2'], properties=frozenset({"mandatory", "normal"}))
+option_4 = Leadership(name="leader", doc="leader", children=[option_5, option_6, option_7], properties=frozenset({"normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10load_leadership_defaultmulti_leader/00-base.xml b/tests/dictionaries_old/10load_leadership_defaultmulti_leader/00-base.xml
new file mode 100644
index 00000000..921e2ad6
--- /dev/null
+++ b/tests/dictionaries_old/10load_leadership_defaultmulti_leader/00-base.xml
@@ -0,0 +1,21 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="leader" multi="True">
+        <value>non</value>
+      </variable>
+      <variable name="leader" type="string" description="leader" multi="True">
+        <value>value</value>
+      </variable>
+      <variable name="follower1" type="string" description="follower1"/>
+      <variable name="follower2" type="string" description="follower2"/>
+    </family>
+  </variables>
+  <constraints>
+    <group leader="leader">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+    </group>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10load_leadership_defaultmulti_leader/__init__.py b/tests/dictionaries_old/10load_leadership_defaultmulti_leader/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10load_leadership_defaultmulti_leader/makedict/after.json b/tests/dictionaries_old/10load_leadership_defaultmulti_leader/makedict/after.json
new file mode 100644
index 00000000..79cbbbfb
--- /dev/null
+++ b/tests/dictionaries_old/10load_leadership_defaultmulti_leader/makedict/after.json
@@ -0,0 +1,30 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": [
+            "non"
+        ]
+    },
+    "rougail.general.leader.leader": {
+        "owner": "default",
+        "value": [
+            "value"
+        ]
+    },
+    "rougail.general.leader.follower1": {
+        "owner": [
+            "default"
+        ],
+        "value": [
+            null
+        ]
+    },
+    "rougail.general.leader.follower2": {
+        "owner": [
+            "default"
+        ],
+        "value": [
+            null
+        ]
+    }
+}
diff --git a/tests/dictionaries_old/10load_leadership_defaultmulti_leader/makedict/base.json b/tests/dictionaries_old/10load_leadership_defaultmulti_leader/makedict/base.json
new file mode 100644
index 00000000..b923902d
--- /dev/null
+++ b/tests/dictionaries_old/10load_leadership_defaultmulti_leader/makedict/base.json
@@ -0,0 +1,12 @@
+{
+    "rougail.general.mode_conteneur_actif": [
+        "non"
+    ],
+    "rougail.general.leader.leader": [
+        {
+            "rougail.general.leader.leader": "value",
+            "rougail.general.leader.follower1": null,
+            "rougail.general.leader.follower2": null
+        }
+    ]
+}
diff --git a/tests/dictionaries_old/10load_leadership_defaultmulti_leader/makedict/before.json b/tests/dictionaries_old/10load_leadership_defaultmulti_leader/makedict/before.json
new file mode 100644
index 00000000..79cbbbfb
--- /dev/null
+++ b/tests/dictionaries_old/10load_leadership_defaultmulti_leader/makedict/before.json
@@ -0,0 +1,30 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": [
+            "non"
+        ]
+    },
+    "rougail.general.leader.leader": {
+        "owner": "default",
+        "value": [
+            "value"
+        ]
+    },
+    "rougail.general.leader.follower1": {
+        "owner": [
+            "default"
+        ],
+        "value": [
+            null
+        ]
+    },
+    "rougail.general.leader.follower2": {
+        "owner": [
+            "default"
+        ],
+        "value": [
+            null
+        ]
+    }
+}
diff --git a/tests/dictionaries_old/10load_leadership_defaultmulti_leader/tiramisu/base.py b/tests/dictionaries_old/10load_leadership_defaultmulti_leader/tiramisu/base.py
new file mode 100644
index 00000000..24a3f26b
--- /dev/null
+++ b/tests/dictionaries_old/10load_leadership_defaultmulti_leader/tiramisu/base.py
@@ -0,0 +1,21 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="leader", multi=True, default=['non'], default_multi="non", properties=frozenset({"mandatory", "normal"}))
+option_5 = StrOption(name="leader", doc="leader", multi=True, default=['value'], properties=frozenset({"mandatory"}))
+option_6 = StrOption(name="follower1", doc="follower1", multi=True, properties=frozenset({"normal"}))
+option_7 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"normal"}))
+option_4 = Leadership(name="leader", doc="leader", children=[option_5, option_6, option_7], properties=frozenset({"normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10load_leadership_description/00-base.xml b/tests/dictionaries_old/10load_leadership_description/00-base.xml
new file mode 100644
index 00000000..87b47617
--- /dev/null
+++ b/tests/dictionaries_old/10load_leadership_description/00-base.xml
@@ -0,0 +1,29 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="general1">
+      <variable name="leader" type="string" description="leader" multi="True"/>
+      <variable name="follower1" type="string" description="follower1"/>
+      <variable name="follower2" type="string" description="follower2"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valfill</param>
+      <target>follower1</target>
+    </fill>
+    <fill name="calc_val">
+      <param type="variable">follower1</param>
+      <target>follower2</target>
+    </fill>
+    <group leader="leader" description="other description">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+    </group>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10load_leadership_description/__init__.py b/tests/dictionaries_old/10load_leadership_description/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10load_leadership_description/makedict/after.json b/tests/dictionaries_old/10load_leadership_description/makedict/after.json
new file mode 100644
index 00000000..f77abfc0
--- /dev/null
+++ b/tests/dictionaries_old/10load_leadership_description/makedict/after.json
@@ -0,0 +1,18 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general1.leader.leader": {
+        "owner": "default",
+        "value": []
+    },
+    "rougail.general1.leader.follower1": {
+        "owner": [],
+        "value": []
+    },
+    "rougail.general1.leader.follower2": {
+        "owner": [],
+        "value": []
+    }
+}
diff --git a/tests/dictionaries_old/10load_leadership_description/makedict/base.json b/tests/dictionaries_old/10load_leadership_description/makedict/base.json
new file mode 100644
index 00000000..14aaf55f
--- /dev/null
+++ b/tests/dictionaries_old/10load_leadership_description/makedict/base.json
@@ -0,0 +1,4 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general1.leader.leader": []
+}
diff --git a/tests/dictionaries_old/10load_leadership_description/makedict/before.json b/tests/dictionaries_old/10load_leadership_description/makedict/before.json
new file mode 100644
index 00000000..f77abfc0
--- /dev/null
+++ b/tests/dictionaries_old/10load_leadership_description/makedict/before.json
@@ -0,0 +1,18 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general1.leader.leader": {
+        "owner": "default",
+        "value": []
+    },
+    "rougail.general1.leader.follower1": {
+        "owner": [],
+        "value": []
+    },
+    "rougail.general1.leader.follower2": {
+        "owner": [],
+        "value": []
+    }
+}
diff --git a/tests/dictionaries_old/10load_leadership_description/tiramisu/base.py b/tests/dictionaries_old/10load_leadership_description/tiramisu/base.py
new file mode 100644
index 00000000..89bb47ae
--- /dev/null
+++ b/tests/dictionaries_old/10load_leadership_description/tiramisu/base.py
@@ -0,0 +1,22 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
+option_6 = StrOption(name="leader", doc="leader", multi=True)
+option_7 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"normal"}))
+option_8 = StrOption(name="follower2", doc="follower2", multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_7)))), properties=frozenset({"normal"}))
+option_5 = Leadership(name="leader", doc="other description", children=[option_6, option_7, option_8], properties=frozenset({"normal"}))
+option_4 = OptionDescription(name="general1", doc="general1", children=[option_5], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_4])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10load_leadership_name/00-base.xml b/tests/dictionaries_old/10load_leadership_name/00-base.xml
new file mode 100644
index 00000000..2af2d0d4
--- /dev/null
+++ b/tests/dictionaries_old/10load_leadership_name/00-base.xml
@@ -0,0 +1,29 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="general1">
+      <variable name="leader" type="string" description="leader" multi="True"/>
+      <variable name="follower1" type="string" description="follower1"/>
+      <variable name="follower2" type="string" description="follower2"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valfill</param>
+      <target>follower1</target>
+    </fill>
+    <fill name="calc_val">
+      <param type="variable">follower1</param>
+      <target>follower2</target>
+    </fill>
+    <group leader="leader" name="other_name">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+    </group>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10load_leadership_name/__init__.py b/tests/dictionaries_old/10load_leadership_name/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10load_leadership_name/makedict/after.json b/tests/dictionaries_old/10load_leadership_name/makedict/after.json
new file mode 100644
index 00000000..c38c753a
--- /dev/null
+++ b/tests/dictionaries_old/10load_leadership_name/makedict/after.json
@@ -0,0 +1,18 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general1.other_name.leader": {
+        "owner": "default",
+        "value": []
+    },
+    "rougail.general1.other_name.follower1": {
+        "owner": [],
+        "value": []
+    },
+    "rougail.general1.other_name.follower2": {
+        "owner": [],
+        "value": []
+    }
+}
diff --git a/tests/dictionaries_old/10load_leadership_name/makedict/base.json b/tests/dictionaries_old/10load_leadership_name/makedict/base.json
new file mode 100644
index 00000000..0f5932d1
--- /dev/null
+++ b/tests/dictionaries_old/10load_leadership_name/makedict/base.json
@@ -0,0 +1,4 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general1.other_name.leader": []
+}
diff --git a/tests/dictionaries_old/10load_leadership_name/makedict/before.json b/tests/dictionaries_old/10load_leadership_name/makedict/before.json
new file mode 100644
index 00000000..c38c753a
--- /dev/null
+++ b/tests/dictionaries_old/10load_leadership_name/makedict/before.json
@@ -0,0 +1,18 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general1.other_name.leader": {
+        "owner": "default",
+        "value": []
+    },
+    "rougail.general1.other_name.follower1": {
+        "owner": [],
+        "value": []
+    },
+    "rougail.general1.other_name.follower2": {
+        "owner": [],
+        "value": []
+    }
+}
diff --git a/tests/dictionaries_old/10load_leadership_name/tiramisu/base.py b/tests/dictionaries_old/10load_leadership_name/tiramisu/base.py
new file mode 100644
index 00000000..91b5dd2c
--- /dev/null
+++ b/tests/dictionaries_old/10load_leadership_name/tiramisu/base.py
@@ -0,0 +1,22 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
+option_6 = StrOption(name="leader", doc="leader", multi=True)
+option_7 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"normal"}))
+option_8 = StrOption(name="follower2", doc="follower2", multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_7)))), properties=frozenset({"normal"}))
+option_5 = Leadership(name="other_name", doc="other_name", children=[option_6, option_7, option_8], properties=frozenset({"normal"}))
+option_4 = OptionDescription(name="general1", doc="general1", children=[option_5], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_4])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10load_leadership_submulti/00-base.xml b/tests/dictionaries_old/10load_leadership_submulti/00-base.xml
new file mode 100644
index 00000000..caa3dbee
--- /dev/null
+++ b/tests/dictionaries_old/10load_leadership_submulti/00-base.xml
@@ -0,0 +1,29 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="general1">
+      <variable name="leader" type="string" description="leader" multi="True"/>
+      <variable name="follower1" type="string" description="follower1"/>
+      <variable name="follower2" type="string" description="follower2" multi="True"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valfill</param>
+      <target>follower1</target>
+    </fill>
+    <fill name="calc_val">
+      <param type="variable">follower1</param>
+      <target>follower2</target>
+    </fill>
+    <group leader="leader">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+    </group>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10load_leadership_submulti/__init__.py b/tests/dictionaries_old/10load_leadership_submulti/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10load_leadership_submulti/makedict/after.json b/tests/dictionaries_old/10load_leadership_submulti/makedict/after.json
new file mode 100644
index 00000000..f77abfc0
--- /dev/null
+++ b/tests/dictionaries_old/10load_leadership_submulti/makedict/after.json
@@ -0,0 +1,18 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general1.leader.leader": {
+        "owner": "default",
+        "value": []
+    },
+    "rougail.general1.leader.follower1": {
+        "owner": [],
+        "value": []
+    },
+    "rougail.general1.leader.follower2": {
+        "owner": [],
+        "value": []
+    }
+}
diff --git a/tests/dictionaries_old/10load_leadership_submulti/makedict/base.json b/tests/dictionaries_old/10load_leadership_submulti/makedict/base.json
new file mode 100644
index 00000000..14aaf55f
--- /dev/null
+++ b/tests/dictionaries_old/10load_leadership_submulti/makedict/base.json
@@ -0,0 +1,4 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general1.leader.leader": []
+}
diff --git a/tests/dictionaries_old/10load_leadership_submulti/makedict/before.json b/tests/dictionaries_old/10load_leadership_submulti/makedict/before.json
new file mode 100644
index 00000000..f77abfc0
--- /dev/null
+++ b/tests/dictionaries_old/10load_leadership_submulti/makedict/before.json
@@ -0,0 +1,18 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general1.leader.leader": {
+        "owner": "default",
+        "value": []
+    },
+    "rougail.general1.leader.follower1": {
+        "owner": [],
+        "value": []
+    },
+    "rougail.general1.leader.follower2": {
+        "owner": [],
+        "value": []
+    }
+}
diff --git a/tests/dictionaries_old/10load_leadership_submulti/tiramisu/base.py b/tests/dictionaries_old/10load_leadership_submulti/tiramisu/base.py
new file mode 100644
index 00000000..c2eb1b41
--- /dev/null
+++ b/tests/dictionaries_old/10load_leadership_submulti/tiramisu/base.py
@@ -0,0 +1,22 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
+option_6 = StrOption(name="leader", doc="leader", multi=True)
+option_7 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"normal"}))
+option_8 = StrOption(name="follower2", doc="follower2", multi=submulti, default=[Calculation(func.calc_val, Params((ParamOption(option_7))))], properties=frozenset({"normal"}))
+option_5 = Leadership(name="leader", doc="leader", children=[option_6, option_7, option_8], properties=frozenset({"normal"}))
+option_4 = OptionDescription(name="general1", doc="general1", children=[option_5], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_4])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10load_mandatoryifin/00-base.xml b/tests/dictionaries_old/10load_mandatoryifin/00-base.xml
new file mode 100644
index 00000000..810f14f7
--- /dev/null
+++ b/tests/dictionaries_old/10load_mandatoryifin/00-base.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="mandatory_if_in" source="condition">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10load_mandatoryifin/__init__.py b/tests/dictionaries_old/10load_mandatoryifin/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10load_mandatoryifin/makedict/after.json b/tests/dictionaries_old/10load_mandatoryifin/makedict/after.json
new file mode 100644
index 00000000..f51f5230
--- /dev/null
+++ b/tests/dictionaries_old/10load_mandatoryifin/makedict/after.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/10load_mandatoryifin/makedict/base.json b/tests/dictionaries_old/10load_mandatoryifin/makedict/base.json
new file mode 100644
index 00000000..c6e0314e
--- /dev/null
+++ b/tests/dictionaries_old/10load_mandatoryifin/makedict/base.json
@@ -0,0 +1,5 @@
+{
+    "rougail.general.condition": "non",
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general.mode_conteneur_actif2": "non"
+}
diff --git a/tests/dictionaries_old/10load_mandatoryifin/makedict/before.json b/tests/dictionaries_old/10load_mandatoryifin/makedict/before.json
new file mode 100644
index 00000000..f51f5230
--- /dev/null
+++ b/tests/dictionaries_old/10load_mandatoryifin/makedict/before.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/10load_mandatoryifin/tiramisu/base.py b/tests/dictionaries_old/10load_mandatoryifin/tiramisu/base.py
new file mode 100644
index 00000000..1e189936
--- /dev/null
+++ b/tests/dictionaries_old/10load_mandatoryifin/tiramisu/base.py
@@ -0,0 +1,19 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('mandatory'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))}))
+option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('mandatory'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10load_mandatoryifnotin_noexist/00-base.xml b/tests/dictionaries_old/10load_mandatoryifnotin_noexist/00-base.xml
new file mode 100644
index 00000000..c1bc13ee
--- /dev/null
+++ b/tests/dictionaries_old/10load_mandatoryifnotin_noexist/00-base.xml
@@ -0,0 +1,30 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>tous</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>tous</param>
+      <param>authentifié</param>
+      <param>aucun</param>
+      <target>condition</target>
+    </check>
+    <condition name="mandatory_if_not_in" source="condition">
+      <param>oui</param>
+      <param>non</param>
+      <target type="variable">mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10load_mandatoryifnotin_noexist/__init__.py b/tests/dictionaries_old/10load_mandatoryifnotin_noexist/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10load_mandatoryifnotin_noexist/makedict/after.json b/tests/dictionaries_old/10load_mandatoryifnotin_noexist/makedict/after.json
new file mode 100644
index 00000000..8647ce6a
--- /dev/null
+++ b/tests/dictionaries_old/10load_mandatoryifnotin_noexist/makedict/after.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "tous"
+    },
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/10load_mandatoryifnotin_noexist/makedict/base.json b/tests/dictionaries_old/10load_mandatoryifnotin_noexist/makedict/base.json
new file mode 100644
index 00000000..13a9e66c
--- /dev/null
+++ b/tests/dictionaries_old/10load_mandatoryifnotin_noexist/makedict/base.json
@@ -0,0 +1,5 @@
+{
+    "rougail.general.condition": "tous",
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general.mode_conteneur_actif2": "non"
+}
diff --git a/tests/dictionaries_old/10load_mandatoryifnotin_noexist/makedict/before.json b/tests/dictionaries_old/10load_mandatoryifnotin_noexist/makedict/before.json
new file mode 100644
index 00000000..8647ce6a
--- /dev/null
+++ b/tests/dictionaries_old/10load_mandatoryifnotin_noexist/makedict/before.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "tous"
+    },
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/10load_mandatoryifnotin_noexist/tiramisu/base.py b/tests/dictionaries_old/10load_mandatoryifnotin_noexist/tiramisu/base.py
new file mode 100644
index 00000000..969a0b76
--- /dev/null
+++ b/tests/dictionaries_old/10load_mandatoryifnotin_noexist/tiramisu/base.py
@@ -0,0 +1,19 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = ChoiceOption(name="condition", doc="No change", values=('tous', 'authentifié', 'aucun'), default="tous", properties=frozenset({"mandatory", "normal"}))
+option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10load_multivalue/00-base.xml b/tests/dictionaries_old/10load_multivalue/00-base.xml
new file mode 100644
index 00000000..298d9292
--- /dev/null
+++ b/tests/dictionaries_old/10load_multivalue/00-base.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True" multi="True">
+        <value>non</value>
+        <value>oui</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/10load_multivalue/__init__.py b/tests/dictionaries_old/10load_multivalue/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10load_multivalue/makedict/after.json b/tests/dictionaries_old/10load_multivalue/makedict/after.json
new file mode 100644
index 00000000..279b934d
--- /dev/null
+++ b/tests/dictionaries_old/10load_multivalue/makedict/after.json
@@ -0,0 +1,9 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": [
+            "non",
+            "oui"
+        ]
+    }
+}
diff --git a/tests/dictionaries_old/10load_multivalue/makedict/base.json b/tests/dictionaries_old/10load_multivalue/makedict/base.json
new file mode 100644
index 00000000..d82bd782
--- /dev/null
+++ b/tests/dictionaries_old/10load_multivalue/makedict/base.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": [
+        "non",
+        "oui"
+    ]
+}
diff --git a/tests/dictionaries_old/10load_multivalue/makedict/before.json b/tests/dictionaries_old/10load_multivalue/makedict/before.json
new file mode 100644
index 00000000..279b934d
--- /dev/null
+++ b/tests/dictionaries_old/10load_multivalue/makedict/before.json
@@ -0,0 +1,9 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": [
+            "non",
+            "oui"
+        ]
+    }
+}
diff --git a/tests/dictionaries_old/10load_multivalue/tiramisu/base.py b/tests/dictionaries_old/10load_multivalue/tiramisu/base.py
new file mode 100644
index 00000000..f9956563
--- /dev/null
+++ b/tests/dictionaries_old/10load_multivalue/tiramisu/base.py
@@ -0,0 +1,17 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", multi=True, default=['non', 'oui'], default_multi="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10valid_enum_accent/00-base.xml b/tests/dictionaries_old/10valid_enum_accent/00-base.xml
new file mode 100644
index 00000000..1731282d
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_accent/00-base.xml
@@ -0,0 +1,24 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="enumfam" mode="expert">
+      <variable name="enumvar" type="string" description="multi" help="bla bla bla">
+        <value>c</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>a</param>
+      <param>b</param>
+      <param>c</param>
+      <param>é</param>
+      <target>enumvar</target>
+    </check>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10valid_enum_accent/__init__.py b/tests/dictionaries_old/10valid_enum_accent/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10valid_enum_accent/makedict/after.json b/tests/dictionaries_old/10valid_enum_accent/makedict/after.json
new file mode 100644
index 00000000..d6497f42
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_accent/makedict/after.json
@@ -0,0 +1,10 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.enumfam.enumvar": {
+        "owner": "default",
+        "value": "c"
+    }
+}
diff --git a/tests/dictionaries_old/10valid_enum_accent/makedict/base.json b/tests/dictionaries_old/10valid_enum_accent/makedict/base.json
new file mode 100644
index 00000000..58c810c5
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_accent/makedict/base.json
@@ -0,0 +1,4 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.enumfam.enumvar": "c"
+}
diff --git a/tests/dictionaries_old/10valid_enum_accent/makedict/before.json b/tests/dictionaries_old/10valid_enum_accent/makedict/before.json
new file mode 100644
index 00000000..d6497f42
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_accent/makedict/before.json
@@ -0,0 +1,10 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.enumfam.enumvar": {
+        "owner": "default",
+        "value": "c"
+    }
+}
diff --git a/tests/dictionaries_old/10valid_enum_accent/tiramisu/base.py b/tests/dictionaries_old/10valid_enum_accent/tiramisu/base.py
new file mode 100644
index 00000000..f0792cdb
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_accent/tiramisu/base.py
@@ -0,0 +1,20 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"expert", "mandatory"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"expert"}))
+option_5 = ChoiceOption(name="enumvar", doc="multi", values=('a', 'b', 'c', 'é'), default="c", properties=frozenset({"expert", "mandatory"}))
+option_5.impl_set_information('help', "bla bla bla")
+option_4 = OptionDescription(name="enumfam", doc="enumfam", children=[option_5], properties=frozenset({"expert"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_4])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10valid_enum_base/00-base.xml b/tests/dictionaries_old/10valid_enum_base/00-base.xml
new file mode 100644
index 00000000..070b9df4
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_base/00-base.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="enumfam" mode="expert">
+      <variable name="enumvar" type="string" description="multi" help="bla bla bla">
+        <value>c</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>a</param>
+      <param>b</param>
+      <param>c</param>
+      <target>enumvar</target>
+    </check>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10valid_enum_base/__init__.py b/tests/dictionaries_old/10valid_enum_base/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10valid_enum_base/makedict/after.json b/tests/dictionaries_old/10valid_enum_base/makedict/after.json
new file mode 100644
index 00000000..d6497f42
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_base/makedict/after.json
@@ -0,0 +1,10 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.enumfam.enumvar": {
+        "owner": "default",
+        "value": "c"
+    }
+}
diff --git a/tests/dictionaries_old/10valid_enum_base/makedict/base.json b/tests/dictionaries_old/10valid_enum_base/makedict/base.json
new file mode 100644
index 00000000..58c810c5
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_base/makedict/base.json
@@ -0,0 +1,4 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.enumfam.enumvar": "c"
+}
diff --git a/tests/dictionaries_old/10valid_enum_base/makedict/before.json b/tests/dictionaries_old/10valid_enum_base/makedict/before.json
new file mode 100644
index 00000000..d6497f42
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_base/makedict/before.json
@@ -0,0 +1,10 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.enumfam.enumvar": {
+        "owner": "default",
+        "value": "c"
+    }
+}
diff --git a/tests/dictionaries_old/10valid_enum_base/tiramisu/base.py b/tests/dictionaries_old/10valid_enum_base/tiramisu/base.py
new file mode 100644
index 00000000..0f349e81
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_base/tiramisu/base.py
@@ -0,0 +1,20 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"expert", "mandatory"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"expert"}))
+option_5 = ChoiceOption(name="enumvar", doc="multi", values=('a', 'b', 'c'), default="c", properties=frozenset({"expert", "mandatory"}))
+option_5.impl_set_information('help', "bla bla bla")
+option_4 = OptionDescription(name="enumfam", doc="enumfam", children=[option_5], properties=frozenset({"expert"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_4])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10valid_enum_base_no_mandatory/00-base.xml b/tests/dictionaries_old/10valid_enum_base_no_mandatory/00-base.xml
new file mode 100644
index 00000000..2727a946
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_base_no_mandatory/00-base.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="enumfam" mode="expert">
+      <variable name="enumvar" mandatory="False">
+        <value>c</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>a</param>
+      <param>b</param>
+      <param>c</param>
+      <target>enumvar</target>
+    </check>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10valid_enum_base_no_mandatory/__init__.py b/tests/dictionaries_old/10valid_enum_base_no_mandatory/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10valid_enum_base_no_mandatory/makedict/after.json b/tests/dictionaries_old/10valid_enum_base_no_mandatory/makedict/after.json
new file mode 100644
index 00000000..d6497f42
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_base_no_mandatory/makedict/after.json
@@ -0,0 +1,10 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.enumfam.enumvar": {
+        "owner": "default",
+        "value": "c"
+    }
+}
diff --git a/tests/dictionaries_old/10valid_enum_base_no_mandatory/makedict/base.json b/tests/dictionaries_old/10valid_enum_base_no_mandatory/makedict/base.json
new file mode 100644
index 00000000..58c810c5
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_base_no_mandatory/makedict/base.json
@@ -0,0 +1,4 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.enumfam.enumvar": "c"
+}
diff --git a/tests/dictionaries_old/10valid_enum_base_no_mandatory/makedict/before.json b/tests/dictionaries_old/10valid_enum_base_no_mandatory/makedict/before.json
new file mode 100644
index 00000000..d6497f42
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_base_no_mandatory/makedict/before.json
@@ -0,0 +1,10 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.enumfam.enumvar": {
+        "owner": "default",
+        "value": "c"
+    }
+}
diff --git a/tests/dictionaries_old/10valid_enum_base_no_mandatory/tiramisu/base.py b/tests/dictionaries_old/10valid_enum_base_no_mandatory/tiramisu/base.py
new file mode 100644
index 00000000..042e251e
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_base_no_mandatory/tiramisu/base.py
@@ -0,0 +1,19 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"expert", "mandatory"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"expert"}))
+option_5 = ChoiceOption(name="enumvar", doc="enumvar", values=('a', 'b', 'c', None), default="c", properties=frozenset({"expert"}))
+option_4 = OptionDescription(name="enumfam", doc="enumfam", children=[option_5], properties=frozenset({"expert"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_4])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10valid_enum_base_redefine/00-base.xml b/tests/dictionaries_old/10valid_enum_base_redefine/00-base.xml
new file mode 100644
index 00000000..a38f6a0d
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_base_redefine/00-base.xml
@@ -0,0 +1,32 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="enumfam" mode="expert">
+      <variable name="enumvar2" type="string" description="multi">
+        <value>c</value>
+      </variable>
+      <variable name="enumvar" type="string" description="multi" help="bla bla bla">
+        <value>c</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>a</param>
+      <param>b</param>
+      <param>c</param>
+      <target>enumvar</target>
+    </check>
+    <check name="valid_enum">
+      <param>a</param>
+      <param>b</param>
+      <param>c</param>
+      <target>enumvar2</target>
+    </check>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10valid_enum_base_redefine/01-base.xml b/tests/dictionaries_old/10valid_enum_base_redefine/01-base.xml
new file mode 100644
index 00000000..c542d3c6
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_base_redefine/01-base.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="enumfam" mode="expert">
+      <variable name="enumvar" redefine="True" remove_check="True">
+        <value>c</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>a</param>
+      <param>c</param>
+      <target>enumvar</target>
+    </check>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10valid_enum_base_redefine/__init__.py b/tests/dictionaries_old/10valid_enum_base_redefine/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10valid_enum_base_redefine/makedict/after.json b/tests/dictionaries_old/10valid_enum_base_redefine/makedict/after.json
new file mode 100644
index 00000000..bf91d2f7
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_base_redefine/makedict/after.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.enumfam.enumvar2": {
+        "owner": "default",
+        "value": "c"
+    },
+    "rougail.enumfam.enumvar": {
+        "owner": "default",
+        "value": "c"
+    }
+}
diff --git a/tests/dictionaries_old/10valid_enum_base_redefine/makedict/base.json b/tests/dictionaries_old/10valid_enum_base_redefine/makedict/base.json
new file mode 100644
index 00000000..6c0cbe28
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_base_redefine/makedict/base.json
@@ -0,0 +1,5 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.enumfam.enumvar2": "c",
+    "rougail.enumfam.enumvar": "c"
+}
diff --git a/tests/dictionaries_old/10valid_enum_base_redefine/makedict/before.json b/tests/dictionaries_old/10valid_enum_base_redefine/makedict/before.json
new file mode 100644
index 00000000..bf91d2f7
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_base_redefine/makedict/before.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.enumfam.enumvar2": {
+        "owner": "default",
+        "value": "c"
+    },
+    "rougail.enumfam.enumvar": {
+        "owner": "default",
+        "value": "c"
+    }
+}
diff --git a/tests/dictionaries_old/10valid_enum_base_redefine/tiramisu/base.py b/tests/dictionaries_old/10valid_enum_base_redefine/tiramisu/base.py
new file mode 100644
index 00000000..b0bd34df
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_base_redefine/tiramisu/base.py
@@ -0,0 +1,21 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"expert", "mandatory"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"expert"}))
+option_5 = ChoiceOption(name="enumvar2", doc="multi", values=('a', 'b', 'c'), default="c", properties=frozenset({"expert", "mandatory"}))
+option_6 = ChoiceOption(name="enumvar", doc="multi", values=('a', 'c'), default="c", properties=frozenset({"expert", "mandatory"}))
+option_6.impl_set_information('help', "bla bla bla")
+option_4 = OptionDescription(name="enumfam", doc="enumfam", children=[option_5, option_6], properties=frozenset({"expert"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_4])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10valid_enum_leader/00-base.xml b/tests/dictionaries_old/10valid_enum_leader/00-base.xml
new file mode 100644
index 00000000..d0b5a369
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_leader/00-base.xml
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="leader" type="string" description="leader" multi="True"/>
+      <variable name="follower1" type="string" description="follower1"/>
+      <variable name="follower2" type="string" description="follower2"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>a</param>
+      <param>b</param>
+      <param>c</param>
+      <target>follower1</target>
+    </check>
+    <group leader="leader">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+    </group>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10valid_enum_leader/__init__.py b/tests/dictionaries_old/10valid_enum_leader/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10valid_enum_leader/makedict/after.json b/tests/dictionaries_old/10valid_enum_leader/makedict/after.json
new file mode 100644
index 00000000..dd62b980
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_leader/makedict/after.json
@@ -0,0 +1,18 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.leader.leader": {
+        "owner": "default",
+        "value": []
+    },
+    "rougail.general.leader.follower1": {
+        "owner": [],
+        "value": []
+    },
+    "rougail.general.leader.follower2": {
+        "owner": [],
+        "value": []
+    }
+}
diff --git a/tests/dictionaries_old/10valid_enum_leader/makedict/base.json b/tests/dictionaries_old/10valid_enum_leader/makedict/base.json
new file mode 100644
index 00000000..9031a92a
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_leader/makedict/base.json
@@ -0,0 +1,4 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general.leader.leader": []
+}
diff --git a/tests/dictionaries_old/10valid_enum_leader/makedict/before.json b/tests/dictionaries_old/10valid_enum_leader/makedict/before.json
new file mode 100644
index 00000000..dd62b980
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_leader/makedict/before.json
@@ -0,0 +1,18 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.leader.leader": {
+        "owner": "default",
+        "value": []
+    },
+    "rougail.general.leader.follower1": {
+        "owner": [],
+        "value": []
+    },
+    "rougail.general.leader.follower2": {
+        "owner": [],
+        "value": []
+    }
+}
diff --git a/tests/dictionaries_old/10valid_enum_leader/tiramisu/base.py b/tests/dictionaries_old/10valid_enum_leader/tiramisu/base.py
new file mode 100644
index 00000000..a7089875
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_leader/tiramisu/base.py
@@ -0,0 +1,21 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_5 = StrOption(name="leader", doc="leader", multi=True)
+option_6 = ChoiceOption(name="follower1", doc="follower1", values=('a', 'b', 'c'), multi=True, default_multi="a", properties=frozenset({"mandatory", "normal"}))
+option_7 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"normal"}))
+option_4 = Leadership(name="leader", doc="leader", children=[option_5, option_6, option_7], properties=frozenset({"normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10valid_enum_mandatory/00-base.xml b/tests/dictionaries_old/10valid_enum_mandatory/00-base.xml
new file mode 100644
index 00000000..89daeab9
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_mandatory/00-base.xml
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services/>
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="enumfam" mode="expert">
+      <variable name="enumvar" type="string" description="multi" mandatory="True"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>a</param>
+      <param>b</param>
+      <param>c</param>
+      <target>enumvar</target>
+    </check>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10valid_enum_mandatory/__init__.py b/tests/dictionaries_old/10valid_enum_mandatory/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10valid_enum_mandatory/makedict/after.json b/tests/dictionaries_old/10valid_enum_mandatory/makedict/after.json
new file mode 100644
index 00000000..01451701
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_mandatory/makedict/after.json
@@ -0,0 +1,10 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.enumfam.enumvar": {
+        "owner": "default",
+        "value": "a"
+    }
+}
diff --git a/tests/dictionaries_old/10valid_enum_mandatory/makedict/base.json b/tests/dictionaries_old/10valid_enum_mandatory/makedict/base.json
new file mode 100644
index 00000000..41a55286
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_mandatory/makedict/base.json
@@ -0,0 +1,4 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.enumfam.enumvar": "a"
+}
diff --git a/tests/dictionaries_old/10valid_enum_mandatory/makedict/before.json b/tests/dictionaries_old/10valid_enum_mandatory/makedict/before.json
new file mode 100644
index 00000000..01451701
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_mandatory/makedict/before.json
@@ -0,0 +1,10 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.enumfam.enumvar": {
+        "owner": "default",
+        "value": "a"
+    }
+}
diff --git a/tests/dictionaries_old/10valid_enum_mandatory/tiramisu/base.py b/tests/dictionaries_old/10valid_enum_mandatory/tiramisu/base.py
new file mode 100644
index 00000000..344356ff
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_mandatory/tiramisu/base.py
@@ -0,0 +1,19 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"expert", "mandatory"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"expert"}))
+option_5 = ChoiceOption(name="enumvar", doc="multi", values=('a', 'b', 'c'), default="a", properties=frozenset({"expert", "mandatory"}))
+option_4 = OptionDescription(name="enumfam", doc="enumfam", children=[option_5], properties=frozenset({"expert"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_4])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10valid_enum_multi/00-base.xml b/tests/dictionaries_old/10valid_enum_multi/00-base.xml
new file mode 100644
index 00000000..d3bdd736
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_multi/00-base.xml
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="multi" type="string" description="multi" multi="True"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>a</param>
+      <param>b</param>
+      <param>c</param>
+      <target>multi</target>
+    </check>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10valid_enum_multi/__init__.py b/tests/dictionaries_old/10valid_enum_multi/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10valid_enum_multi/makedict/after.json b/tests/dictionaries_old/10valid_enum_multi/makedict/after.json
new file mode 100644
index 00000000..e9b5a8d3
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_multi/makedict/after.json
@@ -0,0 +1,12 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.multi": {
+        "owner": "default",
+        "value": [
+            "a"
+        ]
+    }
+}
diff --git a/tests/dictionaries_old/10valid_enum_multi/makedict/base.json b/tests/dictionaries_old/10valid_enum_multi/makedict/base.json
new file mode 100644
index 00000000..b581c6d9
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_multi/makedict/base.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general.multi": [
+        "a"
+    ]
+}
diff --git a/tests/dictionaries_old/10valid_enum_multi/makedict/before.json b/tests/dictionaries_old/10valid_enum_multi/makedict/before.json
new file mode 100644
index 00000000..e9b5a8d3
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_multi/makedict/before.json
@@ -0,0 +1,12 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.multi": {
+        "owner": "default",
+        "value": [
+            "a"
+        ]
+    }
+}
diff --git a/tests/dictionaries_old/10valid_enum_multi/tiramisu/base.py b/tests/dictionaries_old/10valid_enum_multi/tiramisu/base.py
new file mode 100644
index 00000000..260c17ff
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_multi/tiramisu/base.py
@@ -0,0 +1,18 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_4 = ChoiceOption(name="multi", doc="multi", values=('a', 'b', 'c'), multi=True, default=['a'], default_multi="a", properties=frozenset({"mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10valid_enum_none/00-base.xml b/tests/dictionaries_old/10valid_enum_none/00-base.xml
new file mode 100644
index 00000000..e8d46327
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_none/00-base.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="enumfam" mode="expert">
+      <variable name="enumvar" type="string" description="multi" help="bla bla bla" mandatory="False">
+        <value>b</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>a</param>
+      <param>b</param>
+      <param/>
+      <target>enumvar</target>
+    </check>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10valid_enum_none/__init__.py b/tests/dictionaries_old/10valid_enum_none/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10valid_enum_none/makedict/after.json b/tests/dictionaries_old/10valid_enum_none/makedict/after.json
new file mode 100644
index 00000000..d6511618
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_none/makedict/after.json
@@ -0,0 +1,10 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.enumfam.enumvar": {
+        "owner": "default",
+        "value": "b"
+    }
+}
diff --git a/tests/dictionaries_old/10valid_enum_none/makedict/base.json b/tests/dictionaries_old/10valid_enum_none/makedict/base.json
new file mode 100644
index 00000000..07f78c4a
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_none/makedict/base.json
@@ -0,0 +1,4 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.enumfam.enumvar": "b"
+}
diff --git a/tests/dictionaries_old/10valid_enum_none/makedict/before.json b/tests/dictionaries_old/10valid_enum_none/makedict/before.json
new file mode 100644
index 00000000..d6511618
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_none/makedict/before.json
@@ -0,0 +1,10 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.enumfam.enumvar": {
+        "owner": "default",
+        "value": "b"
+    }
+}
diff --git a/tests/dictionaries_old/10valid_enum_none/tiramisu/base.py b/tests/dictionaries_old/10valid_enum_none/tiramisu/base.py
new file mode 100644
index 00000000..1625920d
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_none/tiramisu/base.py
@@ -0,0 +1,20 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"expert", "mandatory"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"expert"}))
+option_5 = ChoiceOption(name="enumvar", doc="multi", values=('a', 'b', '', None), default="b", properties=frozenset({"expert"}))
+option_5.impl_set_information('help', "bla bla bla")
+option_4 = OptionDescription(name="enumfam", doc="enumfam", children=[option_5], properties=frozenset({"expert"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_4])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10valid_enum_number/00-base.xml b/tests/dictionaries_old/10valid_enum_number/00-base.xml
new file mode 100644
index 00000000..fb8b66d9
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_number/00-base.xml
@@ -0,0 +1,21 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="enumfam" mode="expert">
+      <variable name="enumvar" type="number" description="enumvar" help="bla bla bla"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>1</param>
+      <param>2</param>
+      <param>3</param>
+      <target>enumvar</target>
+    </check>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10valid_enum_number/__init__.py b/tests/dictionaries_old/10valid_enum_number/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10valid_enum_number/makedict/after.json b/tests/dictionaries_old/10valid_enum_number/makedict/after.json
new file mode 100644
index 00000000..9e95f9bc
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_number/makedict/after.json
@@ -0,0 +1,10 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.enumfam.enumvar": {
+        "owner": "default",
+        "value": 1
+    }
+}
diff --git a/tests/dictionaries_old/10valid_enum_number/makedict/base.json b/tests/dictionaries_old/10valid_enum_number/makedict/base.json
new file mode 100644
index 00000000..ef9d9758
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_number/makedict/base.json
@@ -0,0 +1,4 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.enumfam.enumvar": 1
+}
diff --git a/tests/dictionaries_old/10valid_enum_number/makedict/before.json b/tests/dictionaries_old/10valid_enum_number/makedict/before.json
new file mode 100644
index 00000000..9e95f9bc
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_number/makedict/before.json
@@ -0,0 +1,10 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.enumfam.enumvar": {
+        "owner": "default",
+        "value": 1
+    }
+}
diff --git a/tests/dictionaries_old/10valid_enum_number/tiramisu/base.py b/tests/dictionaries_old/10valid_enum_number/tiramisu/base.py
new file mode 100644
index 00000000..1454d749
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_number/tiramisu/base.py
@@ -0,0 +1,20 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"expert", "mandatory"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"expert"}))
+option_5 = ChoiceOption(name="enumvar", doc="enumvar", values=(1, 2, 3), default=1, properties=frozenset({"expert", "mandatory"}))
+option_5.impl_set_information('help', "bla bla bla")
+option_4 = OptionDescription(name="enumfam", doc="enumfam", children=[option_5], properties=frozenset({"expert"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_4])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10valid_enum_numberdefault/00-base.xml b/tests/dictionaries_old/10valid_enum_numberdefault/00-base.xml
new file mode 100644
index 00000000..a02d91bf
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_numberdefault/00-base.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="enumfam" mode="expert">
+      <variable name="enumvar" type="number" description="enumvar" help="bla bla bla">
+        <value>3</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>1</param>
+      <param>2</param>
+      <param>3</param>
+      <target>enumvar</target>
+    </check>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10valid_enum_numberdefault/__init__.py b/tests/dictionaries_old/10valid_enum_numberdefault/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10valid_enum_numberdefault/makedict/after.json b/tests/dictionaries_old/10valid_enum_numberdefault/makedict/after.json
new file mode 100644
index 00000000..080ba821
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_numberdefault/makedict/after.json
@@ -0,0 +1,10 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.enumfam.enumvar": {
+        "owner": "default",
+        "value": 3
+    }
+}
diff --git a/tests/dictionaries_old/10valid_enum_numberdefault/makedict/base.json b/tests/dictionaries_old/10valid_enum_numberdefault/makedict/base.json
new file mode 100644
index 00000000..e8e0dc0f
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_numberdefault/makedict/base.json
@@ -0,0 +1,4 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.enumfam.enumvar": 3
+}
diff --git a/tests/dictionaries_old/10valid_enum_numberdefault/makedict/before.json b/tests/dictionaries_old/10valid_enum_numberdefault/makedict/before.json
new file mode 100644
index 00000000..080ba821
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_numberdefault/makedict/before.json
@@ -0,0 +1,10 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.enumfam.enumvar": {
+        "owner": "default",
+        "value": 3
+    }
+}
diff --git a/tests/dictionaries_old/10valid_enum_numberdefault/tiramisu/base.py b/tests/dictionaries_old/10valid_enum_numberdefault/tiramisu/base.py
new file mode 100644
index 00000000..a33048cd
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_numberdefault/tiramisu/base.py
@@ -0,0 +1,20 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"expert", "mandatory"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"expert"}))
+option_5 = ChoiceOption(name="enumvar", doc="enumvar", values=(1, 2, 3), default=3, properties=frozenset({"expert", "mandatory"}))
+option_5.impl_set_information('help', "bla bla bla")
+option_4 = OptionDescription(name="enumfam", doc="enumfam", children=[option_5], properties=frozenset({"expert"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_4])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10valid_enum_param_empty/00-base.xml b/tests/dictionaries_old/10valid_enum_param_empty/00-base.xml
new file mode 100644
index 00000000..23831823
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_param_empty/00-base.xml
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="enumfam" mode="expert">
+      <variable name="enumvar" type="string" description="multi" help="bla bla bla"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param type="nil"/>
+      <target>enumvar</target>
+    </check>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10valid_enum_param_empty/__init__.py b/tests/dictionaries_old/10valid_enum_param_empty/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10valid_enum_param_empty/makedict/after.json b/tests/dictionaries_old/10valid_enum_param_empty/makedict/after.json
new file mode 100644
index 00000000..4c3ef489
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_param_empty/makedict/after.json
@@ -0,0 +1,10 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.enumfam.enumvar": {
+        "owner": "default",
+        "value": null
+    }
+}
diff --git a/tests/dictionaries_old/10valid_enum_param_empty/makedict/base.json b/tests/dictionaries_old/10valid_enum_param_empty/makedict/base.json
new file mode 100644
index 00000000..53dfede8
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_param_empty/makedict/base.json
@@ -0,0 +1,4 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.enumfam.enumvar": null
+}
diff --git a/tests/dictionaries_old/10valid_enum_param_empty/makedict/before.json b/tests/dictionaries_old/10valid_enum_param_empty/makedict/before.json
new file mode 100644
index 00000000..4c3ef489
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_param_empty/makedict/before.json
@@ -0,0 +1,10 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.enumfam.enumvar": {
+        "owner": "default",
+        "value": null
+    }
+}
diff --git a/tests/dictionaries_old/10valid_enum_param_empty/tiramisu/base.py b/tests/dictionaries_old/10valid_enum_param_empty/tiramisu/base.py
new file mode 100644
index 00000000..782b6a33
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_param_empty/tiramisu/base.py
@@ -0,0 +1,20 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"expert", "mandatory"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"expert"}))
+option_5 = ChoiceOption(name="enumvar", doc="multi", values=(None,), properties=frozenset({"expert"}))
+option_5.impl_set_information('help', "bla bla bla")
+option_4 = OptionDescription(name="enumfam", doc="enumfam", children=[option_5], properties=frozenset({"expert"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_4])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10valid_enum_param_empty2/00-base.xml b/tests/dictionaries_old/10valid_enum_param_empty2/00-base.xml
new file mode 100644
index 00000000..23831823
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_param_empty2/00-base.xml
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="enumfam" mode="expert">
+      <variable name="enumvar" type="string" description="multi" help="bla bla bla"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param type="nil"/>
+      <target>enumvar</target>
+    </check>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10valid_enum_param_empty2/__init__.py b/tests/dictionaries_old/10valid_enum_param_empty2/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10valid_enum_param_empty2/makedict/after.json b/tests/dictionaries_old/10valid_enum_param_empty2/makedict/after.json
new file mode 100644
index 00000000..4c3ef489
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_param_empty2/makedict/after.json
@@ -0,0 +1,10 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.enumfam.enumvar": {
+        "owner": "default",
+        "value": null
+    }
+}
diff --git a/tests/dictionaries_old/10valid_enum_param_empty2/makedict/base.json b/tests/dictionaries_old/10valid_enum_param_empty2/makedict/base.json
new file mode 100644
index 00000000..53dfede8
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_param_empty2/makedict/base.json
@@ -0,0 +1,4 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.enumfam.enumvar": null
+}
diff --git a/tests/dictionaries_old/10valid_enum_param_empty2/makedict/before.json b/tests/dictionaries_old/10valid_enum_param_empty2/makedict/before.json
new file mode 100644
index 00000000..4c3ef489
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_param_empty2/makedict/before.json
@@ -0,0 +1,10 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.enumfam.enumvar": {
+        "owner": "default",
+        "value": null
+    }
+}
diff --git a/tests/dictionaries_old/10valid_enum_param_empty2/tiramisu/base.py b/tests/dictionaries_old/10valid_enum_param_empty2/tiramisu/base.py
new file mode 100644
index 00000000..782b6a33
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_param_empty2/tiramisu/base.py
@@ -0,0 +1,20 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"expert", "mandatory"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"expert"}))
+option_5 = ChoiceOption(name="enumvar", doc="multi", values=(None,), properties=frozenset({"expert"}))
+option_5.impl_set_information('help', "bla bla bla")
+option_4 = OptionDescription(name="enumfam", doc="enumfam", children=[option_5], properties=frozenset({"expert"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_4])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10valid_enum_quote/00-base.xml b/tests/dictionaries_old/10valid_enum_quote/00-base.xml
new file mode 100644
index 00000000..d8e1f824
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_quote/00-base.xml
@@ -0,0 +1,21 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="enumfam" mode="expert">
+      <variable name="enumvar" type="string" description="multi" help="bla bla bla"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>quote'</param>
+      <param>quote"</param>
+      <param>quote"'</param>
+      <target>enumvar</target>
+    </check>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10valid_enum_quote/__init__.py b/tests/dictionaries_old/10valid_enum_quote/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10valid_enum_quote/makedict/after.json b/tests/dictionaries_old/10valid_enum_quote/makedict/after.json
new file mode 100644
index 00000000..4d231f85
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_quote/makedict/after.json
@@ -0,0 +1,10 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.enumfam.enumvar": {
+        "owner": "default",
+        "value": "quote'"
+    }
+}
diff --git a/tests/dictionaries_old/10valid_enum_quote/makedict/base.json b/tests/dictionaries_old/10valid_enum_quote/makedict/base.json
new file mode 100644
index 00000000..c63f634d
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_quote/makedict/base.json
@@ -0,0 +1,4 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.enumfam.enumvar": "quote'"
+}
diff --git a/tests/dictionaries_old/10valid_enum_quote/makedict/before.json b/tests/dictionaries_old/10valid_enum_quote/makedict/before.json
new file mode 100644
index 00000000..4d231f85
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_quote/makedict/before.json
@@ -0,0 +1,10 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.enumfam.enumvar": {
+        "owner": "default",
+        "value": "quote'"
+    }
+}
diff --git a/tests/dictionaries_old/10valid_enum_quote/tiramisu/base.py b/tests/dictionaries_old/10valid_enum_quote/tiramisu/base.py
new file mode 100644
index 00000000..ff69f9e1
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_quote/tiramisu/base.py
@@ -0,0 +1,20 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"expert", "mandatory"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"expert"}))
+option_5 = ChoiceOption(name="enumvar", doc="multi", values=("quote'", 'quote"', 'quote"\''), default="quote'", properties=frozenset({"expert", "mandatory"}))
+option_5.impl_set_information('help', "bla bla bla")
+option_4 = OptionDescription(name="enumfam", doc="enumfam", children=[option_5], properties=frozenset({"expert"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_4])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/10valid_enum_value/00-base.xml b/tests/dictionaries_old/10valid_enum_value/00-base.xml
new file mode 100644
index 00000000..4ace1891
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_value/00-base.xml
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>b</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>a</param>
+      <param>b</param>
+      <param>c</param>
+      <target>mode_conteneur_actif</target>
+    </check>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/10valid_enum_value/__init__.py b/tests/dictionaries_old/10valid_enum_value/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/10valid_enum_value/makedict/after.json b/tests/dictionaries_old/10valid_enum_value/makedict/after.json
new file mode 100644
index 00000000..b0f53f2b
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_value/makedict/after.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "b"
+    }
+}
diff --git a/tests/dictionaries_old/10valid_enum_value/makedict/base.json b/tests/dictionaries_old/10valid_enum_value/makedict/base.json
new file mode 100644
index 00000000..9e37bc12
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_value/makedict/base.json
@@ -0,0 +1,3 @@
+{
+    "rougail.general.mode_conteneur_actif": "b"
+}
diff --git a/tests/dictionaries_old/10valid_enum_value/makedict/before.json b/tests/dictionaries_old/10valid_enum_value/makedict/before.json
new file mode 100644
index 00000000..b0f53f2b
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_value/makedict/before.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "b"
+    }
+}
diff --git a/tests/dictionaries_old/10valid_enum_value/tiramisu/base.py b/tests/dictionaries_old/10valid_enum_value/tiramisu/base.py
new file mode 100644
index 00000000..0d7ed6a5
--- /dev/null
+++ b/tests/dictionaries_old/10valid_enum_value/tiramisu/base.py
@@ -0,0 +1,17 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = ChoiceOption(name="mode_conteneur_actif", doc="No change", values=('a', 'b', 'c'), default="b", properties=frozenset({"mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/11disabled_if_in_filelist/00-base.xml b/tests/dictionaries_old/11disabled_if_in_filelist/00-base.xml
new file mode 100644
index 00000000..dc6be191
--- /dev/null
+++ b/tests/dictionaries_old/11disabled_if_in_filelist/00-base.xml
@@ -0,0 +1,27 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="test">
+      <file filelist="afilllist">/etc/file</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="boolean" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+      <target type="filelist">afilllist</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/11disabled_if_in_filelist/__init__.py b/tests/dictionaries_old/11disabled_if_in_filelist/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/11disabled_if_in_filelist/makedict/after.json b/tests/dictionaries_old/11disabled_if_in_filelist/makedict/after.json
new file mode 100644
index 00000000..14937b25
--- /dev/null
+++ b/tests/dictionaries_old/11disabled_if_in_filelist/makedict/after.json
@@ -0,0 +1,30 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.files.file.name": {
+        "owner": "default",
+        "value": "/etc/file"
+    },
+    "services.test.files.file.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/11disabled_if_in_filelist/makedict/base.json b/tests/dictionaries_old/11disabled_if_in_filelist/makedict/base.json
new file mode 100644
index 00000000..05d18c18
--- /dev/null
+++ b/tests/dictionaries_old/11disabled_if_in_filelist/makedict/base.json
@@ -0,0 +1,9 @@
+{
+    "rougail.general.condition": "non",
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general.mode_conteneur_actif2": true,
+    "services.test.files.file.name": "/etc/file",
+    "services.test.files.file.activate": true,
+    "services.test.activate": true,
+    "services.test.manage": true
+}
diff --git a/tests/dictionaries_old/11disabled_if_in_filelist/makedict/before.json b/tests/dictionaries_old/11disabled_if_in_filelist/makedict/before.json
new file mode 100644
index 00000000..14937b25
--- /dev/null
+++ b/tests/dictionaries_old/11disabled_if_in_filelist/makedict/before.json
@@ -0,0 +1,30 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.files.file.name": {
+        "owner": "default",
+        "value": "/etc/file"
+    },
+    "services.test.files.file.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/11disabled_if_in_filelist/result/etc/file b/tests/dictionaries_old/11disabled_if_in_filelist/result/etc/file
new file mode 100644
index 00000000..d907505b
--- /dev/null
+++ b/tests/dictionaries_old/11disabled_if_in_filelist/result/etc/file
@@ -0,0 +1 @@
+non
diff --git a/tests/dictionaries_old/11disabled_if_in_filelist/result/tmpfiles.d/rougail.conf b/tests/dictionaries_old/11disabled_if_in_filelist/result/tmpfiles.d/rougail.conf
new file mode 100644
index 00000000..574c7b82
--- /dev/null
+++ b/tests/dictionaries_old/11disabled_if_in_filelist/result/tmpfiles.d/rougail.conf
@@ -0,0 +1,2 @@
+C /etc/file 0644 root root - /usr/local/lib/etc/file
+z /etc/file - - - - -
diff --git a/tests/dictionaries_old/11disabled_if_in_filelist/tiramisu/base.py b/tests/dictionaries_old/11disabled_if_in_filelist/tiramisu/base.py
new file mode 100644
index 00000000..8da62c74
--- /dev/null
+++ b/tests/dictionaries_old/11disabled_if_in_filelist/tiramisu/base.py
@@ -0,0 +1,28 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))}))
+option_5 = BoolOption(name="mode_conteneur_actif2", doc="No change", default=True, properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_10 = FilenameOption(name="name", doc="name", default="/etc/file")
+option_11 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, notraisepropertyerror=True), 'expected_0': ParamValue("oui")})))
+option_9 = OptionDescription(name="file", doc="file", children=[option_10, option_11])
+option_9.impl_set_information('source', "file")
+option_8 = OptionDescription(name="files", doc="files", children=[option_9])
+option_12 = BoolOption(name="activate", doc="activate", default=True)
+option_13 = BoolOption(name="manage", doc="manage", default=True)
+option_7 = OptionDescription(name="test", doc="test", children=[option_8, option_12, option_13])
+option_6 = OptionDescription(name="services", doc="services", children=[option_7], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_6])
diff --git a/tests/dictionaries_old/11disabled_if_in_filelist/tmpl/file b/tests/dictionaries_old/11disabled_if_in_filelist/tmpl/file
new file mode 100644
index 00000000..5113d9aa
--- /dev/null
+++ b/tests/dictionaries_old/11disabled_if_in_filelist/tmpl/file
@@ -0,0 +1 @@
+%%condition
diff --git a/tests/dictionaries_old/11disabled_if_in_filelist_boolean/00-base.xml b/tests/dictionaries_old/11disabled_if_in_filelist_boolean/00-base.xml
new file mode 100644
index 00000000..a74e5331
--- /dev/null
+++ b/tests/dictionaries_old/11disabled_if_in_filelist_boolean/00-base.xml
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="test">
+      <file filelist="afilllist">/tmp/file1</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="condition" type="boolean"/>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param type="boolean">True</param>
+      <target type="filelist">afilllist</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/11disabled_if_in_filelist_boolean/__init__.py b/tests/dictionaries_old/11disabled_if_in_filelist_boolean/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/11disabled_if_in_filelist_boolean/makedict/after.json b/tests/dictionaries_old/11disabled_if_in_filelist_boolean/makedict/after.json
new file mode 100644
index 00000000..2d2b3390
--- /dev/null
+++ b/tests/dictionaries_old/11disabled_if_in_filelist_boolean/makedict/after.json
@@ -0,0 +1,22 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.files.file1.name": {
+        "owner": "default",
+        "value": "/tmp/file1"
+    },
+    "services.test.files.file1.activate": {
+        "owner": "default",
+        "value": false
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/11disabled_if_in_filelist_boolean/makedict/base.json b/tests/dictionaries_old/11disabled_if_in_filelist_boolean/makedict/base.json
new file mode 100644
index 00000000..e0b590dc
--- /dev/null
+++ b/tests/dictionaries_old/11disabled_if_in_filelist_boolean/makedict/base.json
@@ -0,0 +1,7 @@
+{
+    "rougail.general.condition": true,
+    "services.test.files.file1.name": "/tmp/file1",
+    "services.test.files.file1.activate": false,
+    "services.test.activate": true,
+    "services.test.manage": true
+}
diff --git a/tests/dictionaries_old/11disabled_if_in_filelist_boolean/makedict/before.json b/tests/dictionaries_old/11disabled_if_in_filelist_boolean/makedict/before.json
new file mode 100644
index 00000000..2d2b3390
--- /dev/null
+++ b/tests/dictionaries_old/11disabled_if_in_filelist_boolean/makedict/before.json
@@ -0,0 +1,22 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.files.file1.name": {
+        "owner": "default",
+        "value": "/tmp/file1"
+    },
+    "services.test.files.file1.activate": {
+        "owner": "default",
+        "value": false
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/11disabled_if_in_filelist_boolean/tiramisu/base.py b/tests/dictionaries_old/11disabled_if_in_filelist_boolean/tiramisu/base.py
new file mode 100644
index 00000000..96743d30
--- /dev/null
+++ b/tests/dictionaries_old/11disabled_if_in_filelist_boolean/tiramisu/base.py
@@ -0,0 +1,26 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = BoolOption(name="condition", doc="condition", default=True, properties=frozenset({"mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_8 = FilenameOption(name="name", doc="name", default="/tmp/file1")
+option_9 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, notraisepropertyerror=True), 'expected_0': ParamValue(True)})))
+option_7 = OptionDescription(name="file1", doc="file1", children=[option_8, option_9])
+option_7.impl_set_information('source', "file1")
+option_6 = OptionDescription(name="files", doc="files", children=[option_7])
+option_10 = BoolOption(name="activate", doc="activate", default=True)
+option_11 = BoolOption(name="manage", doc="manage", default=True)
+option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_10, option_11])
+option_4 = OptionDescription(name="services", doc="services", children=[option_5], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4])
diff --git a/tests/dictionaries_old/11disabled_if_in_filelist_boolean2/00-base.xml b/tests/dictionaries_old/11disabled_if_in_filelist_boolean2/00-base.xml
new file mode 100644
index 00000000..a3f20117
--- /dev/null
+++ b/tests/dictionaries_old/11disabled_if_in_filelist_boolean2/00-base.xml
@@ -0,0 +1,21 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="test">
+      <file filelist="afilllist">/tmp/file1</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="condition" type="boolean">
+        <value>False</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>True</param>
+      <target type="filelist">afilllist</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/11disabled_if_in_filelist_boolean2/__init__.py b/tests/dictionaries_old/11disabled_if_in_filelist_boolean2/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/11disabled_if_in_filelist_boolean2/makedict/after.json b/tests/dictionaries_old/11disabled_if_in_filelist_boolean2/makedict/after.json
new file mode 100644
index 00000000..a7cf2fa1
--- /dev/null
+++ b/tests/dictionaries_old/11disabled_if_in_filelist_boolean2/makedict/after.json
@@ -0,0 +1,22 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": false
+    },
+    "services.test.files.file1.name": {
+        "owner": "default",
+        "value": "/tmp/file1"
+    },
+    "services.test.files.file1.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/11disabled_if_in_filelist_boolean2/makedict/base.json b/tests/dictionaries_old/11disabled_if_in_filelist_boolean2/makedict/base.json
new file mode 100644
index 00000000..1920d6a3
--- /dev/null
+++ b/tests/dictionaries_old/11disabled_if_in_filelist_boolean2/makedict/base.json
@@ -0,0 +1,7 @@
+{
+    "rougail.general.condition": false,
+    "services.test.files.file1.name": "/tmp/file1",
+    "services.test.files.file1.activate": true,
+    "services.test.activate": true,
+    "services.test.manage": true
+}
diff --git a/tests/dictionaries_old/11disabled_if_in_filelist_boolean2/makedict/before.json b/tests/dictionaries_old/11disabled_if_in_filelist_boolean2/makedict/before.json
new file mode 100644
index 00000000..a7cf2fa1
--- /dev/null
+++ b/tests/dictionaries_old/11disabled_if_in_filelist_boolean2/makedict/before.json
@@ -0,0 +1,22 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": false
+    },
+    "services.test.files.file1.name": {
+        "owner": "default",
+        "value": "/tmp/file1"
+    },
+    "services.test.files.file1.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/11disabled_if_in_filelist_boolean2/tiramisu/base.py b/tests/dictionaries_old/11disabled_if_in_filelist_boolean2/tiramisu/base.py
new file mode 100644
index 00000000..e9d36a21
--- /dev/null
+++ b/tests/dictionaries_old/11disabled_if_in_filelist_boolean2/tiramisu/base.py
@@ -0,0 +1,26 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = BoolOption(name="condition", doc="condition", default=False, properties=frozenset({"mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_8 = FilenameOption(name="name", doc="name", default="/tmp/file1")
+option_9 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, notraisepropertyerror=True), 'expected_0': ParamValue(True)})))
+option_7 = OptionDescription(name="file1", doc="file1", children=[option_8, option_9])
+option_7.impl_set_information('source', "file1")
+option_6 = OptionDescription(name="files", doc="files", children=[option_7])
+option_10 = BoolOption(name="activate", doc="activate", default=True)
+option_11 = BoolOption(name="manage", doc="manage", default=True)
+option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_10, option_11])
+option_4 = OptionDescription(name="services", doc="services", children=[option_5], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4])
diff --git a/tests/dictionaries_old/11disabled_if_in_filelist_disabled/00-base.xml b/tests/dictionaries_old/11disabled_if_in_filelist_disabled/00-base.xml
new file mode 100644
index 00000000..c9283603
--- /dev/null
+++ b/tests/dictionaries_old/11disabled_if_in_filelist_disabled/00-base.xml
@@ -0,0 +1,29 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="test">
+      <file filelist="afilllist">/etc/file</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>oui</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+      <target type="filelist">afilllist</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/11disabled_if_in_filelist_disabled/__init__.py b/tests/dictionaries_old/11disabled_if_in_filelist_disabled/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/11disabled_if_in_filelist_disabled/makedict/after.json b/tests/dictionaries_old/11disabled_if_in_filelist_disabled/makedict/after.json
new file mode 100644
index 00000000..9c46a022
--- /dev/null
+++ b/tests/dictionaries_old/11disabled_if_in_filelist_disabled/makedict/after.json
@@ -0,0 +1,22 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "oui"
+    },
+    "services.test.files.file.name": {
+        "owner": "default",
+        "value": "/etc/file"
+    },
+    "services.test.files.file.activate": {
+        "owner": "default",
+        "value": false
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/11disabled_if_in_filelist_disabled/makedict/base.json b/tests/dictionaries_old/11disabled_if_in_filelist_disabled/makedict/base.json
new file mode 100644
index 00000000..a7466708
--- /dev/null
+++ b/tests/dictionaries_old/11disabled_if_in_filelist_disabled/makedict/base.json
@@ -0,0 +1,7 @@
+{
+    "rougail.general.condition": "oui",
+    "services.test.files.file.name": "/etc/file",
+    "services.test.files.file.activate": false,
+    "services.test.activate": true,
+    "services.test.manage": true
+}
diff --git a/tests/dictionaries_old/11disabled_if_in_filelist_disabled/makedict/before.json b/tests/dictionaries_old/11disabled_if_in_filelist_disabled/makedict/before.json
new file mode 100644
index 00000000..9c46a022
--- /dev/null
+++ b/tests/dictionaries_old/11disabled_if_in_filelist_disabled/makedict/before.json
@@ -0,0 +1,22 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "oui"
+    },
+    "services.test.files.file.name": {
+        "owner": "default",
+        "value": "/etc/file"
+    },
+    "services.test.files.file.activate": {
+        "owner": "default",
+        "value": false
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/11disabled_if_in_filelist_disabled/result/tmpfiles.d/rougail.conf b/tests/dictionaries_old/11disabled_if_in_filelist_disabled/result/tmpfiles.d/rougail.conf
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/11disabled_if_in_filelist_disabled/tiramisu/base.py b/tests/dictionaries_old/11disabled_if_in_filelist_disabled/tiramisu/base.py
new file mode 100644
index 00000000..fe3bb4be
--- /dev/null
+++ b/tests/dictionaries_old/11disabled_if_in_filelist_disabled/tiramisu/base.py
@@ -0,0 +1,28 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="condition", doc="No change", default="oui", properties=frozenset({"mandatory", "normal"}))
+option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))}))
+option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_10 = FilenameOption(name="name", doc="name", default="/etc/file")
+option_11 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, notraisepropertyerror=True), 'expected_0': ParamValue("oui")})))
+option_9 = OptionDescription(name="file", doc="file", children=[option_10, option_11])
+option_9.impl_set_information('source', "file")
+option_8 = OptionDescription(name="files", doc="files", children=[option_9])
+option_12 = BoolOption(name="activate", doc="activate", default=True)
+option_13 = BoolOption(name="manage", doc="manage", default=True)
+option_7 = OptionDescription(name="test", doc="test", children=[option_8, option_12, option_13])
+option_6 = OptionDescription(name="services", doc="services", children=[option_7], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_6])
diff --git a/tests/dictionaries_old/11disabled_if_in_filelist_disabled/tmpl/file b/tests/dictionaries_old/11disabled_if_in_filelist_disabled/tmpl/file
new file mode 100644
index 00000000..5113d9aa
--- /dev/null
+++ b/tests/dictionaries_old/11disabled_if_in_filelist_disabled/tmpl/file
@@ -0,0 +1 @@
+%%condition
diff --git a/tests/dictionaries_old/11disabled_if_in_filelist_multi/00-base.xml b/tests/dictionaries_old/11disabled_if_in_filelist_multi/00-base.xml
new file mode 100644
index 00000000..43a9b82b
--- /dev/null
+++ b/tests/dictionaries_old/11disabled_if_in_filelist_multi/00-base.xml
@@ -0,0 +1,30 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="test">
+      <file filelist="afilllist">/tmp/file1</file>
+      <file filelist="afilllist">/tmp/file2</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+      <target type="filelist">afilllist</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/11disabled_if_in_filelist_multi/__init__.py b/tests/dictionaries_old/11disabled_if_in_filelist_multi/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/11disabled_if_in_filelist_multi/makedict/after.json b/tests/dictionaries_old/11disabled_if_in_filelist_multi/makedict/after.json
new file mode 100644
index 00000000..f09965a8
--- /dev/null
+++ b/tests/dictionaries_old/11disabled_if_in_filelist_multi/makedict/after.json
@@ -0,0 +1,38 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "non"
+    },
+    "services.test.files.file1.name": {
+        "owner": "default",
+        "value": "/tmp/file1"
+    },
+    "services.test.files.file1.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.files.file2.name": {
+        "owner": "default",
+        "value": "/tmp/file2"
+    },
+    "services.test.files.file2.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/11disabled_if_in_filelist_multi/makedict/base.json b/tests/dictionaries_old/11disabled_if_in_filelist_multi/makedict/base.json
new file mode 100644
index 00000000..0e923582
--- /dev/null
+++ b/tests/dictionaries_old/11disabled_if_in_filelist_multi/makedict/base.json
@@ -0,0 +1,11 @@
+{
+    "rougail.general.condition": "non",
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general.mode_conteneur_actif2": "non",
+    "services.test.files.file1.name": "/tmp/file1",
+    "services.test.files.file1.activate": true,
+    "services.test.files.file2.name": "/tmp/file2",
+    "services.test.files.file2.activate": true,
+    "services.test.activate": true,
+    "services.test.manage": true
+}
diff --git a/tests/dictionaries_old/11disabled_if_in_filelist_multi/makedict/before.json b/tests/dictionaries_old/11disabled_if_in_filelist_multi/makedict/before.json
new file mode 100644
index 00000000..f09965a8
--- /dev/null
+++ b/tests/dictionaries_old/11disabled_if_in_filelist_multi/makedict/before.json
@@ -0,0 +1,38 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "non"
+    },
+    "services.test.files.file1.name": {
+        "owner": "default",
+        "value": "/tmp/file1"
+    },
+    "services.test.files.file1.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.files.file2.name": {
+        "owner": "default",
+        "value": "/tmp/file2"
+    },
+    "services.test.files.file2.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/11disabled_if_in_filelist_multi/tiramisu/base.py b/tests/dictionaries_old/11disabled_if_in_filelist_multi/tiramisu/base.py
new file mode 100644
index 00000000..ecff691e
--- /dev/null
+++ b/tests/dictionaries_old/11disabled_if_in_filelist_multi/tiramisu/base.py
@@ -0,0 +1,32 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))}))
+option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_10 = FilenameOption(name="name", doc="name", default="/tmp/file1")
+option_11 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, notraisepropertyerror=True), 'expected_0': ParamValue("oui")})))
+option_9 = OptionDescription(name="file1", doc="file1", children=[option_10, option_11])
+option_9.impl_set_information('source', "file1")
+option_13 = FilenameOption(name="name", doc="name", default="/tmp/file2")
+option_14 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, notraisepropertyerror=True), 'expected_0': ParamValue("oui")})))
+option_12 = OptionDescription(name="file2", doc="file2", children=[option_13, option_14])
+option_12.impl_set_information('source', "file2")
+option_8 = OptionDescription(name="files", doc="files", children=[option_9, option_12])
+option_15 = BoolOption(name="activate", doc="activate", default=True)
+option_16 = BoolOption(name="manage", doc="manage", default=True)
+option_7 = OptionDescription(name="test", doc="test", children=[option_8, option_15, option_16])
+option_6 = OptionDescription(name="services", doc="services", children=[option_7], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_6])
diff --git a/tests/dictionaries_old/11disabledifin_filelist_notexist/00-base.xml b/tests/dictionaries_old/11disabledifin_filelist_notexist/00-base.xml
new file mode 100644
index 00000000..373e6cfc
--- /dev/null
+++ b/tests/dictionaries_old/11disabledifin_filelist_notexist/00-base.xml
@@ -0,0 +1,27 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="test">
+      <file filelist="afilllist">/tmp/file</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_not_in" source="condition">
+      <param>unpossible</param>
+      <target type="filelist">afilllist</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/11disabledifin_filelist_notexist/__init__.py b/tests/dictionaries_old/11disabledifin_filelist_notexist/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/11disabledifin_filelist_notexist/makedict/after.json b/tests/dictionaries_old/11disabledifin_filelist_notexist/makedict/after.json
new file mode 100644
index 00000000..7017b8a5
--- /dev/null
+++ b/tests/dictionaries_old/11disabledifin_filelist_notexist/makedict/after.json
@@ -0,0 +1,30 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "non"
+    },
+    "services.test.files.file.name": {
+        "owner": "default",
+        "value": "/tmp/file"
+    },
+    "services.test.files.file.activate": {
+        "owner": "default",
+        "value": false
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/11disabledifin_filelist_notexist/makedict/base.json b/tests/dictionaries_old/11disabledifin_filelist_notexist/makedict/base.json
new file mode 100644
index 00000000..23361c53
--- /dev/null
+++ b/tests/dictionaries_old/11disabledifin_filelist_notexist/makedict/base.json
@@ -0,0 +1,9 @@
+{
+    "rougail.general.condition": "non",
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general.mode_conteneur_actif2": "non",
+    "services.test.files.file.name": "/tmp/file",
+    "services.test.files.file.activate": false,
+    "services.test.activate": true,
+    "services.test.manage": true
+}
diff --git a/tests/dictionaries_old/11disabledifin_filelist_notexist/makedict/before.json b/tests/dictionaries_old/11disabledifin_filelist_notexist/makedict/before.json
new file mode 100644
index 00000000..7017b8a5
--- /dev/null
+++ b/tests/dictionaries_old/11disabledifin_filelist_notexist/makedict/before.json
@@ -0,0 +1,30 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "non"
+    },
+    "services.test.files.file.name": {
+        "owner": "default",
+        "value": "/tmp/file"
+    },
+    "services.test.files.file.activate": {
+        "owner": "default",
+        "value": false
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/11disabledifin_filelist_notexist/tiramisu/base.py b/tests/dictionaries_old/11disabledifin_filelist_notexist/tiramisu/base.py
new file mode 100644
index 00000000..9ad073d5
--- /dev/null
+++ b/tests/dictionaries_old/11disabledifin_filelist_notexist/tiramisu/base.py
@@ -0,0 +1,28 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_10 = FilenameOption(name="name", doc="name", default="/tmp/file")
+option_11 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, notraisepropertyerror=True), 'expected_0': ParamValue("unpossible"), 'reverse_condition_0': ParamValue(True)})))
+option_9 = OptionDescription(name="file", doc="file", children=[option_10, option_11])
+option_9.impl_set_information('source', "file")
+option_8 = OptionDescription(name="files", doc="files", children=[option_9])
+option_12 = BoolOption(name="activate", doc="activate", default=True)
+option_13 = BoolOption(name="manage", doc="manage", default=True)
+option_7 = OptionDescription(name="test", doc="test", children=[option_8, option_12, option_13])
+option_6 = OptionDescription(name="services", doc="services", children=[option_7], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_6])
diff --git a/tests/dictionaries_old/11disabledifnotin_filelist_notexist/00-base.xml b/tests/dictionaries_old/11disabledifnotin_filelist_notexist/00-base.xml
new file mode 100644
index 00000000..373e6cfc
--- /dev/null
+++ b/tests/dictionaries_old/11disabledifnotin_filelist_notexist/00-base.xml
@@ -0,0 +1,27 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="test">
+      <file filelist="afilllist">/tmp/file</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_not_in" source="condition">
+      <param>unpossible</param>
+      <target type="filelist">afilllist</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/11disabledifnotin_filelist_notexist/__init__.py b/tests/dictionaries_old/11disabledifnotin_filelist_notexist/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/11disabledifnotin_filelist_notexist/makedict/after.json b/tests/dictionaries_old/11disabledifnotin_filelist_notexist/makedict/after.json
new file mode 100644
index 00000000..7017b8a5
--- /dev/null
+++ b/tests/dictionaries_old/11disabledifnotin_filelist_notexist/makedict/after.json
@@ -0,0 +1,30 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "non"
+    },
+    "services.test.files.file.name": {
+        "owner": "default",
+        "value": "/tmp/file"
+    },
+    "services.test.files.file.activate": {
+        "owner": "default",
+        "value": false
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/11disabledifnotin_filelist_notexist/makedict/base.json b/tests/dictionaries_old/11disabledifnotin_filelist_notexist/makedict/base.json
new file mode 100644
index 00000000..23361c53
--- /dev/null
+++ b/tests/dictionaries_old/11disabledifnotin_filelist_notexist/makedict/base.json
@@ -0,0 +1,9 @@
+{
+    "rougail.general.condition": "non",
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general.mode_conteneur_actif2": "non",
+    "services.test.files.file.name": "/tmp/file",
+    "services.test.files.file.activate": false,
+    "services.test.activate": true,
+    "services.test.manage": true
+}
diff --git a/tests/dictionaries_old/11disabledifnotin_filelist_notexist/makedict/before.json b/tests/dictionaries_old/11disabledifnotin_filelist_notexist/makedict/before.json
new file mode 100644
index 00000000..7017b8a5
--- /dev/null
+++ b/tests/dictionaries_old/11disabledifnotin_filelist_notexist/makedict/before.json
@@ -0,0 +1,30 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "non"
+    },
+    "services.test.files.file.name": {
+        "owner": "default",
+        "value": "/tmp/file"
+    },
+    "services.test.files.file.activate": {
+        "owner": "default",
+        "value": false
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/11disabledifnotin_filelist_notexist/tiramisu/base.py b/tests/dictionaries_old/11disabledifnotin_filelist_notexist/tiramisu/base.py
new file mode 100644
index 00000000..9ad073d5
--- /dev/null
+++ b/tests/dictionaries_old/11disabledifnotin_filelist_notexist/tiramisu/base.py
@@ -0,0 +1,28 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_10 = FilenameOption(name="name", doc="name", default="/tmp/file")
+option_11 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, notraisepropertyerror=True), 'expected_0': ParamValue("unpossible"), 'reverse_condition_0': ParamValue(True)})))
+option_9 = OptionDescription(name="file", doc="file", children=[option_10, option_11])
+option_9.impl_set_information('source', "file")
+option_8 = OptionDescription(name="files", doc="files", children=[option_9])
+option_12 = BoolOption(name="activate", doc="activate", default=True)
+option_13 = BoolOption(name="manage", doc="manage", default=True)
+option_7 = OptionDescription(name="test", doc="test", children=[option_8, option_12, option_13])
+option_6 = OptionDescription(name="services", doc="services", children=[option_7], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_6])
diff --git a/tests/dictionaries_old/11disabledifnotin_filelist_notexist_multi/00-base.xml b/tests/dictionaries_old/11disabledifnotin_filelist_notexist_multi/00-base.xml
new file mode 100644
index 00000000..9d8e3356
--- /dev/null
+++ b/tests/dictionaries_old/11disabledifnotin_filelist_notexist_multi/00-base.xml
@@ -0,0 +1,31 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="test">
+      <file filelist="afilllist">/tmp/file</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_not_in" source="condition">
+      <param>unpossible</param>
+      <target type="filelist">afilllist</target>
+    </condition>
+    <condition name="disabled_if_not_in" source="mode_conteneur_actif2">
+      <param>oui</param>
+      <target type="filelist">afilllist</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/11disabledifnotin_filelist_notexist_multi/__init__.py b/tests/dictionaries_old/11disabledifnotin_filelist_notexist_multi/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/11disabledifnotin_filelist_notexist_multi/makedict/after.json b/tests/dictionaries_old/11disabledifnotin_filelist_notexist_multi/makedict/after.json
new file mode 100644
index 00000000..7017b8a5
--- /dev/null
+++ b/tests/dictionaries_old/11disabledifnotin_filelist_notexist_multi/makedict/after.json
@@ -0,0 +1,30 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "non"
+    },
+    "services.test.files.file.name": {
+        "owner": "default",
+        "value": "/tmp/file"
+    },
+    "services.test.files.file.activate": {
+        "owner": "default",
+        "value": false
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/11disabledifnotin_filelist_notexist_multi/makedict/base.json b/tests/dictionaries_old/11disabledifnotin_filelist_notexist_multi/makedict/base.json
new file mode 100644
index 00000000..23361c53
--- /dev/null
+++ b/tests/dictionaries_old/11disabledifnotin_filelist_notexist_multi/makedict/base.json
@@ -0,0 +1,9 @@
+{
+    "rougail.general.condition": "non",
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general.mode_conteneur_actif2": "non",
+    "services.test.files.file.name": "/tmp/file",
+    "services.test.files.file.activate": false,
+    "services.test.activate": true,
+    "services.test.manage": true
+}
diff --git a/tests/dictionaries_old/11disabledifnotin_filelist_notexist_multi/makedict/before.json b/tests/dictionaries_old/11disabledifnotin_filelist_notexist_multi/makedict/before.json
new file mode 100644
index 00000000..7017b8a5
--- /dev/null
+++ b/tests/dictionaries_old/11disabledifnotin_filelist_notexist_multi/makedict/before.json
@@ -0,0 +1,30 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "non"
+    },
+    "services.test.files.file.name": {
+        "owner": "default",
+        "value": "/tmp/file"
+    },
+    "services.test.files.file.activate": {
+        "owner": "default",
+        "value": false
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/11disabledifnotin_filelist_notexist_multi/tiramisu/base.py b/tests/dictionaries_old/11disabledifnotin_filelist_notexist_multi/tiramisu/base.py
new file mode 100644
index 00000000..c0147a22
--- /dev/null
+++ b/tests/dictionaries_old/11disabledifnotin_filelist_notexist_multi/tiramisu/base.py
@@ -0,0 +1,28 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_10 = FilenameOption(name="name", doc="name", default="/tmp/file")
+option_11 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, notraisepropertyerror=True), 'expected_0': ParamValue("unpossible"), 'reverse_condition_0': ParamValue(True), 'condition_1': ParamOption(option_5, notraisepropertyerror=True), 'expected_1': ParamValue("oui"), 'reverse_condition_1': ParamValue(True), 'condition_operator': ParamValue("OR")})))
+option_9 = OptionDescription(name="file", doc="file", children=[option_10, option_11])
+option_9.impl_set_information('source', "file")
+option_8 = OptionDescription(name="files", doc="files", children=[option_9])
+option_12 = BoolOption(name="activate", doc="activate", default=True)
+option_13 = BoolOption(name="manage", doc="manage", default=True)
+option_7 = OptionDescription(name="test", doc="test", children=[option_8, option_12, option_13])
+option_6 = OptionDescription(name="services", doc="services", children=[option_7], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_6])
diff --git a/tests/dictionaries_old/11disabledifnotin_filelist_notexist_validenum/00-base.xml b/tests/dictionaries_old/11disabledifnotin_filelist_notexist_validenum/00-base.xml
new file mode 100644
index 00000000..e82e5b27
--- /dev/null
+++ b/tests/dictionaries_old/11disabledifnotin_filelist_notexist_validenum/00-base.xml
@@ -0,0 +1,32 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="test">
+      <file filelist="afilllist">/tmp/file</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>non</param>
+      <param>statique</param>
+      <target>condition</target>
+    </check>
+    <condition name="disabled_if_not_in" source="condition">
+      <param>statique</param>
+      <target type="filelist">afilllist</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/11disabledifnotin_filelist_notexist_validenum/__init__.py b/tests/dictionaries_old/11disabledifnotin_filelist_notexist_validenum/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/11disabledifnotin_filelist_notexist_validenum/makedict/after.json b/tests/dictionaries_old/11disabledifnotin_filelist_notexist_validenum/makedict/after.json
new file mode 100644
index 00000000..7017b8a5
--- /dev/null
+++ b/tests/dictionaries_old/11disabledifnotin_filelist_notexist_validenum/makedict/after.json
@@ -0,0 +1,30 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "non"
+    },
+    "services.test.files.file.name": {
+        "owner": "default",
+        "value": "/tmp/file"
+    },
+    "services.test.files.file.activate": {
+        "owner": "default",
+        "value": false
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/11disabledifnotin_filelist_notexist_validenum/makedict/base.json b/tests/dictionaries_old/11disabledifnotin_filelist_notexist_validenum/makedict/base.json
new file mode 100644
index 00000000..23361c53
--- /dev/null
+++ b/tests/dictionaries_old/11disabledifnotin_filelist_notexist_validenum/makedict/base.json
@@ -0,0 +1,9 @@
+{
+    "rougail.general.condition": "non",
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general.mode_conteneur_actif2": "non",
+    "services.test.files.file.name": "/tmp/file",
+    "services.test.files.file.activate": false,
+    "services.test.activate": true,
+    "services.test.manage": true
+}
diff --git a/tests/dictionaries_old/11disabledifnotin_filelist_notexist_validenum/makedict/before.json b/tests/dictionaries_old/11disabledifnotin_filelist_notexist_validenum/makedict/before.json
new file mode 100644
index 00000000..7017b8a5
--- /dev/null
+++ b/tests/dictionaries_old/11disabledifnotin_filelist_notexist_validenum/makedict/before.json
@@ -0,0 +1,30 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "non"
+    },
+    "services.test.files.file.name": {
+        "owner": "default",
+        "value": "/tmp/file"
+    },
+    "services.test.files.file.activate": {
+        "owner": "default",
+        "value": false
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/11disabledifnotin_filelist_notexist_validenum/tiramisu/base.py b/tests/dictionaries_old/11disabledifnotin_filelist_notexist_validenum/tiramisu/base.py
new file mode 100644
index 00000000..324f9d58
--- /dev/null
+++ b/tests/dictionaries_old/11disabledifnotin_filelist_notexist_validenum/tiramisu/base.py
@@ -0,0 +1,28 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = ChoiceOption(name="condition", doc="No change", values=('non', 'statique'), default="non", properties=frozenset({"mandatory", "normal"}))
+option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_10 = FilenameOption(name="name", doc="name", default="/tmp/file")
+option_11 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, notraisepropertyerror=True), 'expected_0': ParamValue("statique"), 'reverse_condition_0': ParamValue(True)})))
+option_9 = OptionDescription(name="file", doc="file", children=[option_10, option_11])
+option_9.impl_set_information('source', "file")
+option_8 = OptionDescription(name="files", doc="files", children=[option_9])
+option_12 = BoolOption(name="activate", doc="activate", default=True)
+option_13 = BoolOption(name="manage", doc="manage", default=True)
+option_7 = OptionDescription(name="test", doc="test", children=[option_8, option_12, option_13])
+option_6 = OptionDescription(name="services", doc="services", children=[option_7], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_6])
diff --git a/tests/dictionaries_old/11multi_disabled_if_in_filelist/00-base.xml b/tests/dictionaries_old/11multi_disabled_if_in_filelist/00-base.xml
new file mode 100644
index 00000000..52a2c945
--- /dev/null
+++ b/tests/dictionaries_old/11multi_disabled_if_in_filelist/00-base.xml
@@ -0,0 +1,28 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="test">
+      <file filelist="afilllist">/tmp/file1</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="activer_clam" optional="True">
+      <param>non</param>
+      <target type="filelist">afilllist</target>
+    </condition>
+    <condition name="disabled_if_in" source="condition">
+      <param>non</param>
+      <target type="filelist">afilllist</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/11multi_disabled_if_in_filelist/__init__.py b/tests/dictionaries_old/11multi_disabled_if_in_filelist/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/11multi_disabled_if_in_filelist/makedict/after.json b/tests/dictionaries_old/11multi_disabled_if_in_filelist/makedict/after.json
new file mode 100644
index 00000000..e578b184
--- /dev/null
+++ b/tests/dictionaries_old/11multi_disabled_if_in_filelist/makedict/after.json
@@ -0,0 +1,26 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "non"
+    },
+    "services.test.files.file1.name": {
+        "owner": "default",
+        "value": "/tmp/file1"
+    },
+    "services.test.files.file1.activate": {
+        "owner": "default",
+        "value": false
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/11multi_disabled_if_in_filelist/makedict/base.json b/tests/dictionaries_old/11multi_disabled_if_in_filelist/makedict/base.json
new file mode 100644
index 00000000..4c33e3d9
--- /dev/null
+++ b/tests/dictionaries_old/11multi_disabled_if_in_filelist/makedict/base.json
@@ -0,0 +1,8 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general.condition": "non",
+    "services.test.files.file1.name": "/tmp/file1",
+    "services.test.files.file1.activate": false,
+    "services.test.activate": true,
+    "services.test.manage": true
+}
diff --git a/tests/dictionaries_old/11multi_disabled_if_in_filelist/makedict/before.json b/tests/dictionaries_old/11multi_disabled_if_in_filelist/makedict/before.json
new file mode 100644
index 00000000..e578b184
--- /dev/null
+++ b/tests/dictionaries_old/11multi_disabled_if_in_filelist/makedict/before.json
@@ -0,0 +1,26 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "non"
+    },
+    "services.test.files.file1.name": {
+        "owner": "default",
+        "value": "/tmp/file1"
+    },
+    "services.test.files.file1.activate": {
+        "owner": "default",
+        "value": false
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/11multi_disabled_if_in_filelist/tiramisu/base.py b/tests/dictionaries_old/11multi_disabled_if_in_filelist/tiramisu/base.py
new file mode 100644
index 00000000..c8784fa0
--- /dev/null
+++ b/tests/dictionaries_old/11multi_disabled_if_in_filelist/tiramisu/base.py
@@ -0,0 +1,27 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_4 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_9 = FilenameOption(name="name", doc="name", default="/tmp/file1")
+option_10 = BoolOption(name="activate", doc="activate", default=False)
+option_8 = OptionDescription(name="file1", doc="file1", children=[option_9, option_10])
+option_8.impl_set_information('source', "file1")
+option_7 = OptionDescription(name="files", doc="files", children=[option_8])
+option_11 = BoolOption(name="activate", doc="activate", default=True)
+option_12 = BoolOption(name="manage", doc="manage", default=True)
+option_6 = OptionDescription(name="test", doc="test", children=[option_7, option_11, option_12])
+option_5 = OptionDescription(name="services", doc="services", children=[option_6], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_5])
diff --git a/tests/dictionaries_old/11valid_enum_function/00-base.xml b/tests/dictionaries_old/11valid_enum_function/00-base.xml
new file mode 100644
index 00000000..8d022f33
--- /dev/null
+++ b/tests/dictionaries_old/11valid_enum_function/00-base.xml
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="var" type="number" description="New variable">
+        <value>9</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param type="function">trange</param>
+      <param type="number">0</param>
+      <param type="number">10</param>
+      <target>var</target>
+    </check>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/11valid_enum_function/__init__.py b/tests/dictionaries_old/11valid_enum_function/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/11valid_enum_function/makedict/after.json b/tests/dictionaries_old/11valid_enum_function/makedict/after.json
new file mode 100644
index 00000000..49800b2a
--- /dev/null
+++ b/tests/dictionaries_old/11valid_enum_function/makedict/after.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.var": {
+        "owner": "default",
+        "value": 9
+    }
+}
diff --git a/tests/dictionaries_old/11valid_enum_function/makedict/base.json b/tests/dictionaries_old/11valid_enum_function/makedict/base.json
new file mode 100644
index 00000000..6eeb5601
--- /dev/null
+++ b/tests/dictionaries_old/11valid_enum_function/makedict/base.json
@@ -0,0 +1,3 @@
+{
+    "rougail.general.var": 9
+}
diff --git a/tests/dictionaries_old/11valid_enum_function/makedict/before.json b/tests/dictionaries_old/11valid_enum_function/makedict/before.json
new file mode 100644
index 00000000..49800b2a
--- /dev/null
+++ b/tests/dictionaries_old/11valid_enum_function/makedict/before.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.var": {
+        "owner": "default",
+        "value": 9
+    }
+}
diff --git a/tests/dictionaries_old/11valid_enum_function/tiramisu/base.py b/tests/dictionaries_old/11valid_enum_function/tiramisu/base.py
new file mode 100644
index 00000000..c4f1545e
--- /dev/null
+++ b/tests/dictionaries_old/11valid_enum_function/tiramisu/base.py
@@ -0,0 +1,17 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = ChoiceOption(name="var", doc="New variable", values=Calculation(func.trange, Params((ParamValue(0), ParamValue(10)))), default=9, properties=frozenset({"mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/11valid_enum_variable/00-base.xml b/tests/dictionaries_old/11valid_enum_variable/00-base.xml
new file mode 100644
index 00000000..aacb3e1e
--- /dev/null
+++ b/tests/dictionaries_old/11valid_enum_variable/00-base.xml
@@ -0,0 +1,21 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>a</value>
+      </variable>
+      <variable name="var" type="string" description="New variable" multi="True">
+        <value>a</value>
+        <value>b</value>
+        <value>c</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param type="variable">var</param>
+      <target>mode_conteneur_actif</target>
+    </check>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/11valid_enum_variable/__init__.py b/tests/dictionaries_old/11valid_enum_variable/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/11valid_enum_variable/makedict/after.json b/tests/dictionaries_old/11valid_enum_variable/makedict/after.json
new file mode 100644
index 00000000..da7c1973
--- /dev/null
+++ b/tests/dictionaries_old/11valid_enum_variable/makedict/after.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "a"
+    },
+    "rougail.general.var": {
+        "owner": "default",
+        "value": [
+            "a",
+            "b",
+            "c"
+        ]
+    }
+}
diff --git a/tests/dictionaries_old/11valid_enum_variable/makedict/base.json b/tests/dictionaries_old/11valid_enum_variable/makedict/base.json
new file mode 100644
index 00000000..0d2bcba8
--- /dev/null
+++ b/tests/dictionaries_old/11valid_enum_variable/makedict/base.json
@@ -0,0 +1,8 @@
+{
+    "rougail.general.mode_conteneur_actif": "a",
+    "rougail.general.var": [
+        "a",
+        "b",
+        "c"
+    ]
+}
diff --git a/tests/dictionaries_old/11valid_enum_variable/makedict/before.json b/tests/dictionaries_old/11valid_enum_variable/makedict/before.json
new file mode 100644
index 00000000..da7c1973
--- /dev/null
+++ b/tests/dictionaries_old/11valid_enum_variable/makedict/before.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "a"
+    },
+    "rougail.general.var": {
+        "owner": "default",
+        "value": [
+            "a",
+            "b",
+            "c"
+        ]
+    }
+}
diff --git a/tests/dictionaries_old/11valid_enum_variable/tiramisu/base.py b/tests/dictionaries_old/11valid_enum_variable/tiramisu/base.py
new file mode 100644
index 00000000..e4907cf9
--- /dev/null
+++ b/tests/dictionaries_old/11valid_enum_variable/tiramisu/base.py
@@ -0,0 +1,18 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_4 = StrOption(name="var", doc="New variable", multi=True, default=['a', 'b', 'c'], default_multi="a", properties=frozenset({"mandatory", "normal"}))
+option_3 = ChoiceOption(name="mode_conteneur_actif", doc="No change", values=Calculation(func.calc_value, Params((ParamOption(option_4)))), default="a", properties=frozenset({"mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/20family_append/00-base.xml b/tests/dictionaries_old/20family_append/00-base.xml
new file mode 100644
index 00000000..ccf8e4dd
--- /dev/null
+++ b/tests/dictionaries_old/20family_append/00-base.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/20family_append/01-base.xml b/tests/dictionaries_old/20family_append/01-base.xml
new file mode 100644
index 00000000..8bd81834
--- /dev/null
+++ b/tests/dictionaries_old/20family_append/01-base.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif1" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/20family_append/__init__.py b/tests/dictionaries_old/20family_append/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/20family_append/makedict/after.json b/tests/dictionaries_old/20family_append/makedict/after.json
new file mode 100644
index 00000000..6ebfbbe9
--- /dev/null
+++ b/tests/dictionaries_old/20family_append/makedict/after.json
@@ -0,0 +1,10 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif1": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/20family_append/makedict/base.json b/tests/dictionaries_old/20family_append/makedict/base.json
new file mode 100644
index 00000000..3f1a7b00
--- /dev/null
+++ b/tests/dictionaries_old/20family_append/makedict/base.json
@@ -0,0 +1,4 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general.mode_conteneur_actif1": "non"
+}
diff --git a/tests/dictionaries_old/20family_append/makedict/before.json b/tests/dictionaries_old/20family_append/makedict/before.json
new file mode 100644
index 00000000..6ebfbbe9
--- /dev/null
+++ b/tests/dictionaries_old/20family_append/makedict/before.json
@@ -0,0 +1,10 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif1": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/20family_append/tiramisu/base.py b/tests/dictionaries_old/20family_append/tiramisu/base.py
new file mode 100644
index 00000000..9ad04363
--- /dev/null
+++ b/tests/dictionaries_old/20family_append/tiramisu/base.py
@@ -0,0 +1,18 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_4 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/20family_dynamic/00-base.xml b/tests/dictionaries_old/20family_dynamic/00-base.xml
new file mode 100644
index 00000000..ca18543d
--- /dev/null
+++ b/tests/dictionaries_old/20family_dynamic/00-base.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="varname" type="string" description="No change" multi="True">
+        <value>val1</value>
+        <value>val2</value>
+      </variable>
+    </family>
+    <family name="dyn" dynamic="varname">
+      <variable name="vardyn" type="string" description="No change"/>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/20family_dynamic/__init__.py b/tests/dictionaries_old/20family_dynamic/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/20family_dynamic/makedict/after.json b/tests/dictionaries_old/20family_dynamic/makedict/after.json
new file mode 100644
index 00000000..4201ce97
--- /dev/null
+++ b/tests/dictionaries_old/20family_dynamic/makedict/after.json
@@ -0,0 +1,17 @@
+{
+    "rougail.general.varname": {
+        "owner": "default",
+        "value": [
+            "val1",
+            "val2"
+        ]
+    },
+    "rougail.dynval1.vardynval1": {
+        "owner": "default",
+        "value": null
+    },
+    "rougail.dynval2.vardynval2": {
+        "owner": "default",
+        "value": null
+    }
+}
diff --git a/tests/dictionaries_old/20family_dynamic/makedict/base.json b/tests/dictionaries_old/20family_dynamic/makedict/base.json
new file mode 100644
index 00000000..f3dfb591
--- /dev/null
+++ b/tests/dictionaries_old/20family_dynamic/makedict/base.json
@@ -0,0 +1,8 @@
+{
+    "rougail.general.varname": [
+        "val1",
+        "val2"
+    ],
+    "rougail.dynval1.vardynval1": null,
+    "rougail.dynval2.vardynval2": null
+}
diff --git a/tests/dictionaries_old/20family_dynamic/makedict/before.json b/tests/dictionaries_old/20family_dynamic/makedict/before.json
new file mode 100644
index 00000000..4201ce97
--- /dev/null
+++ b/tests/dictionaries_old/20family_dynamic/makedict/before.json
@@ -0,0 +1,17 @@
+{
+    "rougail.general.varname": {
+        "owner": "default",
+        "value": [
+            "val1",
+            "val2"
+        ]
+    },
+    "rougail.dynval1.vardynval1": {
+        "owner": "default",
+        "value": null
+    },
+    "rougail.dynval2.vardynval2": {
+        "owner": "default",
+        "value": null
+    }
+}
diff --git a/tests/dictionaries_old/20family_dynamic/tiramisu/base.py b/tests/dictionaries_old/20family_dynamic/tiramisu/base.py
new file mode 100644
index 00000000..732b3599
--- /dev/null
+++ b/tests/dictionaries_old/20family_dynamic/tiramisu/base.py
@@ -0,0 +1,20 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+from rougail.tiramisu import ConvertDynOptionDescription
+option_3 = StrOption(name="varname", doc="No change", multi=True, default=['val1', 'val2'], default_multi="val1", properties=frozenset({"mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
+option_5 = StrOption(name="vardyn", doc="No change", properties=frozenset({"normal"}))
+option_4 = ConvertDynOptionDescription(name="dyn", doc="dyn", suffixes=Calculation(func.calc_value, Params((ParamOption(option_3, notraisepropertyerror=True)))), children=[option_5], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_4])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/20family_dynamic_calc/00-base.xml b/tests/dictionaries_old/20family_dynamic_calc/00-base.xml
new file mode 100644
index 00000000..81390f86
--- /dev/null
+++ b/tests/dictionaries_old/20family_dynamic_calc/00-base.xml
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="varname" type="string" description="No change" multi="True">
+        <value>val1</value>
+        <value>val2</value>
+      </variable>
+    </family>
+    <family name="dyn" dynamic="varname">
+      <variable name="vardyn" type="string" description="No change">
+        <value>val</value>
+      </variable>
+    </family>
+    <family name="new">
+      <variable name="newvar" type="string" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="variable">vardynval1</param>
+      <target>newvar</target>
+    </fill>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/20family_dynamic_calc/__init__.py b/tests/dictionaries_old/20family_dynamic_calc/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/20family_dynamic_calc/makedict/after.json b/tests/dictionaries_old/20family_dynamic_calc/makedict/after.json
new file mode 100644
index 00000000..6bc6e807
--- /dev/null
+++ b/tests/dictionaries_old/20family_dynamic_calc/makedict/after.json
@@ -0,0 +1,21 @@
+{
+    "rougail.general.varname": {
+        "owner": "default",
+        "value": [
+            "val1",
+            "val2"
+        ]
+    },
+    "rougail.dynval1.vardynval1": {
+        "owner": "default",
+        "value": "val"
+    },
+    "rougail.dynval2.vardynval2": {
+        "owner": "default",
+        "value": "val"
+    },
+    "rougail.new.newvar": {
+        "owner": "default",
+        "value": "val"
+    }
+}
diff --git a/tests/dictionaries_old/20family_dynamic_calc/makedict/base.json b/tests/dictionaries_old/20family_dynamic_calc/makedict/base.json
new file mode 100644
index 00000000..9b99cc84
--- /dev/null
+++ b/tests/dictionaries_old/20family_dynamic_calc/makedict/base.json
@@ -0,0 +1,9 @@
+{
+    "rougail.general.varname": [
+        "val1",
+        "val2"
+    ],
+    "rougail.dynval1.vardynval1": "val",
+    "rougail.dynval2.vardynval2": "val",
+    "rougail.new.newvar": "val"
+}
diff --git a/tests/dictionaries_old/20family_dynamic_calc/makedict/before.json b/tests/dictionaries_old/20family_dynamic_calc/makedict/before.json
new file mode 100644
index 00000000..6bc6e807
--- /dev/null
+++ b/tests/dictionaries_old/20family_dynamic_calc/makedict/before.json
@@ -0,0 +1,21 @@
+{
+    "rougail.general.varname": {
+        "owner": "default",
+        "value": [
+            "val1",
+            "val2"
+        ]
+    },
+    "rougail.dynval1.vardynval1": {
+        "owner": "default",
+        "value": "val"
+    },
+    "rougail.dynval2.vardynval2": {
+        "owner": "default",
+        "value": "val"
+    },
+    "rougail.new.newvar": {
+        "owner": "default",
+        "value": "val"
+    }
+}
diff --git a/tests/dictionaries_old/20family_dynamic_calc/tiramisu/base.py b/tests/dictionaries_old/20family_dynamic_calc/tiramisu/base.py
new file mode 100644
index 00000000..f95a1bb2
--- /dev/null
+++ b/tests/dictionaries_old/20family_dynamic_calc/tiramisu/base.py
@@ -0,0 +1,22 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+from rougail.tiramisu import ConvertDynOptionDescription
+option_3 = StrOption(name="varname", doc="No change", multi=True, default=['val1', 'val2'], default_multi="val1", properties=frozenset({"mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
+option_5 = StrOption(name="vardyn", doc="No change", default="val", properties=frozenset({"mandatory", "normal"}))
+option_4 = ConvertDynOptionDescription(name="dyn", doc="dyn", suffixes=Calculation(func.calc_value, Params((ParamOption(option_3, notraisepropertyerror=True)))), children=[option_5], properties=frozenset({"normal"}))
+option_7 = StrOption(name="newvar", doc="No change", default=Calculation(func.calc_val, Params((ParamDynOption(option_5, 'val1', option_4)))), properties=frozenset({"normal"}))
+option_6 = OptionDescription(name="new", doc="new", children=[option_7], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_4, option_6])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/20family_dynamic_calc2/00-base.xml b/tests/dictionaries_old/20family_dynamic_calc2/00-base.xml
new file mode 100644
index 00000000..b7438884
--- /dev/null
+++ b/tests/dictionaries_old/20family_dynamic_calc2/00-base.xml
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="varname" type="string" description="No change" multi="True">
+        <value>val1</value>
+        <value>val2</value>
+      </variable>
+    </family>
+    <family name="dyn" dynamic="varname">
+      <variable name="vardyn" type="string" description="No change">
+        <value>val</value>
+      </variable>
+    </family>
+    <family name="new">
+      <variable name="newvar" type="string" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="hidden_if_in" source="newvar">
+      <param>non</param>
+      <target type="family">dyn</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/20family_dynamic_calc2/__init__.py b/tests/dictionaries_old/20family_dynamic_calc2/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/20family_dynamic_calc2/makedict/after.json b/tests/dictionaries_old/20family_dynamic_calc2/makedict/after.json
new file mode 100644
index 00000000..58f9d6dd
--- /dev/null
+++ b/tests/dictionaries_old/20family_dynamic_calc2/makedict/after.json
@@ -0,0 +1,21 @@
+{
+    "rougail.general.varname": {
+        "owner": "default",
+        "value": [
+            "val1",
+            "val2"
+        ]
+    },
+    "rougail.dynval1.vardynval1": {
+        "owner": "default",
+        "value": "val"
+    },
+    "rougail.dynval2.vardynval2": {
+        "owner": "default",
+        "value": "val"
+    },
+    "rougail.new.newvar": {
+        "owner": "default",
+        "value": null
+    }
+}
diff --git a/tests/dictionaries_old/20family_dynamic_calc2/makedict/base.json b/tests/dictionaries_old/20family_dynamic_calc2/makedict/base.json
new file mode 100644
index 00000000..856ad009
--- /dev/null
+++ b/tests/dictionaries_old/20family_dynamic_calc2/makedict/base.json
@@ -0,0 +1,9 @@
+{
+    "rougail.general.varname": [
+        "val1",
+        "val2"
+    ],
+    "rougail.dynval1.vardynval1": "val",
+    "rougail.dynval2.vardynval2": "val",
+    "rougail.new.newvar": null
+}
diff --git a/tests/dictionaries_old/20family_dynamic_calc2/makedict/before.json b/tests/dictionaries_old/20family_dynamic_calc2/makedict/before.json
new file mode 100644
index 00000000..58f9d6dd
--- /dev/null
+++ b/tests/dictionaries_old/20family_dynamic_calc2/makedict/before.json
@@ -0,0 +1,21 @@
+{
+    "rougail.general.varname": {
+        "owner": "default",
+        "value": [
+            "val1",
+            "val2"
+        ]
+    },
+    "rougail.dynval1.vardynval1": {
+        "owner": "default",
+        "value": "val"
+    },
+    "rougail.dynval2.vardynval2": {
+        "owner": "default",
+        "value": "val"
+    },
+    "rougail.new.newvar": {
+        "owner": "default",
+        "value": null
+    }
+}
diff --git a/tests/dictionaries_old/20family_dynamic_calc2/tiramisu/base.py b/tests/dictionaries_old/20family_dynamic_calc2/tiramisu/base.py
new file mode 100644
index 00000000..d665934b
--- /dev/null
+++ b/tests/dictionaries_old/20family_dynamic_calc2/tiramisu/base.py
@@ -0,0 +1,22 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+from rougail.tiramisu import ConvertDynOptionDescription
+option_3 = StrOption(name="varname", doc="No change", multi=True, default=['val1', 'val2'], default_multi="val1", properties=frozenset({"mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
+option_7 = StrOption(name="newvar", doc="No change", properties=frozenset({"normal"}))
+option_5 = StrOption(name="vardyn", doc="No change", default="val", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_7, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_7, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")}))}))
+option_4 = ConvertDynOptionDescription(name="dyn", doc="dyn", suffixes=Calculation(func.calc_value, Params((ParamOption(option_3, notraisepropertyerror=True)))), children=[option_5], properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_7, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")}))}))
+option_6 = OptionDescription(name="new", doc="new", children=[option_7], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_4, option_6])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/20family_dynamic_calc_suffix/00-base.xml b/tests/dictionaries_old/20family_dynamic_calc_suffix/00-base.xml
new file mode 100644
index 00000000..f0dcaf6a
--- /dev/null
+++ b/tests/dictionaries_old/20family_dynamic_calc_suffix/00-base.xml
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="varname" type="string" description="No change" multi="True">
+        <value>val1</value>
+        <value>val2</value>
+      </variable>
+    </family>
+    <family name="dyn" dynamic="varname">
+      <variable name="vardyn" type="string" description="No change">
+        <value>val</value>
+      </variable>
+    </family>
+    <family name="new">
+      <variable name="newvar" type="string" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="suffix"/>
+      <target>vardyn</target>
+    </fill>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/20family_dynamic_calc_suffix/__init__.py b/tests/dictionaries_old/20family_dynamic_calc_suffix/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/20family_dynamic_calc_suffix/makedict/after.json b/tests/dictionaries_old/20family_dynamic_calc_suffix/makedict/after.json
new file mode 100644
index 00000000..66fde813
--- /dev/null
+++ b/tests/dictionaries_old/20family_dynamic_calc_suffix/makedict/after.json
@@ -0,0 +1,21 @@
+{
+    "rougail.general.varname": {
+        "owner": "default",
+        "value": [
+            "val1",
+            "val2"
+        ]
+    },
+    "rougail.dynval1.vardynval1": {
+        "owner": "default",
+        "value": "val1"
+    },
+    "rougail.dynval2.vardynval2": {
+        "owner": "default",
+        "value": "val2"
+    },
+    "rougail.new.newvar": {
+        "owner": "default",
+        "value": null
+    }
+}
diff --git a/tests/dictionaries_old/20family_dynamic_calc_suffix/makedict/base.json b/tests/dictionaries_old/20family_dynamic_calc_suffix/makedict/base.json
new file mode 100644
index 00000000..c1f25445
--- /dev/null
+++ b/tests/dictionaries_old/20family_dynamic_calc_suffix/makedict/base.json
@@ -0,0 +1,9 @@
+{
+    "rougail.general.varname": [
+        "val1",
+        "val2"
+    ],
+    "rougail.dynval1.vardynval1": "val1",
+    "rougail.dynval2.vardynval2": "val2",
+    "rougail.new.newvar": null
+}
diff --git a/tests/dictionaries_old/20family_dynamic_calc_suffix/makedict/before.json b/tests/dictionaries_old/20family_dynamic_calc_suffix/makedict/before.json
new file mode 100644
index 00000000..66fde813
--- /dev/null
+++ b/tests/dictionaries_old/20family_dynamic_calc_suffix/makedict/before.json
@@ -0,0 +1,21 @@
+{
+    "rougail.general.varname": {
+        "owner": "default",
+        "value": [
+            "val1",
+            "val2"
+        ]
+    },
+    "rougail.dynval1.vardynval1": {
+        "owner": "default",
+        "value": "val1"
+    },
+    "rougail.dynval2.vardynval2": {
+        "owner": "default",
+        "value": "val2"
+    },
+    "rougail.new.newvar": {
+        "owner": "default",
+        "value": null
+    }
+}
diff --git a/tests/dictionaries_old/20family_dynamic_calc_suffix/tiramisu/base.py b/tests/dictionaries_old/20family_dynamic_calc_suffix/tiramisu/base.py
new file mode 100644
index 00000000..3bceab1b
--- /dev/null
+++ b/tests/dictionaries_old/20family_dynamic_calc_suffix/tiramisu/base.py
@@ -0,0 +1,22 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+from rougail.tiramisu import ConvertDynOptionDescription
+option_3 = StrOption(name="varname", doc="No change", multi=True, default=['val1', 'val2'], default_multi="val1", properties=frozenset({"mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
+option_5 = StrOption(name="vardyn", doc="No change", default=Calculation(func.calc_val, Params((ParamSuffix()))), properties=frozenset({"normal"}))
+option_4 = ConvertDynOptionDescription(name="dyn", doc="dyn", suffixes=Calculation(func.calc_value, Params((ParamOption(option_3, notraisepropertyerror=True)))), children=[option_5], properties=frozenset({"normal"}))
+option_7 = StrOption(name="newvar", doc="No change", properties=frozenset({"normal"}))
+option_6 = OptionDescription(name="new", doc="new", children=[option_7], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_4, option_6])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/20family_dynamic_description/00-base.xml b/tests/dictionaries_old/20family_dynamic_description/00-base.xml
new file mode 100644
index 00000000..39c22332
--- /dev/null
+++ b/tests/dictionaries_old/20family_dynamic_description/00-base.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="varname" type="string" description="No change" multi="True">
+        <value>val1</value>
+        <value>val2</value>
+      </variable>
+    </family>
+    <family name="dyn" description="Dyn " dynamic="varname">
+      <variable name="vardyn" type="string" description="No change"/>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/20family_dynamic_description/__init__.py b/tests/dictionaries_old/20family_dynamic_description/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/20family_dynamic_description/makedict/after.json b/tests/dictionaries_old/20family_dynamic_description/makedict/after.json
new file mode 100644
index 00000000..4201ce97
--- /dev/null
+++ b/tests/dictionaries_old/20family_dynamic_description/makedict/after.json
@@ -0,0 +1,17 @@
+{
+    "rougail.general.varname": {
+        "owner": "default",
+        "value": [
+            "val1",
+            "val2"
+        ]
+    },
+    "rougail.dynval1.vardynval1": {
+        "owner": "default",
+        "value": null
+    },
+    "rougail.dynval2.vardynval2": {
+        "owner": "default",
+        "value": null
+    }
+}
diff --git a/tests/dictionaries_old/20family_dynamic_description/makedict/base.json b/tests/dictionaries_old/20family_dynamic_description/makedict/base.json
new file mode 100644
index 00000000..f3dfb591
--- /dev/null
+++ b/tests/dictionaries_old/20family_dynamic_description/makedict/base.json
@@ -0,0 +1,8 @@
+{
+    "rougail.general.varname": [
+        "val1",
+        "val2"
+    ],
+    "rougail.dynval1.vardynval1": null,
+    "rougail.dynval2.vardynval2": null
+}
diff --git a/tests/dictionaries_old/20family_dynamic_description/makedict/before.json b/tests/dictionaries_old/20family_dynamic_description/makedict/before.json
new file mode 100644
index 00000000..4201ce97
--- /dev/null
+++ b/tests/dictionaries_old/20family_dynamic_description/makedict/before.json
@@ -0,0 +1,17 @@
+{
+    "rougail.general.varname": {
+        "owner": "default",
+        "value": [
+            "val1",
+            "val2"
+        ]
+    },
+    "rougail.dynval1.vardynval1": {
+        "owner": "default",
+        "value": null
+    },
+    "rougail.dynval2.vardynval2": {
+        "owner": "default",
+        "value": null
+    }
+}
diff --git a/tests/dictionaries_old/20family_dynamic_description/tiramisu/base.py b/tests/dictionaries_old/20family_dynamic_description/tiramisu/base.py
new file mode 100644
index 00000000..43a78559
--- /dev/null
+++ b/tests/dictionaries_old/20family_dynamic_description/tiramisu/base.py
@@ -0,0 +1,20 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+from rougail.tiramisu import ConvertDynOptionDescription
+option_3 = StrOption(name="varname", doc="No change", multi=True, default=['val1', 'val2'], default_multi="val1", properties=frozenset({"mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
+option_5 = StrOption(name="vardyn", doc="No change", properties=frozenset({"normal"}))
+option_4 = ConvertDynOptionDescription(name="dyn", doc="Dyn ", suffixes=Calculation(func.calc_value, Params((ParamOption(option_3, notraisepropertyerror=True)))), children=[option_5], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_4])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/20family_dynamic_number/00-base.xml b/tests/dictionaries_old/20family_dynamic_number/00-base.xml
new file mode 100644
index 00000000..80703470
--- /dev/null
+++ b/tests/dictionaries_old/20family_dynamic_number/00-base.xml
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="varname" type="number" description="No change" multi="True">
+        <value>1</value>
+        <value>2</value>
+      </variable>
+    </family>
+    <family name="dyn" dynamic="varname">
+      <variable name="vardyn" type="string" description="No change">
+        <value>val</value>
+      </variable>
+    </family>
+    <family name="new">
+      <variable name="newvar" type="string" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="variable">vardyn1</param>
+      <target>newvar</target>
+    </fill>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/20family_dynamic_number/__init__.py b/tests/dictionaries_old/20family_dynamic_number/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/20family_dynamic_number/makedict/after.json b/tests/dictionaries_old/20family_dynamic_number/makedict/after.json
new file mode 100644
index 00000000..b180d807
--- /dev/null
+++ b/tests/dictionaries_old/20family_dynamic_number/makedict/after.json
@@ -0,0 +1,21 @@
+{
+    "rougail.general.varname": {
+        "owner": "default",
+        "value": [
+            1,
+            2
+        ]
+    },
+    "rougail.dyn1.vardyn1": {
+        "owner": "default",
+        "value": "val"
+    },
+    "rougail.dyn2.vardyn2": {
+        "owner": "default",
+        "value": "val"
+    },
+    "rougail.new.newvar": {
+        "owner": "default",
+        "value": "val"
+    }
+}
diff --git a/tests/dictionaries_old/20family_dynamic_number/makedict/base.json b/tests/dictionaries_old/20family_dynamic_number/makedict/base.json
new file mode 100644
index 00000000..3ba060bb
--- /dev/null
+++ b/tests/dictionaries_old/20family_dynamic_number/makedict/base.json
@@ -0,0 +1,9 @@
+{
+    "rougail.general.varname": [
+        1,
+        2
+    ],
+    "rougail.dyn1.vardyn1": "val",
+    "rougail.dyn2.vardyn2": "val",
+    "rougail.new.newvar": "val"
+}
diff --git a/tests/dictionaries_old/20family_dynamic_number/makedict/before.json b/tests/dictionaries_old/20family_dynamic_number/makedict/before.json
new file mode 100644
index 00000000..b180d807
--- /dev/null
+++ b/tests/dictionaries_old/20family_dynamic_number/makedict/before.json
@@ -0,0 +1,21 @@
+{
+    "rougail.general.varname": {
+        "owner": "default",
+        "value": [
+            1,
+            2
+        ]
+    },
+    "rougail.dyn1.vardyn1": {
+        "owner": "default",
+        "value": "val"
+    },
+    "rougail.dyn2.vardyn2": {
+        "owner": "default",
+        "value": "val"
+    },
+    "rougail.new.newvar": {
+        "owner": "default",
+        "value": "val"
+    }
+}
diff --git a/tests/dictionaries_old/20family_dynamic_number/tiramisu/base.py b/tests/dictionaries_old/20family_dynamic_number/tiramisu/base.py
new file mode 100644
index 00000000..6f1ba49e
--- /dev/null
+++ b/tests/dictionaries_old/20family_dynamic_number/tiramisu/base.py
@@ -0,0 +1,22 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+from rougail.tiramisu import ConvertDynOptionDescription
+option_3 = IntOption(name="varname", doc="No change", multi=True, default=[1, 2], default_multi=1, properties=frozenset({"mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
+option_5 = StrOption(name="vardyn", doc="No change", default="val", properties=frozenset({"mandatory", "normal"}))
+option_4 = ConvertDynOptionDescription(name="dyn", doc="dyn", suffixes=Calculation(func.calc_value, Params((ParamOption(option_3, notraisepropertyerror=True)))), children=[option_5], properties=frozenset({"normal"}))
+option_7 = StrOption(name="newvar", doc="No change", default=Calculation(func.calc_val, Params((ParamDynOption(option_5, '1', option_4)))), properties=frozenset({"normal"}))
+option_6 = OptionDescription(name="new", doc="new", children=[option_7], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_4, option_6])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/20family_empty/00-base.xml b/tests/dictionaries_old/20family_empty/00-base.xml
new file mode 100644
index 00000000..2611894b
--- /dev/null
+++ b/tests/dictionaries_old/20family_empty/00-base.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" mode="basic">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="general2" help="family"/>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/20family_empty/__init__.py b/tests/dictionaries_old/20family_empty/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/20family_empty/makedict/after.json b/tests/dictionaries_old/20family_empty/makedict/after.json
new file mode 100644
index 00000000..2e6c541d
--- /dev/null
+++ b/tests/dictionaries_old/20family_empty/makedict/after.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/20family_empty/makedict/base.json b/tests/dictionaries_old/20family_empty/makedict/base.json
new file mode 100644
index 00000000..25056378
--- /dev/null
+++ b/tests/dictionaries_old/20family_empty/makedict/base.json
@@ -0,0 +1,3 @@
+{
+    "rougail.general.mode_conteneur_actif": "non"
+}
diff --git a/tests/dictionaries_old/20family_empty/makedict/before.json b/tests/dictionaries_old/20family_empty/makedict/before.json
new file mode 100644
index 00000000..2e6c541d
--- /dev/null
+++ b/tests/dictionaries_old/20family_empty/makedict/before.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/20family_empty/tiramisu/base.py b/tests/dictionaries_old/20family_empty/tiramisu/base.py
new file mode 100644
index 00000000..bcff5670
--- /dev/null
+++ b/tests/dictionaries_old/20family_empty/tiramisu/base.py
@@ -0,0 +1,17 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"basic", "mandatory"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"basic"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/20family_hidden/00-base.xml b/tests/dictionaries_old/20family_hidden/00-base.xml
new file mode 100644
index 00000000..ccf8e4dd
--- /dev/null
+++ b/tests/dictionaries_old/20family_hidden/00-base.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/20family_hidden/01-base.xml b/tests/dictionaries_old/20family_hidden/01-base.xml
new file mode 100644
index 00000000..8556985b
--- /dev/null
+++ b/tests/dictionaries_old/20family_hidden/01-base.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general" hidden="True"/>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/20family_hidden/__init__.py b/tests/dictionaries_old/20family_hidden/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/20family_hidden/makedict/after.json b/tests/dictionaries_old/20family_hidden/makedict/after.json
new file mode 100644
index 00000000..2e6c541d
--- /dev/null
+++ b/tests/dictionaries_old/20family_hidden/makedict/after.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/20family_hidden/makedict/base.json b/tests/dictionaries_old/20family_hidden/makedict/base.json
new file mode 100644
index 00000000..25056378
--- /dev/null
+++ b/tests/dictionaries_old/20family_hidden/makedict/base.json
@@ -0,0 +1,3 @@
+{
+    "rougail.general.mode_conteneur_actif": "non"
+}
diff --git a/tests/dictionaries_old/20family_hidden/makedict/before.json b/tests/dictionaries_old/20family_hidden/makedict/before.json
new file mode 100644
index 00000000..2e6c541d
--- /dev/null
+++ b/tests/dictionaries_old/20family_hidden/makedict/before.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/20family_hidden/tiramisu/base.py b/tests/dictionaries_old/20family_hidden/tiramisu/base.py
new file mode 100644
index 00000000..3660de89
--- /dev/null
+++ b/tests/dictionaries_old/20family_hidden/tiramisu/base.py
@@ -0,0 +1,17 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"hidden", "normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/20family_mode/00-base.xml b/tests/dictionaries_old/20family_mode/00-base.xml
new file mode 100644
index 00000000..adc550df
--- /dev/null
+++ b/tests/dictionaries_old/20family_mode/00-base.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" mode="basic">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/20family_mode/__init__.py b/tests/dictionaries_old/20family_mode/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/20family_mode/makedict/after.json b/tests/dictionaries_old/20family_mode/makedict/after.json
new file mode 100644
index 00000000..2e6c541d
--- /dev/null
+++ b/tests/dictionaries_old/20family_mode/makedict/after.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/20family_mode/makedict/base.json b/tests/dictionaries_old/20family_mode/makedict/base.json
new file mode 100644
index 00000000..25056378
--- /dev/null
+++ b/tests/dictionaries_old/20family_mode/makedict/base.json
@@ -0,0 +1,3 @@
+{
+    "rougail.general.mode_conteneur_actif": "non"
+}
diff --git a/tests/dictionaries_old/20family_mode/makedict/before.json b/tests/dictionaries_old/20family_mode/makedict/before.json
new file mode 100644
index 00000000..2e6c541d
--- /dev/null
+++ b/tests/dictionaries_old/20family_mode/makedict/before.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/20family_mode/tiramisu/base.py b/tests/dictionaries_old/20family_mode/tiramisu/base.py
new file mode 100644
index 00000000..bcff5670
--- /dev/null
+++ b/tests/dictionaries_old/20family_mode/tiramisu/base.py
@@ -0,0 +1,17 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"basic", "mandatory"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"basic"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/20family_modeleadership/00-base.xml b/tests/dictionaries_old/20family_modeleadership/00-base.xml
new file mode 100644
index 00000000..43e72976
--- /dev/null
+++ b/tests/dictionaries_old/20family_modeleadership/00-base.xml
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="leader" type="string" description="leader" multi="True"/>
+      <variable name="follower1" type="string" description="follower1"/>
+      <variable name="follower2" type="string" description="follower2" mode="basic"/>
+    </family>
+  </variables>
+  <constraints>
+    <group leader="leader">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+    </group>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/20family_modeleadership/__init__.py b/tests/dictionaries_old/20family_modeleadership/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/20family_modeleadership/makedict/after.json b/tests/dictionaries_old/20family_modeleadership/makedict/after.json
new file mode 100644
index 00000000..dd62b980
--- /dev/null
+++ b/tests/dictionaries_old/20family_modeleadership/makedict/after.json
@@ -0,0 +1,18 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.leader.leader": {
+        "owner": "default",
+        "value": []
+    },
+    "rougail.general.leader.follower1": {
+        "owner": [],
+        "value": []
+    },
+    "rougail.general.leader.follower2": {
+        "owner": [],
+        "value": []
+    }
+}
diff --git a/tests/dictionaries_old/20family_modeleadership/makedict/base.json b/tests/dictionaries_old/20family_modeleadership/makedict/base.json
new file mode 100644
index 00000000..9031a92a
--- /dev/null
+++ b/tests/dictionaries_old/20family_modeleadership/makedict/base.json
@@ -0,0 +1,4 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general.leader.leader": []
+}
diff --git a/tests/dictionaries_old/20family_modeleadership/makedict/before.json b/tests/dictionaries_old/20family_modeleadership/makedict/before.json
new file mode 100644
index 00000000..dd62b980
--- /dev/null
+++ b/tests/dictionaries_old/20family_modeleadership/makedict/before.json
@@ -0,0 +1,18 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.leader.leader": {
+        "owner": "default",
+        "value": []
+    },
+    "rougail.general.leader.follower1": {
+        "owner": [],
+        "value": []
+    },
+    "rougail.general.leader.follower2": {
+        "owner": [],
+        "value": []
+    }
+}
diff --git a/tests/dictionaries_old/20family_modeleadership/tiramisu/base.py b/tests/dictionaries_old/20family_modeleadership/tiramisu/base.py
new file mode 100644
index 00000000..28e3a12f
--- /dev/null
+++ b/tests/dictionaries_old/20family_modeleadership/tiramisu/base.py
@@ -0,0 +1,21 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_5 = StrOption(name="leader", doc="leader", multi=True)
+option_6 = StrOption(name="follower1", doc="follower1", multi=True, properties=frozenset({"normal"}))
+option_7 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"basic"}))
+option_4 = Leadership(name="leader", doc="leader", children=[option_5, option_6, option_7], properties=frozenset({"basic"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4], properties=frozenset({"basic"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/20notemplating/00-base.xml b/tests/dictionaries_old/20notemplating/00-base.xml
new file mode 100644
index 00000000..df71ebe2
--- /dev/null
+++ b/tests/dictionaries_old/20notemplating/00-base.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="test">
+      <file engine="none">/etc/file</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/20notemplating/__init__.py b/tests/dictionaries_old/20notemplating/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/20notemplating/makedict/after.json b/tests/dictionaries_old/20notemplating/makedict/after.json
new file mode 100644
index 00000000..406d96f0
--- /dev/null
+++ b/tests/dictionaries_old/20notemplating/makedict/after.json
@@ -0,0 +1,22 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "services.test.files.file.name": {
+        "owner": "default",
+        "value": "/etc/file"
+    },
+    "services.test.files.file.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/20notemplating/makedict/base.json b/tests/dictionaries_old/20notemplating/makedict/base.json
new file mode 100644
index 00000000..a1e4c0db
--- /dev/null
+++ b/tests/dictionaries_old/20notemplating/makedict/base.json
@@ -0,0 +1,7 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "services.test.files.file.name": "/etc/file",
+    "services.test.files.file.activate": true,
+    "services.test.activate": true,
+    "services.test.manage": true
+}
diff --git a/tests/dictionaries_old/20notemplating/makedict/before.json b/tests/dictionaries_old/20notemplating/makedict/before.json
new file mode 100644
index 00000000..406d96f0
--- /dev/null
+++ b/tests/dictionaries_old/20notemplating/makedict/before.json
@@ -0,0 +1,22 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "services.test.files.file.name": {
+        "owner": "default",
+        "value": "/etc/file"
+    },
+    "services.test.files.file.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/20notemplating/result/etc/file b/tests/dictionaries_old/20notemplating/result/etc/file
new file mode 100644
index 00000000..5113d9aa
--- /dev/null
+++ b/tests/dictionaries_old/20notemplating/result/etc/file
@@ -0,0 +1 @@
+%%condition
diff --git a/tests/dictionaries_old/20notemplating/result/tmpfiles.d/rougail.conf b/tests/dictionaries_old/20notemplating/result/tmpfiles.d/rougail.conf
new file mode 100644
index 00000000..574c7b82
--- /dev/null
+++ b/tests/dictionaries_old/20notemplating/result/tmpfiles.d/rougail.conf
@@ -0,0 +1,2 @@
+C /etc/file 0644 root root - /usr/local/lib/etc/file
+z /etc/file - - - - -
diff --git a/tests/dictionaries_old/20notemplating/tiramisu/base.py b/tests/dictionaries_old/20notemplating/tiramisu/base.py
new file mode 100644
index 00000000..e0c9c14f
--- /dev/null
+++ b/tests/dictionaries_old/20notemplating/tiramisu/base.py
@@ -0,0 +1,27 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_8 = FilenameOption(name="name", doc="name", default="/etc/file")
+option_9 = BoolOption(name="activate", doc="activate", default=True)
+option_7 = OptionDescription(name="file", doc="file", children=[option_8, option_9])
+option_7.impl_set_information('engine', "none")
+option_7.impl_set_information('source', "file")
+option_6 = OptionDescription(name="files", doc="files", children=[option_7])
+option_10 = BoolOption(name="activate", doc="activate", default=True)
+option_11 = BoolOption(name="manage", doc="manage", default=True)
+option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_10, option_11])
+option_4 = OptionDescription(name="services", doc="services", children=[option_5], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4])
diff --git a/tests/dictionaries_old/20notemplating/tmpl/file b/tests/dictionaries_old/20notemplating/tmpl/file
new file mode 100644
index 00000000..5113d9aa
--- /dev/null
+++ b/tests/dictionaries_old/20notemplating/tmpl/file
@@ -0,0 +1 @@
+%%condition
diff --git a/tests/dictionaries_old/20override/00-base.xml b/tests/dictionaries_old/20override/00-base.xml
new file mode 100644
index 00000000..3b380b57
--- /dev/null
+++ b/tests/dictionaries_old/20override/00-base.xml
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="test">
+      <override/>
+    </service>
+    <service name="test2">
+      <override engine="jinja2"/>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/20override/__init__.py b/tests/dictionaries_old/20override/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/20override/makedict/after.json b/tests/dictionaries_old/20override/makedict/after.json
new file mode 100644
index 00000000..a80dd37d
--- /dev/null
+++ b/tests/dictionaries_old/20override/makedict/after.json
@@ -0,0 +1,30 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "services.test.overrides.test_service.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test2.overrides.test2_service.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test2.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test2.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/20override/makedict/base.json b/tests/dictionaries_old/20override/makedict/base.json
new file mode 100644
index 00000000..2de81c42
--- /dev/null
+++ b/tests/dictionaries_old/20override/makedict/base.json
@@ -0,0 +1,9 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "services.test.overrides.test_service.activate": true,
+    "services.test.activate": true,
+    "services.test.manage": true,
+    "services.test2.overrides.test2_service.activate": true,
+    "services.test2.activate": true,
+    "services.test2.manage": true
+}
diff --git a/tests/dictionaries_old/20override/makedict/before.json b/tests/dictionaries_old/20override/makedict/before.json
new file mode 100644
index 00000000..a80dd37d
--- /dev/null
+++ b/tests/dictionaries_old/20override/makedict/before.json
@@ -0,0 +1,30 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "services.test.overrides.test_service.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test2.overrides.test2_service.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test2.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test2.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/20override/result/systemd/system/test.service.d/rougail.conf b/tests/dictionaries_old/20override/result/systemd/system/test.service.d/rougail.conf
new file mode 100644
index 00000000..d907505b
--- /dev/null
+++ b/tests/dictionaries_old/20override/result/systemd/system/test.service.d/rougail.conf
@@ -0,0 +1 @@
+non
diff --git a/tests/dictionaries_old/20override/result/systemd/system/test2.service.d/rougail.conf b/tests/dictionaries_old/20override/result/systemd/system/test2.service.d/rougail.conf
new file mode 100644
index 00000000..d907505b
--- /dev/null
+++ b/tests/dictionaries_old/20override/result/systemd/system/test2.service.d/rougail.conf
@@ -0,0 +1 @@
+non
diff --git a/tests/dictionaries_old/20override/result/tmpfiles.d/rougail.conf b/tests/dictionaries_old/20override/result/tmpfiles.d/rougail.conf
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/20override/tiramisu/base.py b/tests/dictionaries_old/20override/tiramisu/base.py
new file mode 100644
index 00000000..81d62f49
--- /dev/null
+++ b/tests/dictionaries_old/20override/tiramisu/base.py
@@ -0,0 +1,35 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_8 = BoolOption(name="activate", doc="activate", default=True)
+option_7 = OptionDescription(name="test_service", doc="test.service", children=[option_8])
+option_7.impl_set_information('name', "test")
+option_7.impl_set_information('source', "test.service")
+option_6 = OptionDescription(name="overrides", doc="overrides", children=[option_7])
+option_9 = BoolOption(name="activate", doc="activate", default=True)
+option_10 = BoolOption(name="manage", doc="manage", default=True)
+option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_9, option_10])
+option_14 = BoolOption(name="activate", doc="activate", default=True)
+option_13 = OptionDescription(name="test2_service", doc="test2.service", children=[option_14])
+option_13.impl_set_information('engine', "jinja2")
+option_13.impl_set_information('name', "test2")
+option_13.impl_set_information('source', "test2.service")
+option_12 = OptionDescription(name="overrides", doc="overrides", children=[option_13])
+option_15 = BoolOption(name="activate", doc="activate", default=True)
+option_16 = BoolOption(name="manage", doc="manage", default=True)
+option_11 = OptionDescription(name="test2", doc="test2", children=[option_12, option_15, option_16])
+option_4 = OptionDescription(name="services", doc="services", children=[option_5, option_11], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4])
diff --git a/tests/dictionaries_old/20override/tmpl/test.service b/tests/dictionaries_old/20override/tmpl/test.service
new file mode 100644
index 00000000..a29cfeaf
--- /dev/null
+++ b/tests/dictionaries_old/20override/tmpl/test.service
@@ -0,0 +1 @@
+%%mode_conteneur_actif
diff --git a/tests/dictionaries_old/20override/tmpl/test2.service b/tests/dictionaries_old/20override/tmpl/test2.service
new file mode 100644
index 00000000..db665a0e
--- /dev/null
+++ b/tests/dictionaries_old/20override/tmpl/test2.service
@@ -0,0 +1 @@
+{{ mode_conteneur_actif }}
diff --git a/tests/dictionaries_old/20override_no_templating/00-base.xml b/tests/dictionaries_old/20override_no_templating/00-base.xml
new file mode 100644
index 00000000..8348d11a
--- /dev/null
+++ b/tests/dictionaries_old/20override_no_templating/00-base.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="test">
+      <override engine="none"/>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/20override_no_templating/__init__.py b/tests/dictionaries_old/20override_no_templating/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/20override_no_templating/makedict/after.json b/tests/dictionaries_old/20override_no_templating/makedict/after.json
new file mode 100644
index 00000000..b76fd3d1
--- /dev/null
+++ b/tests/dictionaries_old/20override_no_templating/makedict/after.json
@@ -0,0 +1,18 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "services.test.overrides.test_service.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/20override_no_templating/makedict/base.json b/tests/dictionaries_old/20override_no_templating/makedict/base.json
new file mode 100644
index 00000000..9dc9b73a
--- /dev/null
+++ b/tests/dictionaries_old/20override_no_templating/makedict/base.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "services.test.overrides.test_service.activate": true,
+    "services.test.activate": true,
+    "services.test.manage": true
+}
diff --git a/tests/dictionaries_old/20override_no_templating/makedict/before.json b/tests/dictionaries_old/20override_no_templating/makedict/before.json
new file mode 100644
index 00000000..b76fd3d1
--- /dev/null
+++ b/tests/dictionaries_old/20override_no_templating/makedict/before.json
@@ -0,0 +1,18 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "services.test.overrides.test_service.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/20override_no_templating/result/systemd/system/test.service.d/rougail.conf b/tests/dictionaries_old/20override_no_templating/result/systemd/system/test.service.d/rougail.conf
new file mode 100644
index 00000000..a29cfeaf
--- /dev/null
+++ b/tests/dictionaries_old/20override_no_templating/result/systemd/system/test.service.d/rougail.conf
@@ -0,0 +1 @@
+%%mode_conteneur_actif
diff --git a/tests/dictionaries_old/20override_no_templating/result/tmpfiles.d/rougail.conf b/tests/dictionaries_old/20override_no_templating/result/tmpfiles.d/rougail.conf
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/20override_no_templating/tiramisu/base.py b/tests/dictionaries_old/20override_no_templating/tiramisu/base.py
new file mode 100644
index 00000000..40ea916b
--- /dev/null
+++ b/tests/dictionaries_old/20override_no_templating/tiramisu/base.py
@@ -0,0 +1,27 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_8 = BoolOption(name="activate", doc="activate", default=True)
+option_7 = OptionDescription(name="test_service", doc="test.service", children=[option_8])
+option_7.impl_set_information('engine', "none")
+option_7.impl_set_information('name', "test")
+option_7.impl_set_information('source', "test.service")
+option_6 = OptionDescription(name="overrides", doc="overrides", children=[option_7])
+option_9 = BoolOption(name="activate", doc="activate", default=True)
+option_10 = BoolOption(name="manage", doc="manage", default=True)
+option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_9, option_10])
+option_4 = OptionDescription(name="services", doc="services", children=[option_5], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4])
diff --git a/tests/dictionaries_old/20override_no_templating/tmpl/test.service b/tests/dictionaries_old/20override_no_templating/tmpl/test.service
new file mode 100644
index 00000000..a29cfeaf
--- /dev/null
+++ b/tests/dictionaries_old/20override_no_templating/tmpl/test.service
@@ -0,0 +1 @@
+%%mode_conteneur_actif
diff --git a/tests/dictionaries_old/20override_source/00-base.xml b/tests/dictionaries_old/20override_source/00-base.xml
new file mode 100644
index 00000000..acf3748b
--- /dev/null
+++ b/tests/dictionaries_old/20override_source/00-base.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="test">
+      <override source="test2.service"/>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/20override_source/__init__.py b/tests/dictionaries_old/20override_source/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/20override_source/makedict/after.json b/tests/dictionaries_old/20override_source/makedict/after.json
new file mode 100644
index 00000000..60992c7f
--- /dev/null
+++ b/tests/dictionaries_old/20override_source/makedict/after.json
@@ -0,0 +1,18 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "services.test.overrides.test2_service.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/20override_source/makedict/base.json b/tests/dictionaries_old/20override_source/makedict/base.json
new file mode 100644
index 00000000..3c86a824
--- /dev/null
+++ b/tests/dictionaries_old/20override_source/makedict/base.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "services.test.overrides.test2_service.activate": true,
+    "services.test.activate": true,
+    "services.test.manage": true
+}
diff --git a/tests/dictionaries_old/20override_source/makedict/before.json b/tests/dictionaries_old/20override_source/makedict/before.json
new file mode 100644
index 00000000..60992c7f
--- /dev/null
+++ b/tests/dictionaries_old/20override_source/makedict/before.json
@@ -0,0 +1,18 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "services.test.overrides.test2_service.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/20override_source/result/systemd/system/test.service.d/rougail.conf b/tests/dictionaries_old/20override_source/result/systemd/system/test.service.d/rougail.conf
new file mode 100644
index 00000000..d907505b
--- /dev/null
+++ b/tests/dictionaries_old/20override_source/result/systemd/system/test.service.d/rougail.conf
@@ -0,0 +1 @@
+non
diff --git a/tests/dictionaries_old/20override_source/result/tmpfiles.d/rougail.conf b/tests/dictionaries_old/20override_source/result/tmpfiles.d/rougail.conf
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/20override_source/tiramisu/base.py b/tests/dictionaries_old/20override_source/tiramisu/base.py
new file mode 100644
index 00000000..ab1df588
--- /dev/null
+++ b/tests/dictionaries_old/20override_source/tiramisu/base.py
@@ -0,0 +1,26 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_8 = BoolOption(name="activate", doc="activate", default=True)
+option_7 = OptionDescription(name="test2_service", doc="test2.service", children=[option_8])
+option_7.impl_set_information('name', "test")
+option_7.impl_set_information('source', "test2.service")
+option_6 = OptionDescription(name="overrides", doc="overrides", children=[option_7])
+option_9 = BoolOption(name="activate", doc="activate", default=True)
+option_10 = BoolOption(name="manage", doc="manage", default=True)
+option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_9, option_10])
+option_4 = OptionDescription(name="services", doc="services", children=[option_5], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4])
diff --git a/tests/dictionaries_old/20override_source/tmpl/test2.service b/tests/dictionaries_old/20override_source/tmpl/test2.service
new file mode 100644
index 00000000..a29cfeaf
--- /dev/null
+++ b/tests/dictionaries_old/20override_source/tmpl/test2.service
@@ -0,0 +1 @@
+%%mode_conteneur_actif
diff --git a/tests/dictionaries_old/21family_empty/00-base.xml b/tests/dictionaries_old/21family_empty/00-base.xml
new file mode 100644
index 00000000..b628e39b
--- /dev/null
+++ b/tests/dictionaries_old/21family_empty/00-base.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="general1">
+        </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/21family_empty/__init__.py b/tests/dictionaries_old/21family_empty/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/21family_empty/makedict/after.json b/tests/dictionaries_old/21family_empty/makedict/after.json
new file mode 100644
index 00000000..2e6c541d
--- /dev/null
+++ b/tests/dictionaries_old/21family_empty/makedict/after.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/21family_empty/makedict/base.json b/tests/dictionaries_old/21family_empty/makedict/base.json
new file mode 100644
index 00000000..25056378
--- /dev/null
+++ b/tests/dictionaries_old/21family_empty/makedict/base.json
@@ -0,0 +1,3 @@
+{
+    "rougail.general.mode_conteneur_actif": "non"
+}
diff --git a/tests/dictionaries_old/21family_empty/makedict/before.json b/tests/dictionaries_old/21family_empty/makedict/before.json
new file mode 100644
index 00000000..2e6c541d
--- /dev/null
+++ b/tests/dictionaries_old/21family_empty/makedict/before.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/21family_empty/tiramisu/base.py b/tests/dictionaries_old/21family_empty/tiramisu/base.py
new file mode 100644
index 00000000..9bdad808
--- /dev/null
+++ b/tests/dictionaries_old/21family_empty/tiramisu/base.py
@@ -0,0 +1,17 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/30mandatory_withoutvalue/00-base.xml b/tests/dictionaries_old/30mandatory_withoutvalue/00-base.xml
new file mode 100644
index 00000000..dd8cc45f
--- /dev/null
+++ b/tests/dictionaries_old/30mandatory_withoutvalue/00-base.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" mandatory="True"/>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/30mandatory_withoutvalue/__init__.py b/tests/dictionaries_old/30mandatory_withoutvalue/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/30mandatory_withoutvalue/makedict/after.json b/tests/dictionaries_old/30mandatory_withoutvalue/makedict/after.json
new file mode 100644
index 00000000..da5b8acc
--- /dev/null
+++ b/tests/dictionaries_old/30mandatory_withoutvalue/makedict/after.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": null
+    }
+}
diff --git a/tests/dictionaries_old/30mandatory_withoutvalue/makedict/base.json b/tests/dictionaries_old/30mandatory_withoutvalue/makedict/base.json
new file mode 100644
index 00000000..ab81a62f
--- /dev/null
+++ b/tests/dictionaries_old/30mandatory_withoutvalue/makedict/base.json
@@ -0,0 +1,3 @@
+{
+    "rougail.general.mode_conteneur_actif": null
+}
diff --git a/tests/dictionaries_old/30mandatory_withoutvalue/makedict/before.json b/tests/dictionaries_old/30mandatory_withoutvalue/makedict/before.json
new file mode 100644
index 00000000..da5b8acc
--- /dev/null
+++ b/tests/dictionaries_old/30mandatory_withoutvalue/makedict/before.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": null
+    }
+}
diff --git a/tests/dictionaries_old/30mandatory_withoutvalue/tiramisu/base.py b/tests/dictionaries_old/30mandatory_withoutvalue/tiramisu/base.py
new file mode 100644
index 00000000..8e5568f1
--- /dev/null
+++ b/tests/dictionaries_old/30mandatory_withoutvalue/tiramisu/base.py
@@ -0,0 +1,17 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", properties=frozenset({"basic", "mandatory"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"basic"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/30mandatory_withoutvaluecalc/00-base.xml b/tests/dictionaries_old/30mandatory_withoutvaluecalc/00-base.xml
new file mode 100644
index 00000000..74ac4379
--- /dev/null
+++ b/tests/dictionaries_old/30mandatory_withoutvaluecalc/00-base.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param>value</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/30mandatory_withoutvaluecalc/__init__.py b/tests/dictionaries_old/30mandatory_withoutvaluecalc/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/30mandatory_withoutvaluecalc/makedict/after.json b/tests/dictionaries_old/30mandatory_withoutvaluecalc/makedict/after.json
new file mode 100644
index 00000000..6f4a21e7
--- /dev/null
+++ b/tests/dictionaries_old/30mandatory_withoutvaluecalc/makedict/after.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "value"
+    }
+}
diff --git a/tests/dictionaries_old/30mandatory_withoutvaluecalc/makedict/base.json b/tests/dictionaries_old/30mandatory_withoutvaluecalc/makedict/base.json
new file mode 100644
index 00000000..904ffb4e
--- /dev/null
+++ b/tests/dictionaries_old/30mandatory_withoutvaluecalc/makedict/base.json
@@ -0,0 +1,3 @@
+{
+    "rougail.general.mode_conteneur_actif": "value"
+}
diff --git a/tests/dictionaries_old/30mandatory_withoutvaluecalc/makedict/before.json b/tests/dictionaries_old/30mandatory_withoutvaluecalc/makedict/before.json
new file mode 100644
index 00000000..6f4a21e7
--- /dev/null
+++ b/tests/dictionaries_old/30mandatory_withoutvaluecalc/makedict/before.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "value"
+    }
+}
diff --git a/tests/dictionaries_old/30mandatory_withoutvaluecalc/tiramisu/base.py b/tests/dictionaries_old/30mandatory_withoutvaluecalc/tiramisu/base.py
new file mode 100644
index 00000000..71762e7c
--- /dev/null
+++ b/tests/dictionaries_old/30mandatory_withoutvaluecalc/tiramisu/base.py
@@ -0,0 +1,17 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params((ParamValue("value")))), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/30mandatory_withvalue/00-base.xml b/tests/dictionaries_old/30mandatory_withvalue/00-base.xml
new file mode 100644
index 00000000..cfbe7ed0
--- /dev/null
+++ b/tests/dictionaries_old/30mandatory_withvalue/00-base.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>value</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/30mandatory_withvalue/__init__.py b/tests/dictionaries_old/30mandatory_withvalue/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/30mandatory_withvalue/makedict/after.json b/tests/dictionaries_old/30mandatory_withvalue/makedict/after.json
new file mode 100644
index 00000000..6f4a21e7
--- /dev/null
+++ b/tests/dictionaries_old/30mandatory_withvalue/makedict/after.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "value"
+    }
+}
diff --git a/tests/dictionaries_old/30mandatory_withvalue/makedict/base.json b/tests/dictionaries_old/30mandatory_withvalue/makedict/base.json
new file mode 100644
index 00000000..904ffb4e
--- /dev/null
+++ b/tests/dictionaries_old/30mandatory_withvalue/makedict/base.json
@@ -0,0 +1,3 @@
+{
+    "rougail.general.mode_conteneur_actif": "value"
+}
diff --git a/tests/dictionaries_old/30mandatory_withvalue/makedict/before.json b/tests/dictionaries_old/30mandatory_withvalue/makedict/before.json
new file mode 100644
index 00000000..6f4a21e7
--- /dev/null
+++ b/tests/dictionaries_old/30mandatory_withvalue/makedict/before.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "value"
+    }
+}
diff --git a/tests/dictionaries_old/30mandatory_withvalue/tiramisu/base.py b/tests/dictionaries_old/30mandatory_withvalue/tiramisu/base.py
new file mode 100644
index 00000000..abe968b4
--- /dev/null
+++ b/tests/dictionaries_old/30mandatory_withvalue/tiramisu/base.py
@@ -0,0 +1,17 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="value", properties=frozenset({"mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/30mandatory_withvaluecalc/00-base.xml b/tests/dictionaries_old/30mandatory_withvaluecalc/00-base.xml
new file mode 100644
index 00000000..899ce4dd
--- /dev/null
+++ b/tests/dictionaries_old/30mandatory_withvaluecalc/00-base.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param>value</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/30mandatory_withvaluecalc/__init__.py b/tests/dictionaries_old/30mandatory_withvaluecalc/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/30mandatory_withvaluecalc/makedict/after.json b/tests/dictionaries_old/30mandatory_withvaluecalc/makedict/after.json
new file mode 100644
index 00000000..6f4a21e7
--- /dev/null
+++ b/tests/dictionaries_old/30mandatory_withvaluecalc/makedict/after.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "value"
+    }
+}
diff --git a/tests/dictionaries_old/30mandatory_withvaluecalc/makedict/base.json b/tests/dictionaries_old/30mandatory_withvaluecalc/makedict/base.json
new file mode 100644
index 00000000..904ffb4e
--- /dev/null
+++ b/tests/dictionaries_old/30mandatory_withvaluecalc/makedict/base.json
@@ -0,0 +1,3 @@
+{
+    "rougail.general.mode_conteneur_actif": "value"
+}
diff --git a/tests/dictionaries_old/30mandatory_withvaluecalc/makedict/before.json b/tests/dictionaries_old/30mandatory_withvaluecalc/makedict/before.json
new file mode 100644
index 00000000..6f4a21e7
--- /dev/null
+++ b/tests/dictionaries_old/30mandatory_withvaluecalc/makedict/before.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "value"
+    }
+}
diff --git a/tests/dictionaries_old/30mandatory_withvaluecalc/tiramisu/base.py b/tests/dictionaries_old/30mandatory_withvaluecalc/tiramisu/base.py
new file mode 100644
index 00000000..746f4317
--- /dev/null
+++ b/tests/dictionaries_old/30mandatory_withvaluecalc/tiramisu/base.py
@@ -0,0 +1,17 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params((ParamValue("value")))), properties=frozenset({"normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/40condition_base/00-base.xml b/tests/dictionaries_old/40condition_base/00-base.xml
new file mode 100644
index 00000000..c4aa968a
--- /dev/null
+++ b/tests/dictionaries_old/40condition_base/00-base.xml
@@ -0,0 +1,26 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition optional="True" name="disabled_if_in" source="condition">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif1</target>
+      <target type="variable" optional="True">mode_conteneur_actif2</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/40condition_base/__init__.py b/tests/dictionaries_old/40condition_base/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/40condition_base/makedict/after.json b/tests/dictionaries_old/40condition_base/makedict/after.json
new file mode 100644
index 00000000..c1303c5d
--- /dev/null
+++ b/tests/dictionaries_old/40condition_base/makedict/after.json
@@ -0,0 +1,18 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif1": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/40condition_base/makedict/base.json b/tests/dictionaries_old/40condition_base/makedict/base.json
new file mode 100644
index 00000000..e21c64e6
--- /dev/null
+++ b/tests/dictionaries_old/40condition_base/makedict/base.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general.condition": "non",
+    "rougail.general.mode_conteneur_actif1": "non",
+    "rougail.general.mode_conteneur_actif2": "non"
+}
diff --git a/tests/dictionaries_old/40condition_base/makedict/before.json b/tests/dictionaries_old/40condition_base/makedict/before.json
new file mode 100644
index 00000000..c1303c5d
--- /dev/null
+++ b/tests/dictionaries_old/40condition_base/makedict/before.json
@@ -0,0 +1,18 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif1": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/40condition_base/tiramisu/base.py b/tests/dictionaries_old/40condition_base/tiramisu/base.py
new file mode 100644
index 00000000..5db66c79
--- /dev/null
+++ b/tests/dictionaries_old/40condition_base/tiramisu/base.py
@@ -0,0 +1,20 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_4 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_5 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))}))
+option_6 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5, option_6], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/40condition_base_add/00-base.xml b/tests/dictionaries_old/40condition_base_add/00-base.xml
new file mode 100644
index 00000000..c4aa968a
--- /dev/null
+++ b/tests/dictionaries_old/40condition_base_add/00-base.xml
@@ -0,0 +1,26 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition optional="True" name="disabled_if_in" source="condition">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif1</target>
+      <target type="variable" optional="True">mode_conteneur_actif2</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/40condition_base_add/01-base.xml b/tests/dictionaries_old/40condition_base_add/01-base.xml
new file mode 100644
index 00000000..cca063ed
--- /dev/null
+++ b/tests/dictionaries_old/40condition_base_add/01-base.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="condition" redefine="True" remove_condition="True"/>
+    </family>
+  </variables>
+  <constraints>
+    <condition optional="True" name="disabled_if_in" source="condition">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif1</target>
+      <target type="variable" optional="True">mode_conteneur_actif2</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/40condition_base_add/__init__.py b/tests/dictionaries_old/40condition_base_add/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/40condition_base_add/makedict/after.json b/tests/dictionaries_old/40condition_base_add/makedict/after.json
new file mode 100644
index 00000000..c1303c5d
--- /dev/null
+++ b/tests/dictionaries_old/40condition_base_add/makedict/after.json
@@ -0,0 +1,18 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif1": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/40condition_base_add/makedict/base.json b/tests/dictionaries_old/40condition_base_add/makedict/base.json
new file mode 100644
index 00000000..e21c64e6
--- /dev/null
+++ b/tests/dictionaries_old/40condition_base_add/makedict/base.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general.condition": "non",
+    "rougail.general.mode_conteneur_actif1": "non",
+    "rougail.general.mode_conteneur_actif2": "non"
+}
diff --git a/tests/dictionaries_old/40condition_base_add/makedict/before.json b/tests/dictionaries_old/40condition_base_add/makedict/before.json
new file mode 100644
index 00000000..c1303c5d
--- /dev/null
+++ b/tests/dictionaries_old/40condition_base_add/makedict/before.json
@@ -0,0 +1,18 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif1": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/40condition_base_add/tiramisu/base.py b/tests/dictionaries_old/40condition_base_add/tiramisu/base.py
new file mode 100644
index 00000000..5db66c79
--- /dev/null
+++ b/tests/dictionaries_old/40condition_base_add/tiramisu/base.py
@@ -0,0 +1,20 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_4 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_5 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))}))
+option_6 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5, option_6], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/40condition_fallback/00-base.xml b/tests/dictionaries_old/40condition_fallback/00-base.xml
new file mode 100644
index 00000000..4b3dcbb5
--- /dev/null
+++ b/tests/dictionaries_old/40condition_fallback/00-base.xml
@@ -0,0 +1,29 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="disabled_family">
+      <variable name="mode_conteneur_actif3" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition optional="True" name="disabled_if_in" source="condition">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif1</target>
+      <target type="variable" optional="True">mode_conteneur_actif2</target>
+      <target type="family">disabled_family</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/40condition_fallback/__init__.py b/tests/dictionaries_old/40condition_fallback/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/40condition_fallback/makedict/after.json b/tests/dictionaries_old/40condition_fallback/makedict/after.json
new file mode 100644
index 00000000..2e6c541d
--- /dev/null
+++ b/tests/dictionaries_old/40condition_fallback/makedict/after.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/40condition_fallback/makedict/base.json b/tests/dictionaries_old/40condition_fallback/makedict/base.json
new file mode 100644
index 00000000..25056378
--- /dev/null
+++ b/tests/dictionaries_old/40condition_fallback/makedict/base.json
@@ -0,0 +1,3 @@
+{
+    "rougail.general.mode_conteneur_actif": "non"
+}
diff --git a/tests/dictionaries_old/40condition_fallback/makedict/before.json b/tests/dictionaries_old/40condition_fallback/makedict/before.json
new file mode 100644
index 00000000..2e6c541d
--- /dev/null
+++ b/tests/dictionaries_old/40condition_fallback/makedict/before.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/40condition_fallback/tiramisu/base.py b/tests/dictionaries_old/40condition_fallback/tiramisu/base.py
new file mode 100644
index 00000000..5f0ec474
--- /dev/null
+++ b/tests/dictionaries_old/40condition_fallback/tiramisu/base.py
@@ -0,0 +1,21 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_4 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"disabled", "mandatory", "normal"}))
+option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"disabled", "mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
+option_7 = StrOption(name="mode_conteneur_actif3", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_6 = OptionDescription(name="disabled_family", doc="disabled_family", children=[option_7], properties=frozenset({"disabled", "normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_6])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/40condition_optional/00-base.xml b/tests/dictionaries_old/40condition_optional/00-base.xml
new file mode 100644
index 00000000..3190d07a
--- /dev/null
+++ b/tests/dictionaries_old/40condition_optional/00-base.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition optional="True" name="disabled_if_in" source="condition">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif1</target>
+      <target type="variable" optional="True">mode_conteneur_actif2</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/40condition_optional/__init__.py b/tests/dictionaries_old/40condition_optional/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/40condition_optional/makedict/after.json b/tests/dictionaries_old/40condition_optional/makedict/after.json
new file mode 100644
index 00000000..e29e8d8e
--- /dev/null
+++ b/tests/dictionaries_old/40condition_optional/makedict/after.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif1": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/40condition_optional/makedict/base.json b/tests/dictionaries_old/40condition_optional/makedict/base.json
new file mode 100644
index 00000000..0858ba1b
--- /dev/null
+++ b/tests/dictionaries_old/40condition_optional/makedict/base.json
@@ -0,0 +1,5 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general.condition": "non",
+    "rougail.general.mode_conteneur_actif1": "non"
+}
diff --git a/tests/dictionaries_old/40condition_optional/makedict/before.json b/tests/dictionaries_old/40condition_optional/makedict/before.json
new file mode 100644
index 00000000..e29e8d8e
--- /dev/null
+++ b/tests/dictionaries_old/40condition_optional/makedict/before.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif1": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/40condition_optional/tiramisu/base.py b/tests/dictionaries_old/40condition_optional/tiramisu/base.py
new file mode 100644
index 00000000..e3fb7b1d
--- /dev/null
+++ b/tests/dictionaries_old/40condition_optional/tiramisu/base.py
@@ -0,0 +1,19 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_4 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_5 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/40condition_optional_empty/00-base.xml b/tests/dictionaries_old/40condition_optional_empty/00-base.xml
new file mode 100644
index 00000000..15197d24
--- /dev/null
+++ b/tests/dictionaries_old/40condition_optional_empty/00-base.xml
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition optional="True" name="disabled_if_in" source="condition">
+      <param>oui</param>
+      <target type="variable" optional="True">mode_conteneur_actif2</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/40condition_optional_empty/__init__.py b/tests/dictionaries_old/40condition_optional_empty/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/40condition_optional_empty/makedict/after.json b/tests/dictionaries_old/40condition_optional_empty/makedict/after.json
new file mode 100644
index 00000000..e29e8d8e
--- /dev/null
+++ b/tests/dictionaries_old/40condition_optional_empty/makedict/after.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif1": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/40condition_optional_empty/makedict/base.json b/tests/dictionaries_old/40condition_optional_empty/makedict/base.json
new file mode 100644
index 00000000..0858ba1b
--- /dev/null
+++ b/tests/dictionaries_old/40condition_optional_empty/makedict/base.json
@@ -0,0 +1,5 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general.condition": "non",
+    "rougail.general.mode_conteneur_actif1": "non"
+}
diff --git a/tests/dictionaries_old/40condition_optional_empty/makedict/before.json b/tests/dictionaries_old/40condition_optional_empty/makedict/before.json
new file mode 100644
index 00000000..e29e8d8e
--- /dev/null
+++ b/tests/dictionaries_old/40condition_optional_empty/makedict/before.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif1": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/40condition_optional_empty/tiramisu/base.py b/tests/dictionaries_old/40condition_optional_empty/tiramisu/base.py
new file mode 100644
index 00000000..0232a4ac
--- /dev/null
+++ b/tests/dictionaries_old/40condition_optional_empty/tiramisu/base.py
@@ -0,0 +1,19 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_4 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_5 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/40condition_optional_family/00-base.xml b/tests/dictionaries_old/40condition_optional_family/00-base.xml
new file mode 100644
index 00000000..8e67c7e3
--- /dev/null
+++ b/tests/dictionaries_old/40condition_optional_family/00-base.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <variable name="condition" type="boolean"/>
+    <family name="general">
+      <variable name="my_variable"/>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>True</param>
+      <target type="family" optional="True">general</target>
+      <target type="family" optional="True">general2</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/40condition_optional_family/__init__.py b/tests/dictionaries_old/40condition_optional_family/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/40condition_optional_family/makedict/after.json b/tests/dictionaries_old/40condition_optional_family/makedict/after.json
new file mode 100644
index 00000000..5995efe9
--- /dev/null
+++ b/tests/dictionaries_old/40condition_optional_family/makedict/after.json
@@ -0,0 +1,6 @@
+{
+    "rougail.condition": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/40condition_optional_family/makedict/base.json b/tests/dictionaries_old/40condition_optional_family/makedict/base.json
new file mode 100644
index 00000000..18b52fac
--- /dev/null
+++ b/tests/dictionaries_old/40condition_optional_family/makedict/base.json
@@ -0,0 +1,3 @@
+{
+    "rougail.condition": true
+}
diff --git a/tests/dictionaries_old/40condition_optional_family/makedict/before.json b/tests/dictionaries_old/40condition_optional_family/makedict/before.json
new file mode 100644
index 00000000..5995efe9
--- /dev/null
+++ b/tests/dictionaries_old/40condition_optional_family/makedict/before.json
@@ -0,0 +1,6 @@
+{
+    "rougail.condition": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/40condition_optional_family/tiramisu/base.py b/tests/dictionaries_old/40condition_optional_family/tiramisu/base.py
new file mode 100644
index 00000000..7b6cc832
--- /dev/null
+++ b/tests/dictionaries_old/40condition_optional_family/tiramisu/base.py
@@ -0,0 +1,18 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_2 = BoolOption(name="condition", doc="condition", default=True, properties=frozenset({"mandatory", "normal"}))
+option_4 = StrOption(name="my_variable", doc="my_variable", properties=frozenset({"normal"}))
+option_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue(True)}))}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_3])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/40empty_param/00_base.xml b/tests/dictionaries_old/40empty_param/00_base.xml
new file mode 100644
index 00000000..43c59f4b
--- /dev/null
+++ b/tests/dictionaries_old/40empty_param/00_base.xml
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services/>
+  <variables>
+    <family name="proxy_authentifie" description="proxy authentifié">
+      <variable name="toto1" type="port" description="Port d'écoute du proxy" mode="expert">
+            </variable>
+      <variable name="toto2" type="port" description="Port d'écoute du proxy NTLM" mode="expert">
+        <value>3127</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_multi_condition">
+      <param type="nil"/>
+      <target>toto1</target>
+    </fill>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/40empty_param/__init__.py b/tests/dictionaries_old/40empty_param/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/40empty_param/makedict/after.json b/tests/dictionaries_old/40empty_param/makedict/after.json
new file mode 100644
index 00000000..b88ddc47
--- /dev/null
+++ b/tests/dictionaries_old/40empty_param/makedict/after.json
@@ -0,0 +1,10 @@
+{
+    "rougail.proxy_authentifie.toto1": {
+        "owner": "default",
+        "value": null
+    },
+    "rougail.proxy_authentifie.toto2": {
+        "owner": "default",
+        "value": "3127"
+    }
+}
diff --git a/tests/dictionaries_old/40empty_param/makedict/base.json b/tests/dictionaries_old/40empty_param/makedict/base.json
new file mode 100644
index 00000000..36d66f3d
--- /dev/null
+++ b/tests/dictionaries_old/40empty_param/makedict/base.json
@@ -0,0 +1,4 @@
+{
+    "rougail.proxy_authentifie.toto1": null,
+    "rougail.proxy_authentifie.toto2": "3127"
+}
diff --git a/tests/dictionaries_old/40empty_param/makedict/before.json b/tests/dictionaries_old/40empty_param/makedict/before.json
new file mode 100644
index 00000000..b88ddc47
--- /dev/null
+++ b/tests/dictionaries_old/40empty_param/makedict/before.json
@@ -0,0 +1,10 @@
+{
+    "rougail.proxy_authentifie.toto1": {
+        "owner": "default",
+        "value": null
+    },
+    "rougail.proxy_authentifie.toto2": {
+        "owner": "default",
+        "value": "3127"
+    }
+}
diff --git a/tests/dictionaries_old/40empty_param/tiramisu/base.py b/tests/dictionaries_old/40empty_param/tiramisu/base.py
new file mode 100644
index 00000000..1aaecb16
--- /dev/null
+++ b/tests/dictionaries_old/40empty_param/tiramisu/base.py
@@ -0,0 +1,18 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = PortOption(name="toto1", doc="Port d'écoute du proxy", default=Calculation(func.calc_multi_condition, Params((ParamValue(None)))), allow_private=True, properties=frozenset({"expert"}))
+option_4 = PortOption(name="toto2", doc="Port d'écoute du proxy NTLM", default="3127", allow_private=True, properties=frozenset({"expert", "mandatory"}))
+option_2 = OptionDescription(name="proxy_authentifie", doc="proxy authentifié", children=[option_3, option_4], properties=frozenset({"expert"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/40empty_param2/00_base.xml b/tests/dictionaries_old/40empty_param2/00_base.xml
new file mode 100644
index 00000000..93d7575b
--- /dev/null
+++ b/tests/dictionaries_old/40empty_param2/00_base.xml
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services/>
+  <variables>
+    <family name="proxy_authentifie" description="proxy authentifié">
+      <variable name="toto1" type="port" description="Port d'écoute du proxy" mode="expert">
+            </variable>
+      <variable name="toto2" type="port" description="Port d'écoute du proxy NTLM" mode="expert">
+        <value>3127</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_multi_condition">
+      <param name="value" type="nil"/>
+      <target>toto1</target>
+    </fill>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/40empty_param2/__init__.py b/tests/dictionaries_old/40empty_param2/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/40empty_param2/makedict/after.json b/tests/dictionaries_old/40empty_param2/makedict/after.json
new file mode 100644
index 00000000..b88ddc47
--- /dev/null
+++ b/tests/dictionaries_old/40empty_param2/makedict/after.json
@@ -0,0 +1,10 @@
+{
+    "rougail.proxy_authentifie.toto1": {
+        "owner": "default",
+        "value": null
+    },
+    "rougail.proxy_authentifie.toto2": {
+        "owner": "default",
+        "value": "3127"
+    }
+}
diff --git a/tests/dictionaries_old/40empty_param2/makedict/base.json b/tests/dictionaries_old/40empty_param2/makedict/base.json
new file mode 100644
index 00000000..36d66f3d
--- /dev/null
+++ b/tests/dictionaries_old/40empty_param2/makedict/base.json
@@ -0,0 +1,4 @@
+{
+    "rougail.proxy_authentifie.toto1": null,
+    "rougail.proxy_authentifie.toto2": "3127"
+}
diff --git a/tests/dictionaries_old/40empty_param2/makedict/before.json b/tests/dictionaries_old/40empty_param2/makedict/before.json
new file mode 100644
index 00000000..b88ddc47
--- /dev/null
+++ b/tests/dictionaries_old/40empty_param2/makedict/before.json
@@ -0,0 +1,10 @@
+{
+    "rougail.proxy_authentifie.toto1": {
+        "owner": "default",
+        "value": null
+    },
+    "rougail.proxy_authentifie.toto2": {
+        "owner": "default",
+        "value": "3127"
+    }
+}
diff --git a/tests/dictionaries_old/40empty_param2/tiramisu/base.py b/tests/dictionaries_old/40empty_param2/tiramisu/base.py
new file mode 100644
index 00000000..212d7262
--- /dev/null
+++ b/tests/dictionaries_old/40empty_param2/tiramisu/base.py
@@ -0,0 +1,18 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = PortOption(name="toto1", doc="Port d'écoute du proxy", default=Calculation(func.calc_multi_condition, Params((), kwargs={'value': ParamValue(None)})), allow_private=True, properties=frozenset({"expert"}))
+option_4 = PortOption(name="toto2", doc="Port d'écoute du proxy NTLM", default="3127", allow_private=True, properties=frozenset({"expert", "mandatory"}))
+option_2 = OptionDescription(name="proxy_authentifie", doc="proxy authentifié", children=[option_3, option_4], properties=frozenset({"expert"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/40hidden_if_in_group_fallback/00-base.xml b/tests/dictionaries_old/40hidden_if_in_group_fallback/00-base.xml
new file mode 100644
index 00000000..b12f6df9
--- /dev/null
+++ b/tests/dictionaries_old/40hidden_if_in_group_fallback/00-base.xml
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change" multi="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition optional="True" name="hidden_if_in" source="condition">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif1</target>
+    </condition>
+    <group leader="mode_conteneur_actif1">
+      <follower>mode_conteneur_actif2</follower>
+    </group>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/40hidden_if_in_group_fallback/__init__.py b/tests/dictionaries_old/40hidden_if_in_group_fallback/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/40hidden_if_in_group_fallback/makedict/after.json b/tests/dictionaries_old/40hidden_if_in_group_fallback/makedict/after.json
new file mode 100644
index 00000000..71106a22
--- /dev/null
+++ b/tests/dictionaries_old/40hidden_if_in_group_fallback/makedict/after.json
@@ -0,0 +1,20 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif1.mode_conteneur_actif1": {
+        "owner": "default",
+        "value": [
+            "non"
+        ]
+    },
+    "rougail.general.mode_conteneur_actif1.mode_conteneur_actif2": {
+        "owner": [
+            "default"
+        ],
+        "value": [
+            "non"
+        ]
+    }
+}
diff --git a/tests/dictionaries_old/40hidden_if_in_group_fallback/makedict/base.json b/tests/dictionaries_old/40hidden_if_in_group_fallback/makedict/base.json
new file mode 100644
index 00000000..608b4c52
--- /dev/null
+++ b/tests/dictionaries_old/40hidden_if_in_group_fallback/makedict/base.json
@@ -0,0 +1,9 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general.mode_conteneur_actif1.mode_conteneur_actif1": [
+        {
+            "rougail.general.mode_conteneur_actif1.mode_conteneur_actif1": "non",
+            "rougail.general.mode_conteneur_actif1.mode_conteneur_actif2": "non"
+        }
+    ]
+}
diff --git a/tests/dictionaries_old/40hidden_if_in_group_fallback/makedict/before.json b/tests/dictionaries_old/40hidden_if_in_group_fallback/makedict/before.json
new file mode 100644
index 00000000..71106a22
--- /dev/null
+++ b/tests/dictionaries_old/40hidden_if_in_group_fallback/makedict/before.json
@@ -0,0 +1,20 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif1.mode_conteneur_actif1": {
+        "owner": "default",
+        "value": [
+            "non"
+        ]
+    },
+    "rougail.general.mode_conteneur_actif1.mode_conteneur_actif2": {
+        "owner": [
+            "default"
+        ],
+        "value": [
+            "non"
+        ]
+    }
+}
diff --git a/tests/dictionaries_old/40hidden_if_in_group_fallback/tiramisu/base.py b/tests/dictionaries_old/40hidden_if_in_group_fallback/tiramisu/base.py
new file mode 100644
index 00000000..f2fba470
--- /dev/null
+++ b/tests/dictionaries_old/40hidden_if_in_group_fallback/tiramisu/base.py
@@ -0,0 +1,20 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_5 = StrOption(name="mode_conteneur_actif1", doc="No change", multi=True, default=['non'], properties=frozenset({"force_default_on_freeze", "frozen", "mandatory"}))
+option_6 = StrOption(name="mode_conteneur_actif2", doc="No change", multi=True, default_multi="non", properties=frozenset({"force_default_on_freeze", "frozen", "mandatory", "normal"}))
+option_4 = Leadership(name="mode_conteneur_actif1", doc="No change", children=[option_5, option_6], properties=frozenset({"hidden", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/40ifin_leadership/00-base.xml b/tests/dictionaries_old/40ifin_leadership/00-base.xml
new file mode 100644
index 00000000..1e5ef63d
--- /dev/null
+++ b/tests/dictionaries_old/40ifin_leadership/00-base.xml
@@ -0,0 +1,26 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="condition" type="string" description="condition">
+        <value>oui</value>
+      </variable>
+      <variable name="leader" type="string" description="leader" multi="True"/>
+      <variable name="follower1" type="string" description="follower1"/>
+      <variable name="follower2" type="string" description="follower2"/>
+    </family>
+  </variables>
+  <constraints>
+    <group leader="leader">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+    </group>
+    <condition name="disabled_if_in" source="condition">
+      <param>oui</param>
+      <target type="variable">follower1</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/40ifin_leadership/__init__.py b/tests/dictionaries_old/40ifin_leadership/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/40ifin_leadership/makedict/after.json b/tests/dictionaries_old/40ifin_leadership/makedict/after.json
new file mode 100644
index 00000000..1578e3fb
--- /dev/null
+++ b/tests/dictionaries_old/40ifin_leadership/makedict/after.json
@@ -0,0 +1,18 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "oui"
+    },
+    "rougail.general.leader.leader": {
+        "owner": "default",
+        "value": []
+    },
+    "rougail.general.leader.follower2": {
+        "owner": [],
+        "value": []
+    }
+}
diff --git a/tests/dictionaries_old/40ifin_leadership/makedict/base.json b/tests/dictionaries_old/40ifin_leadership/makedict/base.json
new file mode 100644
index 00000000..2d556dde
--- /dev/null
+++ b/tests/dictionaries_old/40ifin_leadership/makedict/base.json
@@ -0,0 +1,5 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general.condition": "oui",
+    "rougail.general.leader.leader": []
+}
diff --git a/tests/dictionaries_old/40ifin_leadership/makedict/before.json b/tests/dictionaries_old/40ifin_leadership/makedict/before.json
new file mode 100644
index 00000000..1578e3fb
--- /dev/null
+++ b/tests/dictionaries_old/40ifin_leadership/makedict/before.json
@@ -0,0 +1,18 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "oui"
+    },
+    "rougail.general.leader.leader": {
+        "owner": "default",
+        "value": []
+    },
+    "rougail.general.leader.follower2": {
+        "owner": [],
+        "value": []
+    }
+}
diff --git a/tests/dictionaries_old/40ifin_leadership/tiramisu/base.py b/tests/dictionaries_old/40ifin_leadership/tiramisu/base.py
new file mode 100644
index 00000000..6def79cd
--- /dev/null
+++ b/tests/dictionaries_old/40ifin_leadership/tiramisu/base.py
@@ -0,0 +1,22 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_4 = StrOption(name="condition", doc="condition", default="oui", properties=frozenset({"mandatory", "normal"}))
+option_6 = StrOption(name="leader", doc="leader", multi=True)
+option_7 = StrOption(name="follower1", doc="follower1", multi=True, properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))}))
+option_8 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"normal"}))
+option_5 = Leadership(name="leader", doc="leader", children=[option_6, option_7, option_8], properties=frozenset({"normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/40ifin_leadershipauto/00-base.xml b/tests/dictionaries_old/40ifin_leadershipauto/00-base.xml
new file mode 100644
index 00000000..a65384b6
--- /dev/null
+++ b/tests/dictionaries_old/40ifin_leadershipauto/00-base.xml
@@ -0,0 +1,37 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="test">
+      <file>/etc/mailname</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="condition" type="string" description="condition">
+        <value>oui</value>
+      </variable>
+      <variable name="leader" type="string" description="leader" multi="True">
+        <value>a</value>
+      </variable>
+      <variable name="follower1" type="string" description="follower1" hidden="True"/>
+      <variable name="follower2" type="string" description="follower2"/>
+    </family>
+  </variables>
+  <constraints>
+    <group leader="leader">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+    </group>
+    <fill name="calc_val">
+      <param name="valeur">valfill</param>
+      <target>follower1</target>
+    </fill>
+    <condition name="disabled_if_in" source="condition">
+      <param>oui</param>
+      <target type="variable">follower1</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/40ifin_leadershipauto/__init__.py b/tests/dictionaries_old/40ifin_leadershipauto/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/40ifin_leadershipauto/makedict/after.json b/tests/dictionaries_old/40ifin_leadershipauto/makedict/after.json
new file mode 100644
index 00000000..3cde1013
--- /dev/null
+++ b/tests/dictionaries_old/40ifin_leadershipauto/makedict/after.json
@@ -0,0 +1,40 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "oui"
+    },
+    "rougail.general.leader.leader": {
+        "owner": "default",
+        "value": [
+            "a"
+        ]
+    },
+    "rougail.general.leader.follower2": {
+        "owner": [
+            "default"
+        ],
+        "value": [
+            null
+        ]
+    },
+    "services.test.files.mailname.name": {
+        "owner": "default",
+        "value": "/etc/mailname"
+    },
+    "services.test.files.mailname.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/40ifin_leadershipauto/makedict/base.json b/tests/dictionaries_old/40ifin_leadershipauto/makedict/base.json
new file mode 100644
index 00000000..364a2fa9
--- /dev/null
+++ b/tests/dictionaries_old/40ifin_leadershipauto/makedict/base.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general.condition": "oui",
+    "rougail.general.leader.leader": [
+        {
+            "rougail.general.leader.leader": "a",
+            "rougail.general.leader.follower2": null
+        }
+    ],
+    "services.test.files.mailname.name": "/etc/mailname",
+    "services.test.files.mailname.activate": true,
+    "services.test.activate": true,
+    "services.test.manage": true
+}
diff --git a/tests/dictionaries_old/40ifin_leadershipauto/makedict/before.json b/tests/dictionaries_old/40ifin_leadershipauto/makedict/before.json
new file mode 100644
index 00000000..3cde1013
--- /dev/null
+++ b/tests/dictionaries_old/40ifin_leadershipauto/makedict/before.json
@@ -0,0 +1,40 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "oui"
+    },
+    "rougail.general.leader.leader": {
+        "owner": "default",
+        "value": [
+            "a"
+        ]
+    },
+    "rougail.general.leader.follower2": {
+        "owner": [
+            "default"
+        ],
+        "value": [
+            null
+        ]
+    },
+    "services.test.files.mailname.name": {
+        "owner": "default",
+        "value": "/etc/mailname"
+    },
+    "services.test.files.mailname.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/40ifin_leadershipauto/result/etc/mailname b/tests/dictionaries_old/40ifin_leadershipauto/result/etc/mailname
new file mode 100644
index 00000000..6da0a4c2
--- /dev/null
+++ b/tests/dictionaries_old/40ifin_leadershipauto/result/etc/mailname
@@ -0,0 +1,6 @@
+#attr
+leader: a
+follower2: 
+#key
+leader: a
+follower2: 
diff --git a/tests/dictionaries_old/40ifin_leadershipauto/result/tmpfiles.d/rougail.conf b/tests/dictionaries_old/40ifin_leadershipauto/result/tmpfiles.d/rougail.conf
new file mode 100644
index 00000000..46697e03
--- /dev/null
+++ b/tests/dictionaries_old/40ifin_leadershipauto/result/tmpfiles.d/rougail.conf
@@ -0,0 +1,2 @@
+C /etc/mailname 0644 root root - /usr/local/lib/etc/mailname
+z /etc/mailname - - - - -
diff --git a/tests/dictionaries_old/40ifin_leadershipauto/tiramisu/base.py b/tests/dictionaries_old/40ifin_leadershipauto/tiramisu/base.py
new file mode 100644
index 00000000..22ba6b9c
--- /dev/null
+++ b/tests/dictionaries_old/40ifin_leadershipauto/tiramisu/base.py
@@ -0,0 +1,31 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_4 = StrOption(name="condition", doc="condition", default="oui", properties=frozenset({"mandatory", "normal"}))
+option_6 = StrOption(name="leader", doc="leader", multi=True, default=['a'], properties=frozenset({"mandatory"}))
+option_7 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))}))
+option_8 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"normal"}))
+option_5 = Leadership(name="leader", doc="leader", children=[option_6, option_7, option_8], properties=frozenset({"normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_13 = FilenameOption(name="name", doc="name", default="/etc/mailname")
+option_14 = BoolOption(name="activate", doc="activate", default=True)
+option_12 = OptionDescription(name="mailname", doc="mailname", children=[option_13, option_14])
+option_12.impl_set_information('source', "mailname")
+option_11 = OptionDescription(name="files", doc="files", children=[option_12])
+option_15 = BoolOption(name="activate", doc="activate", default=True)
+option_16 = BoolOption(name="manage", doc="manage", default=True)
+option_10 = OptionDescription(name="test", doc="test", children=[option_11, option_15, option_16])
+option_9 = OptionDescription(name="services", doc="services", children=[option_10], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_9])
diff --git a/tests/dictionaries_old/40ifin_leadershipauto/tmpl/mailname b/tests/dictionaries_old/40ifin_leadershipauto/tmpl/mailname
new file mode 100644
index 00000000..507012d7
--- /dev/null
+++ b/tests/dictionaries_old/40ifin_leadershipauto/tmpl/mailname
@@ -0,0 +1,20 @@
+#attr
+%for %%lead in %%leader
+leader: %%lead
+%if %%hasattr(%%lead, 'follower1')
+follower1: %%lead.follower1
+%end if
+%if %%hasattr(%%lead, 'follower2')
+follower2: %%lead.follower2
+%end if
+%end for
+#key
+%for %%lead in %%leader
+leader: %%lead
+%if 'follower1' in %%lead
+follower1: %%lead['follower1']
+%end if
+%if 'follower2' in %%lead
+follower2: %%lead['follower2']
+%end if
+%end for
diff --git a/tests/dictionaries_old/40ifin_leadershipauto_follower/00-base.xml b/tests/dictionaries_old/40ifin_leadershipauto_follower/00-base.xml
new file mode 100644
index 00000000..5de130d6
--- /dev/null
+++ b/tests/dictionaries_old/40ifin_leadershipauto_follower/00-base.xml
@@ -0,0 +1,39 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="test">
+      <file>/etc/mailname</file>
+      <file engine="jinja2">/etc/mailname2</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="condition" type="string" description="condition">
+        <value>oui</value>
+      </variable>
+      <variable name="leader" type="string" description="leader" multi="True">
+        <value>a</value>
+        <value>b</value>
+      </variable>
+      <variable name="follower1" type="string" description="follower1"/>
+      <variable name="follower2" type="string" description="follower2"/>
+    </family>
+  </variables>
+  <constraints>
+    <group leader="leader">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+    </group>
+    <fill name="calc_val">
+      <param name="valeur">valfill</param>
+      <target>follower1</target>
+    </fill>
+    <condition name="disabled_if_in" source="leader">
+      <param>a</param>
+      <target type="variable">follower1</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/40ifin_leadershipauto_follower/__init__.py b/tests/dictionaries_old/40ifin_leadershipauto_follower/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/40ifin_leadershipauto_follower/makedict/after.json b/tests/dictionaries_old/40ifin_leadershipauto_follower/makedict/after.json
new file mode 100644
index 00000000..c78d6ab1
--- /dev/null
+++ b/tests/dictionaries_old/40ifin_leadershipauto_follower/makedict/after.json
@@ -0,0 +1,61 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "oui"
+    },
+    "rougail.general.leader.leader": {
+        "owner": "default",
+        "value": [
+            "a",
+            "b"
+        ]
+    },
+    "rougail.general.leader.follower1": {
+        "owner": [
+            "error",
+            "default"
+        ],
+        "value": [
+            "cannot access to option \"follower1\" because has property \"disabled\"",
+            null
+        ]
+    },
+    "rougail.general.leader.follower2": {
+        "owner": [
+            "default",
+            "default"
+        ],
+        "value": [
+            null,
+            null
+        ]
+    },
+    "services.test.files.mailname.name": {
+        "owner": "default",
+        "value": "/etc/mailname"
+    },
+    "services.test.files.mailname.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.files.mailname2.name": {
+        "owner": "default",
+        "value": "/etc/mailname2"
+    },
+    "services.test.files.mailname2.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/40ifin_leadershipauto_follower/makedict/base.json b/tests/dictionaries_old/40ifin_leadershipauto_follower/makedict/base.json
new file mode 100644
index 00000000..28acc53e
--- /dev/null
+++ b/tests/dictionaries_old/40ifin_leadershipauto_follower/makedict/base.json
@@ -0,0 +1,21 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general.condition": "oui",
+    "rougail.general.leader.leader": [
+        {
+            "rougail.general.leader.leader": "a",
+            "rougail.general.leader.follower2": null
+        },
+        {
+            "rougail.general.leader.leader": "b",
+            "rougail.general.leader.follower1": null,
+            "rougail.general.leader.follower2": null
+        }
+    ],
+    "services.test.files.mailname.name": "/etc/mailname",
+    "services.test.files.mailname.activate": true,
+    "services.test.files.mailname2.name": "/etc/mailname2",
+    "services.test.files.mailname2.activate": true,
+    "services.test.activate": true,
+    "services.test.manage": true
+}
diff --git a/tests/dictionaries_old/40ifin_leadershipauto_follower/makedict/before.json b/tests/dictionaries_old/40ifin_leadershipauto_follower/makedict/before.json
new file mode 100644
index 00000000..c78d6ab1
--- /dev/null
+++ b/tests/dictionaries_old/40ifin_leadershipauto_follower/makedict/before.json
@@ -0,0 +1,61 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "oui"
+    },
+    "rougail.general.leader.leader": {
+        "owner": "default",
+        "value": [
+            "a",
+            "b"
+        ]
+    },
+    "rougail.general.leader.follower1": {
+        "owner": [
+            "error",
+            "default"
+        ],
+        "value": [
+            "cannot access to option \"follower1\" because has property \"disabled\"",
+            null
+        ]
+    },
+    "rougail.general.leader.follower2": {
+        "owner": [
+            "default",
+            "default"
+        ],
+        "value": [
+            null,
+            null
+        ]
+    },
+    "services.test.files.mailname.name": {
+        "owner": "default",
+        "value": "/etc/mailname"
+    },
+    "services.test.files.mailname.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.files.mailname2.name": {
+        "owner": "default",
+        "value": "/etc/mailname2"
+    },
+    "services.test.files.mailname2.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/40ifin_leadershipauto_follower/result/etc/mailname b/tests/dictionaries_old/40ifin_leadershipauto_follower/result/etc/mailname
new file mode 100644
index 00000000..b7cbd32c
--- /dev/null
+++ b/tests/dictionaries_old/40ifin_leadershipauto_follower/result/etc/mailname
@@ -0,0 +1,5 @@
+leader: a
+follower2: 
+leader: b
+follower1: 
+follower2: 
diff --git a/tests/dictionaries_old/40ifin_leadershipauto_follower/result/etc/mailname2 b/tests/dictionaries_old/40ifin_leadershipauto_follower/result/etc/mailname2
new file mode 100644
index 00000000..b7cbd32c
--- /dev/null
+++ b/tests/dictionaries_old/40ifin_leadershipauto_follower/result/etc/mailname2
@@ -0,0 +1,5 @@
+leader: a
+follower2: 
+leader: b
+follower1: 
+follower2: 
diff --git a/tests/dictionaries_old/40ifin_leadershipauto_follower/result/tmpfiles.d/rougail.conf b/tests/dictionaries_old/40ifin_leadershipauto_follower/result/tmpfiles.d/rougail.conf
new file mode 100644
index 00000000..7a8d00f4
--- /dev/null
+++ b/tests/dictionaries_old/40ifin_leadershipauto_follower/result/tmpfiles.d/rougail.conf
@@ -0,0 +1,4 @@
+C /etc/mailname 0644 root root - /usr/local/lib/etc/mailname
+z /etc/mailname - - - - -
+C /etc/mailname2 0644 root root - /usr/local/lib/etc/mailname2
+z /etc/mailname2 - - - - -
diff --git a/tests/dictionaries_old/40ifin_leadershipauto_follower/tiramisu/base.py b/tests/dictionaries_old/40ifin_leadershipauto_follower/tiramisu/base.py
new file mode 100644
index 00000000..751a0d06
--- /dev/null
+++ b/tests/dictionaries_old/40ifin_leadershipauto_follower/tiramisu/base.py
@@ -0,0 +1,36 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_4 = StrOption(name="condition", doc="condition", default="oui", properties=frozenset({"mandatory", "normal"}))
+option_6 = StrOption(name="leader", doc="leader", multi=True, default=['a', 'b'], properties=frozenset({"mandatory"}))
+option_7 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("a")}))}))
+option_8 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"normal"}))
+option_5 = Leadership(name="leader", doc="leader", children=[option_6, option_7, option_8], properties=frozenset({"normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_13 = FilenameOption(name="name", doc="name", default="/etc/mailname")
+option_14 = BoolOption(name="activate", doc="activate", default=True)
+option_12 = OptionDescription(name="mailname", doc="mailname", children=[option_13, option_14])
+option_12.impl_set_information('source', "mailname")
+option_16 = FilenameOption(name="name", doc="name", default="/etc/mailname2")
+option_17 = BoolOption(name="activate", doc="activate", default=True)
+option_15 = OptionDescription(name="mailname2", doc="mailname2", children=[option_16, option_17])
+option_15.impl_set_information('engine', "jinja2")
+option_15.impl_set_information('source', "mailname2")
+option_11 = OptionDescription(name="files", doc="files", children=[option_12, option_15])
+option_18 = BoolOption(name="activate", doc="activate", default=True)
+option_19 = BoolOption(name="manage", doc="manage", default=True)
+option_10 = OptionDescription(name="test", doc="test", children=[option_11, option_18, option_19])
+option_9 = OptionDescription(name="services", doc="services", children=[option_10], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_9])
diff --git a/tests/dictionaries_old/40ifin_leadershipauto_follower/tmpl/mailname b/tests/dictionaries_old/40ifin_leadershipauto_follower/tmpl/mailname
new file mode 100644
index 00000000..43dbe7d1
--- /dev/null
+++ b/tests/dictionaries_old/40ifin_leadershipauto_follower/tmpl/mailname
@@ -0,0 +1,9 @@
+%for %%lead in %%leader
+leader: %%lead
+%if %%hasattr(%%lead, 'follower1')
+follower1: %%lead.follower1
+%end if
+%if %%hasattr(%%lead, 'follower2')
+follower2: %%lead.follower2
+%end if
+%end for
diff --git a/tests/dictionaries_old/40ifin_leadershipauto_follower/tmpl/mailname2 b/tests/dictionaries_old/40ifin_leadershipauto_follower/tmpl/mailname2
new file mode 100644
index 00000000..021f00bb
--- /dev/null
+++ b/tests/dictionaries_old/40ifin_leadershipauto_follower/tmpl/mailname2
@@ -0,0 +1,9 @@
+{% for lead in leader -%}
+leader: {{ lead }}
+{% if lead.follower1 is defined -%}
+follower1: {{ lead.follower1 if lead.follower1 }}
+{% endif -%}
+{% if lead.follower2 is defined -%}
+follower2: {{ lead.follower2 if lead.follower2 }}
+{% endif -%}
+{% endfor -%}
diff --git a/tests/dictionaries_old/40ifin_multi/00-base.xml b/tests/dictionaries_old/40ifin_multi/00-base.xml
new file mode 100644
index 00000000..4b95acc8
--- /dev/null
+++ b/tests/dictionaries_old/40ifin_multi/00-base.xml
@@ -0,0 +1,28 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="general2" hidden="True">
+      <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif3" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="mode_conteneur_actif">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif3</target>
+    </condition>
+    <condition name="disabled_if_in" source="mode_conteneur_actif2">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif3</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/40ifin_multi/__init__.py b/tests/dictionaries_old/40ifin_multi/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/40ifin_multi/makedict/after.json b/tests/dictionaries_old/40ifin_multi/makedict/after.json
new file mode 100644
index 00000000..a4edb494
--- /dev/null
+++ b/tests/dictionaries_old/40ifin_multi/makedict/after.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general2.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general2.mode_conteneur_actif3": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/40ifin_multi/makedict/base.json b/tests/dictionaries_old/40ifin_multi/makedict/base.json
new file mode 100644
index 00000000..79c29948
--- /dev/null
+++ b/tests/dictionaries_old/40ifin_multi/makedict/base.json
@@ -0,0 +1,5 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general2.mode_conteneur_actif2": "non",
+    "rougail.general2.mode_conteneur_actif3": "non"
+}
diff --git a/tests/dictionaries_old/40ifin_multi/makedict/before.json b/tests/dictionaries_old/40ifin_multi/makedict/before.json
new file mode 100644
index 00000000..a4edb494
--- /dev/null
+++ b/tests/dictionaries_old/40ifin_multi/makedict/before.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general2.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general2.mode_conteneur_actif3": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/40ifin_multi/tiramisu/base.py b/tests/dictionaries_old/40ifin_multi/tiramisu/base.py
new file mode 100644
index 00000000..e9fc2084
--- /dev/null
+++ b/tests/dictionaries_old/40ifin_multi/tiramisu/base.py
@@ -0,0 +1,20 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
+option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_6 = StrOption(name="mode_conteneur_actif3", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_5, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))}))
+option_4 = OptionDescription(name="general2", doc="general2", children=[option_5, option_6], properties=frozenset({"hidden", "normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_4])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/40ifin_multi2/00-base.xml b/tests/dictionaries_old/40ifin_multi2/00-base.xml
new file mode 100644
index 00000000..035c1c1b
--- /dev/null
+++ b/tests/dictionaries_old/40ifin_multi2/00-base.xml
@@ -0,0 +1,28 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="general2" hidden="True">
+      <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
+        <value>oui</value>
+      </variable>
+      <variable name="mode_conteneur_actif3" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="mode_conteneur_actif">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif3</target>
+    </condition>
+    <condition name="disabled_if_in" source="mode_conteneur_actif2">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif3</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/40ifin_multi2/__init__.py b/tests/dictionaries_old/40ifin_multi2/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/40ifin_multi2/makedict/after.json b/tests/dictionaries_old/40ifin_multi2/makedict/after.json
new file mode 100644
index 00000000..4efa6e2f
--- /dev/null
+++ b/tests/dictionaries_old/40ifin_multi2/makedict/after.json
@@ -0,0 +1,10 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general2.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "oui"
+    }
+}
diff --git a/tests/dictionaries_old/40ifin_multi2/makedict/base.json b/tests/dictionaries_old/40ifin_multi2/makedict/base.json
new file mode 100644
index 00000000..ec1b5d8c
--- /dev/null
+++ b/tests/dictionaries_old/40ifin_multi2/makedict/base.json
@@ -0,0 +1,4 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general2.mode_conteneur_actif2": "oui"
+}
diff --git a/tests/dictionaries_old/40ifin_multi2/makedict/before.json b/tests/dictionaries_old/40ifin_multi2/makedict/before.json
new file mode 100644
index 00000000..4efa6e2f
--- /dev/null
+++ b/tests/dictionaries_old/40ifin_multi2/makedict/before.json
@@ -0,0 +1,10 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general2.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "oui"
+    }
+}
diff --git a/tests/dictionaries_old/40ifin_multi2/tiramisu/base.py b/tests/dictionaries_old/40ifin_multi2/tiramisu/base.py
new file mode 100644
index 00000000..1047e2c1
--- /dev/null
+++ b/tests/dictionaries_old/40ifin_multi2/tiramisu/base.py
@@ -0,0 +1,20 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
+option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="oui", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_6 = StrOption(name="mode_conteneur_actif3", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_5, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))}))
+option_4 = OptionDescription(name="general2", doc="general2", children=[option_5, option_6], properties=frozenset({"hidden", "normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_4])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/40ifin_validenum/00-base.xml b/tests/dictionaries_old/40ifin_validenum/00-base.xml
new file mode 100644
index 00000000..6754639b
--- /dev/null
+++ b/tests/dictionaries_old/40ifin_validenum/00-base.xml
@@ -0,0 +1,32 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="general2" hidden="True">
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif3" type="string" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>a</param>
+      <param>b</param>
+      <param>c</param>
+      <target>mode_conteneur_actif3</target>
+    </check>
+    <condition name="disabled_if_in" source="mode_conteneur_actif3">
+      <param>d</param>
+      <target type="variable">mode_conteneur_actif</target>
+    </condition>
+    <condition name="disabled_if_not_in" source="mode_conteneur_actif3">
+      <param>d</param>
+      <target type="variable">mode_conteneur_actif2</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/40ifin_validenum/__init__.py b/tests/dictionaries_old/40ifin_validenum/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/40ifin_validenum/makedict/after.json b/tests/dictionaries_old/40ifin_validenum/makedict/after.json
new file mode 100644
index 00000000..d06f9406
--- /dev/null
+++ b/tests/dictionaries_old/40ifin_validenum/makedict/after.json
@@ -0,0 +1,10 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general2.mode_conteneur_actif3": {
+        "owner": "default",
+        "value": "a"
+    }
+}
diff --git a/tests/dictionaries_old/40ifin_validenum/makedict/base.json b/tests/dictionaries_old/40ifin_validenum/makedict/base.json
new file mode 100644
index 00000000..16d3139d
--- /dev/null
+++ b/tests/dictionaries_old/40ifin_validenum/makedict/base.json
@@ -0,0 +1,4 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general2.mode_conteneur_actif3": "a"
+}
diff --git a/tests/dictionaries_old/40ifin_validenum/makedict/before.json b/tests/dictionaries_old/40ifin_validenum/makedict/before.json
new file mode 100644
index 00000000..d06f9406
--- /dev/null
+++ b/tests/dictionaries_old/40ifin_validenum/makedict/before.json
@@ -0,0 +1,10 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general2.mode_conteneur_actif3": {
+        "owner": "default",
+        "value": "a"
+    }
+}
diff --git a/tests/dictionaries_old/40ifin_validenum/tiramisu/base.py b/tests/dictionaries_old/40ifin_validenum/tiramisu/base.py
new file mode 100644
index 00000000..dcc8ddd9
--- /dev/null
+++ b/tests/dictionaries_old/40ifin_validenum/tiramisu/base.py
@@ -0,0 +1,20 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
+option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"disabled", "mandatory", "normal"}))
+option_6 = ChoiceOption(name="mode_conteneur_actif3", doc="No change", values=('a', 'b', 'c'), default="a", properties=frozenset({"mandatory", "normal"}))
+option_4 = OptionDescription(name="general2", doc="general2", children=[option_5, option_6], properties=frozenset({"hidden", "normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_4])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/45extra_without_family/00-base.xml b/tests/dictionaries_old/45extra_without_family/00-base.xml
new file mode 100644
index 00000000..2d0b52c9
--- /dev/null
+++ b/tests/dictionaries_old/45extra_without_family/00-base.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="test">
+      <file>/etc/file</file>
+    </service>
+  </services>
+  <variables>
+    <variable name="my_var">
+      <value>rougail</value>
+    </variable>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/45extra_without_family/__init__.py b/tests/dictionaries_old/45extra_without_family/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/45extra_without_family/extra_dirs/extra/00-base.xml b/tests/dictionaries_old/45extra_without_family/extra_dirs/extra/00-base.xml
new file mode 100644
index 00000000..73fe8060
--- /dev/null
+++ b/tests/dictionaries_old/45extra_without_family/extra_dirs/extra/00-base.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <variable name="my_var"/>
+  </variables>
+  <constraints>
+    <fill name="calc_multi_condition">
+      <param>non</param>
+      <target>extra.my_var</target>
+    </fill>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/45extra_without_family/makedict/after.json b/tests/dictionaries_old/45extra_without_family/makedict/after.json
new file mode 100644
index 00000000..648d84a6
--- /dev/null
+++ b/tests/dictionaries_old/45extra_without_family/makedict/after.json
@@ -0,0 +1,26 @@
+{
+    "rougail.my_var": {
+        "owner": "default",
+        "value": "rougail"
+    },
+    "extra.my_var": {
+        "owner": "default",
+        "value": null
+    },
+    "services.test.files.file.name": {
+        "owner": "default",
+        "value": "/etc/file"
+    },
+    "services.test.files.file.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/45extra_without_family/makedict/base.json b/tests/dictionaries_old/45extra_without_family/makedict/base.json
new file mode 100644
index 00000000..645b9a2d
--- /dev/null
+++ b/tests/dictionaries_old/45extra_without_family/makedict/base.json
@@ -0,0 +1,8 @@
+{
+    "rougail.my_var": "rougail",
+    "extra.my_var": null,
+    "services.test.files.file.name": "/etc/file",
+    "services.test.files.file.activate": true,
+    "services.test.activate": true,
+    "services.test.manage": true
+}
diff --git a/tests/dictionaries_old/45extra_without_family/makedict/before.json b/tests/dictionaries_old/45extra_without_family/makedict/before.json
new file mode 100644
index 00000000..648d84a6
--- /dev/null
+++ b/tests/dictionaries_old/45extra_without_family/makedict/before.json
@@ -0,0 +1,26 @@
+{
+    "rougail.my_var": {
+        "owner": "default",
+        "value": "rougail"
+    },
+    "extra.my_var": {
+        "owner": "default",
+        "value": null
+    },
+    "services.test.files.file.name": {
+        "owner": "default",
+        "value": "/etc/file"
+    },
+    "services.test.files.file.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/45extra_without_family/result/etc/file b/tests/dictionaries_old/45extra_without_family/result/etc/file
new file mode 100644
index 00000000..7ef82175
--- /dev/null
+++ b/tests/dictionaries_old/45extra_without_family/result/etc/file
@@ -0,0 +1,2 @@
+rougail
+
diff --git a/tests/dictionaries_old/45extra_without_family/result/tmpfiles.d/rougail.conf b/tests/dictionaries_old/45extra_without_family/result/tmpfiles.d/rougail.conf
new file mode 100644
index 00000000..574c7b82
--- /dev/null
+++ b/tests/dictionaries_old/45extra_without_family/result/tmpfiles.d/rougail.conf
@@ -0,0 +1,2 @@
+C /etc/file 0644 root root - /usr/local/lib/etc/file
+z /etc/file - - - - -
diff --git a/tests/dictionaries_old/45extra_without_family/tiramisu/base.py b/tests/dictionaries_old/45extra_without_family/tiramisu/base.py
new file mode 100644
index 00000000..36724493
--- /dev/null
+++ b/tests/dictionaries_old/45extra_without_family/tiramisu/base.py
@@ -0,0 +1,27 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_2 = StrOption(name="my_var", doc="my_var", default="rougail", properties=frozenset({"mandatory", "normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_4 = StrOption(name="my_var", doc="my_var", default=Calculation(func.calc_multi_condition, Params((ParamValue("non")))), properties=frozenset({"normal"}))
+option_3 = OptionDescription(name="extra", doc="extra", children=[option_4])
+option_9 = FilenameOption(name="name", doc="name", default="/etc/file")
+option_10 = BoolOption(name="activate", doc="activate", default=True)
+option_8 = OptionDescription(name="file", doc="file", children=[option_9, option_10])
+option_8.impl_set_information('source', "file")
+option_7 = OptionDescription(name="files", doc="files", children=[option_8])
+option_11 = BoolOption(name="activate", doc="activate", default=True)
+option_12 = BoolOption(name="manage", doc="manage", default=True)
+option_6 = OptionDescription(name="test", doc="test", children=[option_7, option_11, option_12])
+option_5 = OptionDescription(name="services", doc="services", children=[option_6], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_3, option_5])
diff --git a/tests/dictionaries_old/45extra_without_family/tmpl/file b/tests/dictionaries_old/45extra_without_family/tmpl/file
new file mode 100644
index 00000000..2277a384
--- /dev/null
+++ b/tests/dictionaries_old/45extra_without_family/tmpl/file
@@ -0,0 +1,2 @@
+%%my_var
+%%extra.my_var
diff --git a/tests/dictionaries_old/45multi_family/00-base.xml b/tests/dictionaries_old/45multi_family/00-base.xml
new file mode 100644
index 00000000..4f5d86b6
--- /dev/null
+++ b/tests/dictionaries_old/45multi_family/00-base.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="base">
+      <family name="subfamily">
+        <variable name="variable"/>
+      </family>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/45multi_family/__init__.py b/tests/dictionaries_old/45multi_family/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/45multi_family/makedict/after.json b/tests/dictionaries_old/45multi_family/makedict/after.json
new file mode 100644
index 00000000..eb04e8af
--- /dev/null
+++ b/tests/dictionaries_old/45multi_family/makedict/after.json
@@ -0,0 +1,6 @@
+{
+    "rougail.base.subfamily.variable": {
+        "owner": "default",
+        "value": null
+    }
+}
diff --git a/tests/dictionaries_old/45multi_family/makedict/base.json b/tests/dictionaries_old/45multi_family/makedict/base.json
new file mode 100644
index 00000000..75283a63
--- /dev/null
+++ b/tests/dictionaries_old/45multi_family/makedict/base.json
@@ -0,0 +1,3 @@
+{
+    "rougail.base.subfamily.variable": null
+}
diff --git a/tests/dictionaries_old/45multi_family/makedict/before.json b/tests/dictionaries_old/45multi_family/makedict/before.json
new file mode 100644
index 00000000..eb04e8af
--- /dev/null
+++ b/tests/dictionaries_old/45multi_family/makedict/before.json
@@ -0,0 +1,6 @@
+{
+    "rougail.base.subfamily.variable": {
+        "owner": "default",
+        "value": null
+    }
+}
diff --git a/tests/dictionaries_old/45multi_family/tiramisu/base.py b/tests/dictionaries_old/45multi_family/tiramisu/base.py
new file mode 100644
index 00000000..7e556a1c
--- /dev/null
+++ b/tests/dictionaries_old/45multi_family/tiramisu/base.py
@@ -0,0 +1,18 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_4 = StrOption(name="variable", doc="variable", properties=frozenset({"normal"}))
+option_3 = OptionDescription(name="subfamily", doc="subfamily", children=[option_4], properties=frozenset({"normal"}))
+option_2 = OptionDescription(name="base", doc="base", children=[option_3], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/45multi_family_basic/00-base.xml b/tests/dictionaries_old/45multi_family_basic/00-base.xml
new file mode 100644
index 00000000..831c0436
--- /dev/null
+++ b/tests/dictionaries_old/45multi_family_basic/00-base.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="base">
+      <family name="subfamily">
+        <variable name="variable" mode="basic"/>
+      </family>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/45multi_family_basic/__init__.py b/tests/dictionaries_old/45multi_family_basic/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/45multi_family_basic/makedict/after.json b/tests/dictionaries_old/45multi_family_basic/makedict/after.json
new file mode 100644
index 00000000..eb04e8af
--- /dev/null
+++ b/tests/dictionaries_old/45multi_family_basic/makedict/after.json
@@ -0,0 +1,6 @@
+{
+    "rougail.base.subfamily.variable": {
+        "owner": "default",
+        "value": null
+    }
+}
diff --git a/tests/dictionaries_old/45multi_family_basic/makedict/base.json b/tests/dictionaries_old/45multi_family_basic/makedict/base.json
new file mode 100644
index 00000000..75283a63
--- /dev/null
+++ b/tests/dictionaries_old/45multi_family_basic/makedict/base.json
@@ -0,0 +1,3 @@
+{
+    "rougail.base.subfamily.variable": null
+}
diff --git a/tests/dictionaries_old/45multi_family_basic/makedict/before.json b/tests/dictionaries_old/45multi_family_basic/makedict/before.json
new file mode 100644
index 00000000..eb04e8af
--- /dev/null
+++ b/tests/dictionaries_old/45multi_family_basic/makedict/before.json
@@ -0,0 +1,6 @@
+{
+    "rougail.base.subfamily.variable": {
+        "owner": "default",
+        "value": null
+    }
+}
diff --git a/tests/dictionaries_old/45multi_family_basic/tiramisu/base.py b/tests/dictionaries_old/45multi_family_basic/tiramisu/base.py
new file mode 100644
index 00000000..3f1787a3
--- /dev/null
+++ b/tests/dictionaries_old/45multi_family_basic/tiramisu/base.py
@@ -0,0 +1,18 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_4 = StrOption(name="variable", doc="variable", properties=frozenset({"basic"}))
+option_3 = OptionDescription(name="subfamily", doc="subfamily", children=[option_4], properties=frozenset({"basic"}))
+option_2 = OptionDescription(name="base", doc="base", children=[option_3], properties=frozenset({"basic"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/45multi_family_expert/00-base.xml b/tests/dictionaries_old/45multi_family_expert/00-base.xml
new file mode 100644
index 00000000..307757d2
--- /dev/null
+++ b/tests/dictionaries_old/45multi_family_expert/00-base.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="base" mode="expert">
+      <family name="subfamily">
+        <variable name="variable"/>
+      </family>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/45multi_family_expert/__init__.py b/tests/dictionaries_old/45multi_family_expert/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/45multi_family_expert/makedict/after.json b/tests/dictionaries_old/45multi_family_expert/makedict/after.json
new file mode 100644
index 00000000..eb04e8af
--- /dev/null
+++ b/tests/dictionaries_old/45multi_family_expert/makedict/after.json
@@ -0,0 +1,6 @@
+{
+    "rougail.base.subfamily.variable": {
+        "owner": "default",
+        "value": null
+    }
+}
diff --git a/tests/dictionaries_old/45multi_family_expert/makedict/base.json b/tests/dictionaries_old/45multi_family_expert/makedict/base.json
new file mode 100644
index 00000000..75283a63
--- /dev/null
+++ b/tests/dictionaries_old/45multi_family_expert/makedict/base.json
@@ -0,0 +1,3 @@
+{
+    "rougail.base.subfamily.variable": null
+}
diff --git a/tests/dictionaries_old/45multi_family_expert/makedict/before.json b/tests/dictionaries_old/45multi_family_expert/makedict/before.json
new file mode 100644
index 00000000..eb04e8af
--- /dev/null
+++ b/tests/dictionaries_old/45multi_family_expert/makedict/before.json
@@ -0,0 +1,6 @@
+{
+    "rougail.base.subfamily.variable": {
+        "owner": "default",
+        "value": null
+    }
+}
diff --git a/tests/dictionaries_old/45multi_family_expert/tiramisu/base.py b/tests/dictionaries_old/45multi_family_expert/tiramisu/base.py
new file mode 100644
index 00000000..94d393d7
--- /dev/null
+++ b/tests/dictionaries_old/45multi_family_expert/tiramisu/base.py
@@ -0,0 +1,18 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_4 = StrOption(name="variable", doc="variable", properties=frozenset({"expert"}))
+option_3 = OptionDescription(name="subfamily", doc="subfamily", children=[option_4], properties=frozenset({"expert"}))
+option_2 = OptionDescription(name="base", doc="base", children=[option_3], properties=frozenset({"expert"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/45multi_family_order/00-base.xml b/tests/dictionaries_old/45multi_family_order/00-base.xml
new file mode 100644
index 00000000..b04d9937
--- /dev/null
+++ b/tests/dictionaries_old/45multi_family_order/00-base.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <variable name="variable1"/>
+    <family name="base">
+      <variable name="variable2"/>
+      <family name="subfamily">
+        <variable name="variable3"/>
+      </family>
+      <variable name="variable4"/>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/45multi_family_order/__init__.py b/tests/dictionaries_old/45multi_family_order/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/45multi_family_order/makedict/after.json b/tests/dictionaries_old/45multi_family_order/makedict/after.json
new file mode 100644
index 00000000..d5cab640
--- /dev/null
+++ b/tests/dictionaries_old/45multi_family_order/makedict/after.json
@@ -0,0 +1,18 @@
+{
+    "rougail.variable1": {
+        "owner": "default",
+        "value": null
+    },
+    "rougail.base.variable2": {
+        "owner": "default",
+        "value": null
+    },
+    "rougail.base.subfamily.variable3": {
+        "owner": "default",
+        "value": null
+    },
+    "rougail.base.variable4": {
+        "owner": "default",
+        "value": null
+    }
+}
diff --git a/tests/dictionaries_old/45multi_family_order/makedict/base.json b/tests/dictionaries_old/45multi_family_order/makedict/base.json
new file mode 100644
index 00000000..617399c0
--- /dev/null
+++ b/tests/dictionaries_old/45multi_family_order/makedict/base.json
@@ -0,0 +1,6 @@
+{
+    "rougail.variable1": null,
+    "rougail.base.variable2": null,
+    "rougail.base.subfamily.variable3": null,
+    "rougail.base.variable4": null
+}
diff --git a/tests/dictionaries_old/45multi_family_order/makedict/before.json b/tests/dictionaries_old/45multi_family_order/makedict/before.json
new file mode 100644
index 00000000..d5cab640
--- /dev/null
+++ b/tests/dictionaries_old/45multi_family_order/makedict/before.json
@@ -0,0 +1,18 @@
+{
+    "rougail.variable1": {
+        "owner": "default",
+        "value": null
+    },
+    "rougail.base.variable2": {
+        "owner": "default",
+        "value": null
+    },
+    "rougail.base.subfamily.variable3": {
+        "owner": "default",
+        "value": null
+    },
+    "rougail.base.variable4": {
+        "owner": "default",
+        "value": null
+    }
+}
diff --git a/tests/dictionaries_old/45multi_family_order/tiramisu/base.py b/tests/dictionaries_old/45multi_family_order/tiramisu/base.py
new file mode 100644
index 00000000..a5c092cd
--- /dev/null
+++ b/tests/dictionaries_old/45multi_family_order/tiramisu/base.py
@@ -0,0 +1,21 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_2 = StrOption(name="variable1", doc="variable1", properties=frozenset({"normal"}))
+option_4 = StrOption(name="variable2", doc="variable2", properties=frozenset({"normal"}))
+option_6 = StrOption(name="variable3", doc="variable3", properties=frozenset({"normal"}))
+option_5 = OptionDescription(name="subfamily", doc="subfamily", children=[option_6], properties=frozenset({"normal"}))
+option_7 = StrOption(name="variable4", doc="variable4", properties=frozenset({"normal"}))
+option_3 = OptionDescription(name="base", doc="base", children=[option_4, option_5, option_7], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_3])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/45without_family/00-base.xml b/tests/dictionaries_old/45without_family/00-base.xml
new file mode 100644
index 00000000..4d3f2715
--- /dev/null
+++ b/tests/dictionaries_old/45without_family/00-base.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <variable name="variable"/>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/45without_family/__init__.py b/tests/dictionaries_old/45without_family/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/45without_family/makedict/after.json b/tests/dictionaries_old/45without_family/makedict/after.json
new file mode 100644
index 00000000..f9e63891
--- /dev/null
+++ b/tests/dictionaries_old/45without_family/makedict/after.json
@@ -0,0 +1,6 @@
+{
+    "rougail.variable": {
+        "owner": "default",
+        "value": null
+    }
+}
diff --git a/tests/dictionaries_old/45without_family/makedict/base.json b/tests/dictionaries_old/45without_family/makedict/base.json
new file mode 100644
index 00000000..774ccc4b
--- /dev/null
+++ b/tests/dictionaries_old/45without_family/makedict/base.json
@@ -0,0 +1,3 @@
+{
+    "rougail.variable": null
+}
diff --git a/tests/dictionaries_old/45without_family/makedict/before.json b/tests/dictionaries_old/45without_family/makedict/before.json
new file mode 100644
index 00000000..f9e63891
--- /dev/null
+++ b/tests/dictionaries_old/45without_family/makedict/before.json
@@ -0,0 +1,6 @@
+{
+    "rougail.variable": {
+        "owner": "default",
+        "value": null
+    }
+}
diff --git a/tests/dictionaries_old/45without_family/tiramisu/base.py b/tests/dictionaries_old/45without_family/tiramisu/base.py
new file mode 100644
index 00000000..678c2bed
--- /dev/null
+++ b/tests/dictionaries_old/45without_family/tiramisu/base.py
@@ -0,0 +1,16 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_2 = StrOption(name="variable", doc="variable", properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/50exists_exists/00-base.xml b/tests/dictionaries_old/50exists_exists/00-base.xml
new file mode 100644
index 00000000..8d03cb4e
--- /dev/null
+++ b/tests/dictionaries_old/50exists_exists/00-base.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Description" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/50exists_exists/01-base.xml b/tests/dictionaries_old/50exists_exists/01-base.xml
new file mode 100644
index 00000000..518de756
--- /dev/null
+++ b/tests/dictionaries_old/50exists_exists/01-base.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="New description" exists="False">
+        <value>oui</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/50exists_exists/__init__.py b/tests/dictionaries_old/50exists_exists/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/50exists_exists/makedict/after.json b/tests/dictionaries_old/50exists_exists/makedict/after.json
new file mode 100644
index 00000000..2e6c541d
--- /dev/null
+++ b/tests/dictionaries_old/50exists_exists/makedict/after.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/50exists_exists/makedict/base.json b/tests/dictionaries_old/50exists_exists/makedict/base.json
new file mode 100644
index 00000000..25056378
--- /dev/null
+++ b/tests/dictionaries_old/50exists_exists/makedict/base.json
@@ -0,0 +1,3 @@
+{
+    "rougail.general.mode_conteneur_actif": "non"
+}
diff --git a/tests/dictionaries_old/50exists_exists/makedict/before.json b/tests/dictionaries_old/50exists_exists/makedict/before.json
new file mode 100644
index 00000000..2e6c541d
--- /dev/null
+++ b/tests/dictionaries_old/50exists_exists/makedict/before.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/50exists_exists/tiramisu/base.py b/tests/dictionaries_old/50exists_exists/tiramisu/base.py
new file mode 100644
index 00000000..deb9cbf1
--- /dev/null
+++ b/tests/dictionaries_old/50exists_exists/tiramisu/base.py
@@ -0,0 +1,17 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/50redefine_description/00-base.xml b/tests/dictionaries_old/50redefine_description/00-base.xml
new file mode 100644
index 00000000..8c9d801f
--- /dev/null
+++ b/tests/dictionaries_old/50redefine_description/00-base.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/50redefine_description/01-redefine.xml b/tests/dictionaries_old/50redefine_description/01-redefine.xml
new file mode 100644
index 00000000..758bd2f2
--- /dev/null
+++ b/tests/dictionaries_old/50redefine_description/01-redefine.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" redefine="True" description="Redefined"/>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/50redefine_description/__init__.py b/tests/dictionaries_old/50redefine_description/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/50redefine_description/makedict/after.json b/tests/dictionaries_old/50redefine_description/makedict/after.json
new file mode 100644
index 00000000..2e6c541d
--- /dev/null
+++ b/tests/dictionaries_old/50redefine_description/makedict/after.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/50redefine_description/makedict/base.json b/tests/dictionaries_old/50redefine_description/makedict/base.json
new file mode 100644
index 00000000..25056378
--- /dev/null
+++ b/tests/dictionaries_old/50redefine_description/makedict/base.json
@@ -0,0 +1,3 @@
+{
+    "rougail.general.mode_conteneur_actif": "non"
+}
diff --git a/tests/dictionaries_old/50redefine_description/makedict/before.json b/tests/dictionaries_old/50redefine_description/makedict/before.json
new file mode 100644
index 00000000..2e6c541d
--- /dev/null
+++ b/tests/dictionaries_old/50redefine_description/makedict/before.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/50redefine_description/tiramisu/base.py b/tests/dictionaries_old/50redefine_description/tiramisu/base.py
new file mode 100644
index 00000000..792e2176
--- /dev/null
+++ b/tests/dictionaries_old/50redefine_description/tiramisu/base.py
@@ -0,0 +1,17 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="Redefined", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/51exists_nonexists/00-base.xml b/tests/dictionaries_old/51exists_nonexists/00-base.xml
new file mode 100644
index 00000000..6d475995
--- /dev/null
+++ b/tests/dictionaries_old/51exists_nonexists/00-base.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Description">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="Description" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/51exists_nonexists/01-base.xml b/tests/dictionaries_old/51exists_nonexists/01-base.xml
new file mode 100644
index 00000000..59583fe1
--- /dev/null
+++ b/tests/dictionaries_old/51exists_nonexists/01-base.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif2" type="string" description="New description" exists="False">
+        <value>oui</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/51exists_nonexists/__init__.py b/tests/dictionaries_old/51exists_nonexists/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/51exists_nonexists/makedict/after.json b/tests/dictionaries_old/51exists_nonexists/makedict/after.json
new file mode 100644
index 00000000..b9d4ee93
--- /dev/null
+++ b/tests/dictionaries_old/51exists_nonexists/makedict/after.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif1": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "oui"
+    }
+}
diff --git a/tests/dictionaries_old/51exists_nonexists/makedict/base.json b/tests/dictionaries_old/51exists_nonexists/makedict/base.json
new file mode 100644
index 00000000..4eee7b61
--- /dev/null
+++ b/tests/dictionaries_old/51exists_nonexists/makedict/base.json
@@ -0,0 +1,5 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general.mode_conteneur_actif1": "non",
+    "rougail.general.mode_conteneur_actif2": "oui"
+}
diff --git a/tests/dictionaries_old/51exists_nonexists/makedict/before.json b/tests/dictionaries_old/51exists_nonexists/makedict/before.json
new file mode 100644
index 00000000..b9d4ee93
--- /dev/null
+++ b/tests/dictionaries_old/51exists_nonexists/makedict/before.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif1": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "oui"
+    }
+}
diff --git a/tests/dictionaries_old/51exists_nonexists/tiramisu/base.py b/tests/dictionaries_old/51exists_nonexists/tiramisu/base.py
new file mode 100644
index 00000000..f5df0733
--- /dev/null
+++ b/tests/dictionaries_old/51exists_nonexists/tiramisu/base.py
@@ -0,0 +1,19 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"}))
+option_4 = StrOption(name="mode_conteneur_actif1", doc="Description", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_5 = StrOption(name="mode_conteneur_actif2", doc="New description", default="oui", properties=frozenset({"mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/51exists_redefine/00-base.xml b/tests/dictionaries_old/51exists_redefine/00-base.xml
new file mode 100644
index 00000000..8d03cb4e
--- /dev/null
+++ b/tests/dictionaries_old/51exists_redefine/00-base.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Description" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/51exists_redefine/01-base.xml b/tests/dictionaries_old/51exists_redefine/01-base.xml
new file mode 100644
index 00000000..61c05429
--- /dev/null
+++ b/tests/dictionaries_old/51exists_redefine/01-base.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" redefine="True" exists="True">
+        <value>oui</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" redefine="True" exists="True">
+        <value>oui</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/51exists_redefine/__init__.py b/tests/dictionaries_old/51exists_redefine/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/51exists_redefine/makedict/after.json b/tests/dictionaries_old/51exists_redefine/makedict/after.json
new file mode 100644
index 00000000..3a4c0953
--- /dev/null
+++ b/tests/dictionaries_old/51exists_redefine/makedict/after.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "oui"
+    }
+}
diff --git a/tests/dictionaries_old/51exists_redefine/makedict/base.json b/tests/dictionaries_old/51exists_redefine/makedict/base.json
new file mode 100644
index 00000000..50112b17
--- /dev/null
+++ b/tests/dictionaries_old/51exists_redefine/makedict/base.json
@@ -0,0 +1,3 @@
+{
+    "rougail.general.mode_conteneur_actif": "oui"
+}
diff --git a/tests/dictionaries_old/51exists_redefine/makedict/before.json b/tests/dictionaries_old/51exists_redefine/makedict/before.json
new file mode 100644
index 00000000..3a4c0953
--- /dev/null
+++ b/tests/dictionaries_old/51exists_redefine/makedict/before.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "oui"
+    }
+}
diff --git a/tests/dictionaries_old/51exists_redefine/tiramisu/base.py b/tests/dictionaries_old/51exists_redefine/tiramisu/base.py
new file mode 100644
index 00000000..de4748b5
--- /dev/null
+++ b/tests/dictionaries_old/51exists_redefine/tiramisu/base.py
@@ -0,0 +1,17 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="Description", default="oui", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/51redefine_auto/00-base.xml b/tests/dictionaries_old/51redefine_auto/00-base.xml
new file mode 100644
index 00000000..1195d9fe
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_auto/00-base.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">non</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/51redefine_auto/01-base.xml b/tests/dictionaries_old/51redefine_auto/01-base.xml
new file mode 100644
index 00000000..698aed49
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_auto/01-base.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" redefine="True"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="concat">
+      <param name="valeur">non</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/51redefine_auto/__init__.py b/tests/dictionaries_old/51redefine_auto/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/51redefine_auto/makedict/after.json b/tests/dictionaries_old/51redefine_auto/makedict/after.json
new file mode 100644
index 00000000..da5b8acc
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_auto/makedict/after.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": null
+    }
+}
diff --git a/tests/dictionaries_old/51redefine_auto/makedict/base.json b/tests/dictionaries_old/51redefine_auto/makedict/base.json
new file mode 100644
index 00000000..ab81a62f
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_auto/makedict/base.json
@@ -0,0 +1,3 @@
+{
+    "rougail.general.mode_conteneur_actif": null
+}
diff --git a/tests/dictionaries_old/51redefine_auto/makedict/before.json b/tests/dictionaries_old/51redefine_auto/makedict/before.json
new file mode 100644
index 00000000..da5b8acc
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_auto/makedict/before.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": null
+    }
+}
diff --git a/tests/dictionaries_old/51redefine_auto/tiramisu/base.py b/tests/dictionaries_old/51redefine_auto/tiramisu/base.py
new file mode 100644
index 00000000..213df46a
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_auto/tiramisu/base.py
@@ -0,0 +1,17 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.concat, Params((), kwargs={'valeur': ParamValue("non")})), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/51redefine_autofill/00-base.xml b/tests/dictionaries_old/51redefine_autofill/00-base.xml
new file mode 100644
index 00000000..0da7cab1
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_autofill/00-base.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">oui</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/51redefine_autofill/01-base.xml b/tests/dictionaries_old/51redefine_autofill/01-base.xml
new file mode 100644
index 00000000..28881d84
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_autofill/01-base.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" redefine="True" hidden="False"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="concat">
+      <param name="valeur">non</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/51redefine_autofill/__init__.py b/tests/dictionaries_old/51redefine_autofill/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/51redefine_autofill/makedict/after.json b/tests/dictionaries_old/51redefine_autofill/makedict/after.json
new file mode 100644
index 00000000..da5b8acc
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_autofill/makedict/after.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": null
+    }
+}
diff --git a/tests/dictionaries_old/51redefine_autofill/makedict/base.json b/tests/dictionaries_old/51redefine_autofill/makedict/base.json
new file mode 100644
index 00000000..ab81a62f
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_autofill/makedict/base.json
@@ -0,0 +1,3 @@
+{
+    "rougail.general.mode_conteneur_actif": null
+}
diff --git a/tests/dictionaries_old/51redefine_autofill/makedict/before.json b/tests/dictionaries_old/51redefine_autofill/makedict/before.json
new file mode 100644
index 00000000..da5b8acc
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_autofill/makedict/before.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": null
+    }
+}
diff --git a/tests/dictionaries_old/51redefine_autofill/tiramisu/base.py b/tests/dictionaries_old/51redefine_autofill/tiramisu/base.py
new file mode 100644
index 00000000..09b30dd5
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_autofill/tiramisu/base.py
@@ -0,0 +1,17 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.concat, Params((), kwargs={'valeur': ParamValue("non")})), properties=frozenset({"normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/51redefine_family/00-base.xml b/tests/dictionaries_old/51redefine_family/00-base.xml
new file mode 100644
index 00000000..458057f2
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_family/00-base.xml
@@ -0,0 +1,21 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="general2" hidden="True">
+      <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="mode_conteneur_actif">
+      <param>oui</param>
+      <target type="family">general2</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/51redefine_family/01-base.xml b/tests/dictionaries_old/51redefine_family/01-base.xml
new file mode 100644
index 00000000..dc45e35e
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_family/01-base.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" redefine="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/51redefine_family/__init__.py b/tests/dictionaries_old/51redefine_family/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/51redefine_family/makedict/after.json b/tests/dictionaries_old/51redefine_family/makedict/after.json
new file mode 100644
index 00000000..18c09ea3
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_family/makedict/after.json
@@ -0,0 +1,10 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general2.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/51redefine_family/makedict/base.json b/tests/dictionaries_old/51redefine_family/makedict/base.json
new file mode 100644
index 00000000..1b9934fc
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_family/makedict/base.json
@@ -0,0 +1,4 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general2.mode_conteneur_actif2": "non"
+}
diff --git a/tests/dictionaries_old/51redefine_family/makedict/before.json b/tests/dictionaries_old/51redefine_family/makedict/before.json
new file mode 100644
index 00000000..18c09ea3
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_family/makedict/before.json
@@ -0,0 +1,10 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general2.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/51redefine_family/tiramisu/base.py b/tests/dictionaries_old/51redefine_family/tiramisu/base.py
new file mode 100644
index 00000000..93b17ad1
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_family/tiramisu/base.py
@@ -0,0 +1,19 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
+option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_4 = OptionDescription(name="general2", doc="general2", children=[option_5], properties=frozenset({"hidden", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_4])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/51redefine_fill/00-base.xml b/tests/dictionaries_old/51redefine_fill/00-base.xml
new file mode 100644
index 00000000..0da7cab1
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_fill/00-base.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">oui</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/51redefine_fill/01-base.xml b/tests/dictionaries_old/51redefine_fill/01-base.xml
new file mode 100644
index 00000000..698aed49
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_fill/01-base.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" redefine="True"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="concat">
+      <param name="valeur">non</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/51redefine_fill/__init__.py b/tests/dictionaries_old/51redefine_fill/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/51redefine_fill/makedict/after.json b/tests/dictionaries_old/51redefine_fill/makedict/after.json
new file mode 100644
index 00000000..da5b8acc
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_fill/makedict/after.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": null
+    }
+}
diff --git a/tests/dictionaries_old/51redefine_fill/makedict/base.json b/tests/dictionaries_old/51redefine_fill/makedict/base.json
new file mode 100644
index 00000000..ab81a62f
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_fill/makedict/base.json
@@ -0,0 +1,3 @@
+{
+    "rougail.general.mode_conteneur_actif": null
+}
diff --git a/tests/dictionaries_old/51redefine_fill/makedict/before.json b/tests/dictionaries_old/51redefine_fill/makedict/before.json
new file mode 100644
index 00000000..da5b8acc
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_fill/makedict/before.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": null
+    }
+}
diff --git a/tests/dictionaries_old/51redefine_fill/tiramisu/base.py b/tests/dictionaries_old/51redefine_fill/tiramisu/base.py
new file mode 100644
index 00000000..213df46a
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_fill/tiramisu/base.py
@@ -0,0 +1,17 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.concat, Params((), kwargs={'valeur': ParamValue("non")})), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/51redefine_fillauto/00-base.xml b/tests/dictionaries_old/51redefine_fillauto/00-base.xml
new file mode 100644
index 00000000..9373d517
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_fillauto/00-base.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">oui</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/51redefine_fillauto/01-base.xml b/tests/dictionaries_old/51redefine_fillauto/01-base.xml
new file mode 100644
index 00000000..f295968d
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_fillauto/01-base.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" redefine="True" hidden="True"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="concat">
+      <param name="valeur">non</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/51redefine_fillauto/__init__.py b/tests/dictionaries_old/51redefine_fillauto/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/51redefine_fillauto/makedict/after.json b/tests/dictionaries_old/51redefine_fillauto/makedict/after.json
new file mode 100644
index 00000000..da5b8acc
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_fillauto/makedict/after.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": null
+    }
+}
diff --git a/tests/dictionaries_old/51redefine_fillauto/makedict/base.json b/tests/dictionaries_old/51redefine_fillauto/makedict/base.json
new file mode 100644
index 00000000..ab81a62f
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_fillauto/makedict/base.json
@@ -0,0 +1,3 @@
+{
+    "rougail.general.mode_conteneur_actif": null
+}
diff --git a/tests/dictionaries_old/51redefine_fillauto/makedict/before.json b/tests/dictionaries_old/51redefine_fillauto/makedict/before.json
new file mode 100644
index 00000000..da5b8acc
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_fillauto/makedict/before.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": null
+    }
+}
diff --git a/tests/dictionaries_old/51redefine_fillauto/tiramisu/base.py b/tests/dictionaries_old/51redefine_fillauto/tiramisu/base.py
new file mode 100644
index 00000000..213df46a
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_fillauto/tiramisu/base.py
@@ -0,0 +1,17 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.concat, Params((), kwargs={'valeur': ParamValue("non")})), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/51redefine_help/00-base.xml b/tests/dictionaries_old/51redefine_help/00-base.xml
new file mode 100644
index 00000000..c39693ee
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_help/00-base.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general" help="redefine help family">
+      <variable name="mode_conteneur_actif" type="string" description="redefine help" hidden="True" help="redefine help">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/51redefine_help/01-base.xml b/tests/dictionaries_old/51redefine_help/01-base.xml
new file mode 100644
index 00000000..f6ea9844
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_help/01-base.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general" help="redefine help family ok">
+      <variable name="mode_conteneur_actif" redefine="True" hidden="True" help="redefine help ok">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/51redefine_help/__init__.py b/tests/dictionaries_old/51redefine_help/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/51redefine_help/makedict/after.json b/tests/dictionaries_old/51redefine_help/makedict/after.json
new file mode 100644
index 00000000..2e6c541d
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_help/makedict/after.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/51redefine_help/makedict/base.json b/tests/dictionaries_old/51redefine_help/makedict/base.json
new file mode 100644
index 00000000..25056378
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_help/makedict/base.json
@@ -0,0 +1,3 @@
+{
+    "rougail.general.mode_conteneur_actif": "non"
+}
diff --git a/tests/dictionaries_old/51redefine_help/makedict/before.json b/tests/dictionaries_old/51redefine_help/makedict/before.json
new file mode 100644
index 00000000..2e6c541d
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_help/makedict/before.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/51redefine_help/tiramisu/base.py b/tests/dictionaries_old/51redefine_help/tiramisu/base.py
new file mode 100644
index 00000000..d7a3b246
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_help/tiramisu/base.py
@@ -0,0 +1,19 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="redefine help", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_3.impl_set_information('help', "redefine help ok")
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
+option_2.impl_set_information('help', "redefine help family ok")
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/51redefine_hidden/00-base.xml b/tests/dictionaries_old/51redefine_hidden/00-base.xml
new file mode 100644
index 00000000..ccab2d18
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_hidden/00-base.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Redefine hidden">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/51redefine_hidden/01-redefine.xml b/tests/dictionaries_old/51redefine_hidden/01-redefine.xml
new file mode 100644
index 00000000..31eef053
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_hidden/01-redefine.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" redefine="True" hidden="True"/>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/51redefine_hidden/__init__.py b/tests/dictionaries_old/51redefine_hidden/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/51redefine_hidden/makedict/after.json b/tests/dictionaries_old/51redefine_hidden/makedict/after.json
new file mode 100644
index 00000000..2e6c541d
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_hidden/makedict/after.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/51redefine_hidden/makedict/base.json b/tests/dictionaries_old/51redefine_hidden/makedict/base.json
new file mode 100644
index 00000000..25056378
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_hidden/makedict/base.json
@@ -0,0 +1,3 @@
+{
+    "rougail.general.mode_conteneur_actif": "non"
+}
diff --git a/tests/dictionaries_old/51redefine_hidden/makedict/before.json b/tests/dictionaries_old/51redefine_hidden/makedict/before.json
new file mode 100644
index 00000000..2e6c541d
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_hidden/makedict/before.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/51redefine_hidden/tiramisu/base.py b/tests/dictionaries_old/51redefine_hidden/tiramisu/base.py
new file mode 100644
index 00000000..e05e7be1
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_hidden/tiramisu/base.py
@@ -0,0 +1,17 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="Redefine hidden", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/51redefine_multi/00-base.xml b/tests/dictionaries_old/51redefine_multi/00-base.xml
new file mode 100644
index 00000000..8c9d801f
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_multi/00-base.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/51redefine_multi/01-redefine.xml b/tests/dictionaries_old/51redefine_multi/01-redefine.xml
new file mode 100644
index 00000000..df4f28e5
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_multi/01-redefine.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" redefine="True" multi="True"/>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/51redefine_multi/__init__.py b/tests/dictionaries_old/51redefine_multi/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/51redefine_multi/errno_48 b/tests/dictionaries_old/51redefine_multi/errno_48
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/51redefine_remove_check/00-base.xml b/tests/dictionaries_old/51redefine_remove_check/00-base.xml
new file mode 100644
index 00000000..9dc96e51
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_remove_check/00-base.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>a</param>
+      <param>b</param>
+      <param>c</param>
+      <target>mode_conteneur_actif</target>
+    </check>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/51redefine_remove_check/01-base.xml b/tests/dictionaries_old/51redefine_remove_check/01-base.xml
new file mode 100644
index 00000000..5ef05ee9
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_remove_check/01-base.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" redefine="True" remove_check="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/51redefine_remove_check/__init__.py b/tests/dictionaries_old/51redefine_remove_check/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/51redefine_remove_check/makedict/after.json b/tests/dictionaries_old/51redefine_remove_check/makedict/after.json
new file mode 100644
index 00000000..2e6c541d
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_remove_check/makedict/after.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/51redefine_remove_check/makedict/base.json b/tests/dictionaries_old/51redefine_remove_check/makedict/base.json
new file mode 100644
index 00000000..25056378
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_remove_check/makedict/base.json
@@ -0,0 +1,3 @@
+{
+    "rougail.general.mode_conteneur_actif": "non"
+}
diff --git a/tests/dictionaries_old/51redefine_remove_check/makedict/before.json b/tests/dictionaries_old/51redefine_remove_check/makedict/before.json
new file mode 100644
index 00000000..2e6c541d
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_remove_check/makedict/before.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/51redefine_remove_check/tiramisu/base.py b/tests/dictionaries_old/51redefine_remove_check/tiramisu/base.py
new file mode 100644
index 00000000..9d70847b
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_remove_check/tiramisu/base.py
@@ -0,0 +1,17 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/51redefine_remove_condition/00-base.xml b/tests/dictionaries_old/51redefine_remove_condition/00-base.xml
new file mode 100644
index 00000000..4d3a9bce
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_remove_condition/00-base.xml
@@ -0,0 +1,26 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif1</target>
+      <target type="variable">mode_conteneur_actif2</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/51redefine_remove_condition/01-base.xml b/tests/dictionaries_old/51redefine_remove_condition/01-base.xml
new file mode 100644
index 00000000..5b96406b
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_remove_condition/01-base.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="condition" redefine="True" remove_condition="True"/>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/51redefine_remove_condition/__init__.py b/tests/dictionaries_old/51redefine_remove_condition/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/51redefine_remove_condition/makedict/after.json b/tests/dictionaries_old/51redefine_remove_condition/makedict/after.json
new file mode 100644
index 00000000..c1303c5d
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_remove_condition/makedict/after.json
@@ -0,0 +1,18 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif1": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/51redefine_remove_condition/makedict/base.json b/tests/dictionaries_old/51redefine_remove_condition/makedict/base.json
new file mode 100644
index 00000000..e21c64e6
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_remove_condition/makedict/base.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general.condition": "non",
+    "rougail.general.mode_conteneur_actif1": "non",
+    "rougail.general.mode_conteneur_actif2": "non"
+}
diff --git a/tests/dictionaries_old/51redefine_remove_condition/makedict/before.json b/tests/dictionaries_old/51redefine_remove_condition/makedict/before.json
new file mode 100644
index 00000000..c1303c5d
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_remove_condition/makedict/before.json
@@ -0,0 +1,18 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif1": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/51redefine_remove_condition/tiramisu/base.py b/tests/dictionaries_old/51redefine_remove_condition/tiramisu/base.py
new file mode 100644
index 00000000..411b40d7
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_remove_condition/tiramisu/base.py
@@ -0,0 +1,20 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_4 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_5 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_6 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5, option_6], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/51redefine_removecondition_nonautofreeze/00-base.xml b/tests/dictionaries_old/51redefine_removecondition_nonautofreeze/00-base.xml
new file mode 100644
index 00000000..a3471e44
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_removecondition_nonautofreeze/00-base.xml
@@ -0,0 +1,27 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <variable name="my_var" auto_freeze="True">
+      <value>no</value>
+    </variable>
+    <variable name="condition">
+      <value>no</value>
+    </variable>
+    <variable name="my_var1" hidden="True">
+      <value>no</value>
+    </variable>
+    <variable name="my_var2">
+      <value>no</value>
+    </variable>
+    <variable name="server_deployed" type="boolean" hidden="True">
+      <value>False</value>
+    </variable>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>yes</param>
+      <target type="variable">my_var1</target>
+      <target type="variable">my_var2</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/51redefine_removecondition_nonautofreeze/01-base.xml b/tests/dictionaries_old/51redefine_removecondition_nonautofreeze/01-base.xml
new file mode 100644
index 00000000..2798de04
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_removecondition_nonautofreeze/01-base.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <variable name="condition" redefine="True" remove_condition="True"/>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/51redefine_removecondition_nonautofreeze/__init__.py b/tests/dictionaries_old/51redefine_removecondition_nonautofreeze/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/51redefine_removecondition_nonautofreeze/makedict/after.json b/tests/dictionaries_old/51redefine_removecondition_nonautofreeze/makedict/after.json
new file mode 100644
index 00000000..4f0c7f29
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_removecondition_nonautofreeze/makedict/after.json
@@ -0,0 +1,22 @@
+{
+    "rougail.my_var": {
+        "owner": "forced",
+        "value": "no"
+    },
+    "rougail.condition": {
+        "owner": "default",
+        "value": "no"
+    },
+    "rougail.my_var1": {
+        "owner": "default",
+        "value": "no"
+    },
+    "rougail.my_var2": {
+        "owner": "default",
+        "value": "no"
+    },
+    "rougail.server_deployed": {
+        "owner": "default",
+        "value": false
+    }
+}
diff --git a/tests/dictionaries_old/51redefine_removecondition_nonautofreeze/makedict/base.json b/tests/dictionaries_old/51redefine_removecondition_nonautofreeze/makedict/base.json
new file mode 100644
index 00000000..6f3ba348
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_removecondition_nonautofreeze/makedict/base.json
@@ -0,0 +1,7 @@
+{
+    "rougail.my_var": "no",
+    "rougail.condition": "no",
+    "rougail.my_var1": "no",
+    "rougail.my_var2": "no",
+    "rougail.server_deployed": false
+}
diff --git a/tests/dictionaries_old/51redefine_removecondition_nonautofreeze/makedict/before.json b/tests/dictionaries_old/51redefine_removecondition_nonautofreeze/makedict/before.json
new file mode 100644
index 00000000..7e322dd6
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_removecondition_nonautofreeze/makedict/before.json
@@ -0,0 +1,22 @@
+{
+    "rougail.my_var": {
+        "owner": "default",
+        "value": "no"
+    },
+    "rougail.condition": {
+        "owner": "default",
+        "value": "no"
+    },
+    "rougail.my_var1": {
+        "owner": "default",
+        "value": "no"
+    },
+    "rougail.my_var2": {
+        "owner": "default",
+        "value": "no"
+    },
+    "rougail.server_deployed": {
+        "owner": "default",
+        "value": false
+    }
+}
diff --git a/tests/dictionaries_old/51redefine_removecondition_nonautofreeze/tiramisu/base.py b/tests/dictionaries_old/51redefine_removecondition_nonautofreeze/tiramisu/base.py
new file mode 100644
index 00000000..e1af0ae9
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_removecondition_nonautofreeze/tiramisu/base.py
@@ -0,0 +1,20 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_6 = BoolOption(name="server_deployed", doc="server_deployed", default=False, properties=frozenset({"hidden", "mandatory", "normal"}))
+option_2 = StrOption(name="my_var", doc="my_var", default="no", properties=frozenset({"basic", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue(True)}))}))
+option_3 = StrOption(name="condition", doc="condition", default="no", properties=frozenset({"mandatory", "normal"}))
+option_4 = StrOption(name="my_var1", doc="my_var1", default="no", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_5 = StrOption(name="my_var2", doc="my_var2", default="no", properties=frozenset({"mandatory", "normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_3, option_4, option_5, option_6])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/51redefine_type/00-base.xml b/tests/dictionaries_old/51redefine_type/00-base.xml
new file mode 100644
index 00000000..8c9d801f
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_type/00-base.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/51redefine_type/01-redefine.xml b/tests/dictionaries_old/51redefine_type/01-redefine.xml
new file mode 100644
index 00000000..cf1a2adb
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_type/01-redefine.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" redefine="True" type="number"/>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/51redefine_type/__init__.py b/tests/dictionaries_old/51redefine_type/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/51redefine_type/errno_48 b/tests/dictionaries_old/51redefine_type/errno_48
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/51redefine_validenum/00-base.xml b/tests/dictionaries_old/51redefine_validenum/00-base.xml
new file mode 100644
index 00000000..9d3c5cf0
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_validenum/00-base.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>a</param>
+      <param>b</param>
+      <param>c</param>
+      <target>mode_conteneur_actif</target>
+    </check>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/51redefine_validenum/01-redefine.xml b/tests/dictionaries_old/51redefine_validenum/01-redefine.xml
new file mode 100644
index 00000000..1e5e2109
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_validenum/01-redefine.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" redefine="True" remove_check="True"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>a</param>
+      <param>b</param>
+      <target>mode_conteneur_actif</target>
+    </check>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/51redefine_validenum/__init__.py b/tests/dictionaries_old/51redefine_validenum/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/51redefine_validenum/makedict/after.json b/tests/dictionaries_old/51redefine_validenum/makedict/after.json
new file mode 100644
index 00000000..c043df35
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_validenum/makedict/after.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "a"
+    }
+}
diff --git a/tests/dictionaries_old/51redefine_validenum/makedict/base.json b/tests/dictionaries_old/51redefine_validenum/makedict/base.json
new file mode 100644
index 00000000..7ca93417
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_validenum/makedict/base.json
@@ -0,0 +1,3 @@
+{
+    "rougail.general.mode_conteneur_actif": "a"
+}
diff --git a/tests/dictionaries_old/51redefine_validenum/makedict/before.json b/tests/dictionaries_old/51redefine_validenum/makedict/before.json
new file mode 100644
index 00000000..c043df35
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_validenum/makedict/before.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "a"
+    }
+}
diff --git a/tests/dictionaries_old/51redefine_validenum/tiramisu/base.py b/tests/dictionaries_old/51redefine_validenum/tiramisu/base.py
new file mode 100644
index 00000000..34de05c3
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_validenum/tiramisu/base.py
@@ -0,0 +1,17 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = ChoiceOption(name="mode_conteneur_actif", doc="Redefine description", values=('a', 'b'), default="a", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/51redefine_value/00-base.xml b/tests/dictionaries_old/51redefine_value/00-base.xml
new file mode 100644
index 00000000..e1bf475e
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_value/00-base.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Redefine value">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="Redefine value" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/51redefine_value/01-redefine.xml b/tests/dictionaries_old/51redefine_value/01-redefine.xml
new file mode 100644
index 00000000..4fe7dc59
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_value/01-redefine.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif1" redefine="True">
+        <value>oui</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/51redefine_value/__init__.py b/tests/dictionaries_old/51redefine_value/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/51redefine_value/makedict/after.json b/tests/dictionaries_old/51redefine_value/makedict/after.json
new file mode 100644
index 00000000..08d514d4
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_value/makedict/after.json
@@ -0,0 +1,10 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif1": {
+        "owner": "default",
+        "value": "oui"
+    }
+}
diff --git a/tests/dictionaries_old/51redefine_value/makedict/base.json b/tests/dictionaries_old/51redefine_value/makedict/base.json
new file mode 100644
index 00000000..993bf2df
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_value/makedict/base.json
@@ -0,0 +1,4 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general.mode_conteneur_actif1": "oui"
+}
diff --git a/tests/dictionaries_old/51redefine_value/makedict/before.json b/tests/dictionaries_old/51redefine_value/makedict/before.json
new file mode 100644
index 00000000..08d514d4
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_value/makedict/before.json
@@ -0,0 +1,10 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif1": {
+        "owner": "default",
+        "value": "oui"
+    }
+}
diff --git a/tests/dictionaries_old/51redefine_value/tiramisu/base.py b/tests/dictionaries_old/51redefine_value/tiramisu/base.py
new file mode 100644
index 00000000..e4b863be
--- /dev/null
+++ b/tests/dictionaries_old/51redefine_value/tiramisu/base.py
@@ -0,0 +1,18 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="Redefine value", default="non", properties=frozenset({"mandatory", "normal"}))
+option_4 = StrOption(name="mode_conteneur_actif1", doc="Redefine value", default="oui", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/51remove_fill/00-base.xml b/tests/dictionaries_old/51remove_fill/00-base.xml
new file mode 100644
index 00000000..d99bdfb0
--- /dev/null
+++ b/tests/dictionaries_old/51remove_fill/00-base.xml
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>oui</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="variable">mode_conteneur_actif1</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/51remove_fill/01-base.xml b/tests/dictionaries_old/51remove_fill/01-base.xml
new file mode 100644
index 00000000..f404ec78
--- /dev/null
+++ b/tests/dictionaries_old/51remove_fill/01-base.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" redefine="True" remove_fill="True"/>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/51remove_fill/__init__.py b/tests/dictionaries_old/51remove_fill/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/51remove_fill/makedict/after.json b/tests/dictionaries_old/51remove_fill/makedict/after.json
new file mode 100644
index 00000000..f0a909af
--- /dev/null
+++ b/tests/dictionaries_old/51remove_fill/makedict/after.json
@@ -0,0 +1,10 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "oui"
+    },
+    "rougail.general.mode_conteneur_actif1": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/51remove_fill/makedict/base.json b/tests/dictionaries_old/51remove_fill/makedict/base.json
new file mode 100644
index 00000000..a13f65aa
--- /dev/null
+++ b/tests/dictionaries_old/51remove_fill/makedict/base.json
@@ -0,0 +1,4 @@
+{
+    "rougail.general.mode_conteneur_actif": "oui",
+    "rougail.general.mode_conteneur_actif1": "non"
+}
diff --git a/tests/dictionaries_old/51remove_fill/makedict/before.json b/tests/dictionaries_old/51remove_fill/makedict/before.json
new file mode 100644
index 00000000..f0a909af
--- /dev/null
+++ b/tests/dictionaries_old/51remove_fill/makedict/before.json
@@ -0,0 +1,10 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "oui"
+    },
+    "rougail.general.mode_conteneur_actif1": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/51remove_fill/tiramisu/base.py b/tests/dictionaries_old/51remove_fill/tiramisu/base.py
new file mode 100644
index 00000000..78ccdb56
--- /dev/null
+++ b/tests/dictionaries_old/51remove_fill/tiramisu/base.py
@@ -0,0 +1,18 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"mandatory", "normal"}))
+option_4 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/52exists_redefine/00-base.xml b/tests/dictionaries_old/52exists_redefine/00-base.xml
new file mode 100644
index 00000000..192bba8a
--- /dev/null
+++ b/tests/dictionaries_old/52exists_redefine/00-base.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Description" hidden="True">
+        <value>oui</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/52exists_redefine/01-base.xml b/tests/dictionaries_old/52exists_redefine/01-base.xml
new file mode 100644
index 00000000..793e4d2e
--- /dev/null
+++ b/tests/dictionaries_old/52exists_redefine/01-base.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" description="New description" exists="False" redefine="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/52exists_redefine/__init__.py b/tests/dictionaries_old/52exists_redefine/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/52exists_redefine/makedict/after.json b/tests/dictionaries_old/52exists_redefine/makedict/after.json
new file mode 100644
index 00000000..2e6c541d
--- /dev/null
+++ b/tests/dictionaries_old/52exists_redefine/makedict/after.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/52exists_redefine/makedict/base.json b/tests/dictionaries_old/52exists_redefine/makedict/base.json
new file mode 100644
index 00000000..25056378
--- /dev/null
+++ b/tests/dictionaries_old/52exists_redefine/makedict/base.json
@@ -0,0 +1,3 @@
+{
+    "rougail.general.mode_conteneur_actif": "non"
+}
diff --git a/tests/dictionaries_old/52exists_redefine/makedict/before.json b/tests/dictionaries_old/52exists_redefine/makedict/before.json
new file mode 100644
index 00000000..2e6c541d
--- /dev/null
+++ b/tests/dictionaries_old/52exists_redefine/makedict/before.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    }
+}
diff --git a/tests/dictionaries_old/52exists_redefine/tiramisu/base.py b/tests/dictionaries_old/52exists_redefine/tiramisu/base.py
new file mode 100644
index 00000000..47ed77cd
--- /dev/null
+++ b/tests/dictionaries_old/52exists_redefine/tiramisu/base.py
@@ -0,0 +1,17 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="New description", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/60action_external/00-base.xml b/tests/dictionaries_old/60action_external/00-base.xml
new file mode 100644
index 00000000..84913090
--- /dev/null
+++ b/tests/dictionaries_old/60action_external/00-base.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/60action_external/__init__.py b/tests/dictionaries_old/60action_external/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/60action_external/extra_dirs/extra/00-base.xml b/tests/dictionaries_old/60action_external/extra_dirs/extra/00-base.xml
new file mode 100644
index 00000000..5beae659
--- /dev/null
+++ b/tests/dictionaries_old/60action_external/extra_dirs/extra/00-base.xml
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="test">
+      <variable name="delay" type="number" description="délai en minutes avant lancement">
+        <value>0</value>
+      </variable>
+      <variable name="calc_url" type="web_address" description="domain" hidden="True">
+        <value>0</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param>http://localhost/</param>
+      <target>extra.test.calc_url</target>
+    </fill>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/60action_external/makedict/after.json b/tests/dictionaries_old/60action_external/makedict/after.json
new file mode 100644
index 00000000..8bb18d68
--- /dev/null
+++ b/tests/dictionaries_old/60action_external/makedict/after.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "extra.test.delay": {
+        "owner": "default",
+        "value": 0
+    },
+    "extra.test.calc_url": {
+        "owner": "default",
+        "value": "http://localhost/"
+    }
+}
diff --git a/tests/dictionaries_old/60action_external/makedict/base.json b/tests/dictionaries_old/60action_external/makedict/base.json
new file mode 100644
index 00000000..553f555e
--- /dev/null
+++ b/tests/dictionaries_old/60action_external/makedict/base.json
@@ -0,0 +1,5 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "extra.test.delay": 0,
+    "extra.test.calc_url": "http://localhost/"
+}
diff --git a/tests/dictionaries_old/60action_external/makedict/before.json b/tests/dictionaries_old/60action_external/makedict/before.json
new file mode 100644
index 00000000..8bb18d68
--- /dev/null
+++ b/tests/dictionaries_old/60action_external/makedict/before.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "extra.test.delay": {
+        "owner": "default",
+        "value": 0
+    },
+    "extra.test.calc_url": {
+        "owner": "default",
+        "value": "http://localhost/"
+    }
+}
diff --git a/tests/dictionaries_old/60action_external/tiramisu/base.py b/tests/dictionaries_old/60action_external/tiramisu/base.py
new file mode 100644
index 00000000..60131d82
--- /dev/null
+++ b/tests/dictionaries_old/60action_external/tiramisu/base.py
@@ -0,0 +1,21 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="général", children=[option_3], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_6 = IntOption(name="delay", doc="délai en minutes avant lancement", default=0, properties=frozenset({"mandatory", "normal"}))
+option_7 = URLOption(name="calc_url", doc="domain", default=Calculation(func.calc_val, Params((ParamValue("http://localhost/")))), allow_ip=True, allow_without_dot=True, properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal"}))
+option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_7], properties=frozenset({"normal"}))
+option_4 = OptionDescription(name="extra", doc="extra", children=[option_5])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4])
diff --git a/tests/dictionaries_old/60extra_externalspacecondition/00-base.xml b/tests/dictionaries_old/60extra_externalspacecondition/00-base.xml
new file mode 100644
index 00000000..cd3769c6
--- /dev/null
+++ b/tests/dictionaries_old/60extra_externalspacecondition/00-base.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general" description="général">
+      <variable name="my_var" auto_freeze="True">
+        <value>no</value>
+      </variable>
+      <variable name="my_var1" hidden="True">
+        <value>no</value>
+      </variable>
+      <variable name="server_deployed" type="boolean" hidden="True">
+        <value>False</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/60extra_externalspacecondition/__init__.py b/tests/dictionaries_old/60extra_externalspacecondition/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/60extra_externalspacecondition/extra_dirs/extra/00-base.xml b/tests/dictionaries_old/60extra_externalspacecondition/extra_dirs/extra/00-base.xml
new file mode 100644
index 00000000..52089bf3
--- /dev/null
+++ b/tests/dictionaries_old/60extra_externalspacecondition/extra_dirs/extra/00-base.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="ejabberd">
+      <variable name="description" type="string">
+        <value>Exportation de la base de ejabberd</value>
+      </variable>
+      <variable name="day" type="schedule"/>
+      <variable name="mode" type="schedulemod">
+        <value>pre</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/60extra_externalspacecondition/extra_dirs/extra1/00-base.xml b/tests/dictionaries_old/60extra_externalspacecondition/extra_dirs/extra1/00-base.xml
new file mode 100644
index 00000000..f5a5d709
--- /dev/null
+++ b/tests/dictionaries_old/60extra_externalspacecondition/extra_dirs/extra1/00-base.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="external">
+      <variable name="description" type="string">
+        <value>test</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="extra.ejabberd.description">
+      <param>non</param>
+      <target type="family">extra1.external</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/60extra_externalspacecondition/makedict/after.json b/tests/dictionaries_old/60extra_externalspacecondition/makedict/after.json
new file mode 100644
index 00000000..b2dd92d1
--- /dev/null
+++ b/tests/dictionaries_old/60extra_externalspacecondition/makedict/after.json
@@ -0,0 +1,30 @@
+{
+    "rougail.general.my_var": {
+        "owner": "forced",
+        "value": "no"
+    },
+    "rougail.general.my_var1": {
+        "owner": "default",
+        "value": "no"
+    },
+    "rougail.general.server_deployed": {
+        "owner": "default",
+        "value": false
+    },
+    "extra.ejabberd.description": {
+        "owner": "default",
+        "value": "Exportation de la base de ejabberd"
+    },
+    "extra.ejabberd.day": {
+        "owner": "default",
+        "value": "none"
+    },
+    "extra.ejabberd.mode": {
+        "owner": "default",
+        "value": "pre"
+    },
+    "extra1.external.description": {
+        "owner": "default",
+        "value": "test"
+    }
+}
diff --git a/tests/dictionaries_old/60extra_externalspacecondition/makedict/base.json b/tests/dictionaries_old/60extra_externalspacecondition/makedict/base.json
new file mode 100644
index 00000000..1c500131
--- /dev/null
+++ b/tests/dictionaries_old/60extra_externalspacecondition/makedict/base.json
@@ -0,0 +1,9 @@
+{
+    "rougail.general.my_var": "no",
+    "rougail.general.my_var1": "no",
+    "rougail.general.server_deployed": false,
+    "extra.ejabberd.description": "Exportation de la base de ejabberd",
+    "extra.ejabberd.day": "none",
+    "extra.ejabberd.mode": "pre",
+    "extra1.external.description": "test"
+}
diff --git a/tests/dictionaries_old/60extra_externalspacecondition/makedict/before.json b/tests/dictionaries_old/60extra_externalspacecondition/makedict/before.json
new file mode 100644
index 00000000..c979ff36
--- /dev/null
+++ b/tests/dictionaries_old/60extra_externalspacecondition/makedict/before.json
@@ -0,0 +1,30 @@
+{
+    "rougail.general.my_var": {
+        "owner": "default",
+        "value": "no"
+    },
+    "rougail.general.my_var1": {
+        "owner": "default",
+        "value": "no"
+    },
+    "rougail.general.server_deployed": {
+        "owner": "default",
+        "value": false
+    },
+    "extra.ejabberd.description": {
+        "owner": "default",
+        "value": "Exportation de la base de ejabberd"
+    },
+    "extra.ejabberd.day": {
+        "owner": "default",
+        "value": "none"
+    },
+    "extra.ejabberd.mode": {
+        "owner": "default",
+        "value": "pre"
+    },
+    "extra1.external.description": {
+        "owner": "default",
+        "value": "test"
+    }
+}
diff --git a/tests/dictionaries_old/60extra_externalspacecondition/tiramisu/base.py b/tests/dictionaries_old/60extra_externalspacecondition/tiramisu/base.py
new file mode 100644
index 00000000..f8496f7b
--- /dev/null
+++ b/tests/dictionaries_old/60extra_externalspacecondition/tiramisu/base.py
@@ -0,0 +1,27 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_5 = BoolOption(name="server_deployed", doc="server_deployed", default=False, properties=frozenset({"hidden", "mandatory", "normal"}))
+option_3 = StrOption(name="my_var", doc="my_var", default="no", properties=frozenset({"basic", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_5, todict=True, notraisepropertyerror=True), 'expected': ParamValue(True)}))}))
+option_4 = StrOption(name="my_var1", doc="my_var1", default="no", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="général", children=[option_3, option_4, option_5], properties=frozenset({"basic"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_8 = StrOption(name="description", doc="description", default="Exportation de la base de ejabberd", properties=frozenset({"mandatory", "normal"}))
+option_9 = ChoiceOption(name="day", doc="day", values=('none', 'daily', 'weekly', 'monthly'), default="none", properties=frozenset({"mandatory", "normal"}))
+option_10 = ChoiceOption(name="mode", doc="mode", values=('pre', 'post'), default="pre", properties=frozenset({"mandatory", "normal"}))
+option_7 = OptionDescription(name="ejabberd", doc="ejabberd", children=[option_8, option_9, option_10], properties=frozenset({"normal"}))
+option_6 = OptionDescription(name="extra", doc="extra", children=[option_7])
+option_13 = StrOption(name="description", doc="description", default="test", properties=frozenset({"mandatory", "normal"}))
+option_12 = OptionDescription(name="external", doc="external", children=[option_13], properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_8, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")}))}))
+option_11 = OptionDescription(name="extra1", doc="extra1", children=[option_12])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_6, option_11])
diff --git a/tests/dictionaries_old/60extra_group/00-base.xml b/tests/dictionaries_old/60extra_group/00-base.xml
new file mode 100644
index 00000000..22be2589
--- /dev/null
+++ b/tests/dictionaries_old/60extra_group/00-base.xml
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="test">
+      <file>/etc/mailname</file>
+      <file engine="jinja2">/etc/mailname2</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/60extra_group/__init__.py b/tests/dictionaries_old/60extra_group/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/60extra_group/extra_dirs/extra/00-base.xml b/tests/dictionaries_old/60extra_group/extra_dirs/extra/00-base.xml
new file mode 100644
index 00000000..91f69946
--- /dev/null
+++ b/tests/dictionaries_old/60extra_group/extra_dirs/extra/00-base.xml
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="ejabberd">
+      <variable name="description" type="string" multi="True">
+        <value>test</value>
+      </variable>
+      <variable name="mode" type="string">
+        <value>pre</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <group leader="extra.ejabberd.description">
+      <follower>mode</follower>
+    </group>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/60extra_group/makedict/after.json b/tests/dictionaries_old/60extra_group/makedict/after.json
new file mode 100644
index 00000000..0295b3e4
--- /dev/null
+++ b/tests/dictionaries_old/60extra_group/makedict/after.json
@@ -0,0 +1,48 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.activer_ejabberd": {
+        "owner": "default",
+        "value": "non"
+    },
+    "extra.ejabberd.description.description": {
+        "owner": "default",
+        "value": [
+            "test"
+        ]
+    },
+    "extra.ejabberd.description.mode": {
+        "owner": [
+            "default"
+        ],
+        "value": [
+            "pre"
+        ]
+    },
+    "services.test.files.mailname.name": {
+        "owner": "default",
+        "value": "/etc/mailname"
+    },
+    "services.test.files.mailname.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.files.mailname2.name": {
+        "owner": "default",
+        "value": "/etc/mailname2"
+    },
+    "services.test.files.mailname2.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/60extra_group/makedict/base.json b/tests/dictionaries_old/60extra_group/makedict/base.json
new file mode 100644
index 00000000..b67b1029
--- /dev/null
+++ b/tests/dictionaries_old/60extra_group/makedict/base.json
@@ -0,0 +1,16 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general.activer_ejabberd": "non",
+    "extra.ejabberd.description.description": [
+        {
+            "extra.ejabberd.description.description": "test",
+            "extra.ejabberd.description.mode": "pre"
+        }
+    ],
+    "services.test.files.mailname.name": "/etc/mailname",
+    "services.test.files.mailname.activate": true,
+    "services.test.files.mailname2.name": "/etc/mailname2",
+    "services.test.files.mailname2.activate": true,
+    "services.test.activate": true,
+    "services.test.manage": true
+}
diff --git a/tests/dictionaries_old/60extra_group/makedict/before.json b/tests/dictionaries_old/60extra_group/makedict/before.json
new file mode 100644
index 00000000..0295b3e4
--- /dev/null
+++ b/tests/dictionaries_old/60extra_group/makedict/before.json
@@ -0,0 +1,48 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.activer_ejabberd": {
+        "owner": "default",
+        "value": "non"
+    },
+    "extra.ejabberd.description.description": {
+        "owner": "default",
+        "value": [
+            "test"
+        ]
+    },
+    "extra.ejabberd.description.mode": {
+        "owner": [
+            "default"
+        ],
+        "value": [
+            "pre"
+        ]
+    },
+    "services.test.files.mailname.name": {
+        "owner": "default",
+        "value": "/etc/mailname"
+    },
+    "services.test.files.mailname.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.files.mailname2.name": {
+        "owner": "default",
+        "value": "/etc/mailname2"
+    },
+    "services.test.files.mailname2.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/60extra_group/result/etc/mailname b/tests/dictionaries_old/60extra_group/result/etc/mailname
new file mode 100644
index 00000000..dc34cc5b
--- /dev/null
+++ b/tests/dictionaries_old/60extra_group/result/etc/mailname
@@ -0,0 +1,11 @@
+contain test
+1
+leader: test
+follower: pre
+supeq
+sup
+diff
+testpre
+pretest
+leader2: test
+follower2: pre
diff --git a/tests/dictionaries_old/60extra_group/result/etc/mailname2 b/tests/dictionaries_old/60extra_group/result/etc/mailname2
new file mode 100644
index 00000000..dc34cc5b
--- /dev/null
+++ b/tests/dictionaries_old/60extra_group/result/etc/mailname2
@@ -0,0 +1,11 @@
+contain test
+1
+leader: test
+follower: pre
+supeq
+sup
+diff
+testpre
+pretest
+leader2: test
+follower2: pre
diff --git a/tests/dictionaries_old/60extra_group/result/tmpfiles.d/rougail.conf b/tests/dictionaries_old/60extra_group/result/tmpfiles.d/rougail.conf
new file mode 100644
index 00000000..7a8d00f4
--- /dev/null
+++ b/tests/dictionaries_old/60extra_group/result/tmpfiles.d/rougail.conf
@@ -0,0 +1,4 @@
+C /etc/mailname 0644 root root - /usr/local/lib/etc/mailname
+z /etc/mailname - - - - -
+C /etc/mailname2 0644 root root - /usr/local/lib/etc/mailname2
+z /etc/mailname2 - - - - -
diff --git a/tests/dictionaries_old/60extra_group/tiramisu/base.py b/tests/dictionaries_old/60extra_group/tiramisu/base.py
new file mode 100644
index 00000000..b306fe56
--- /dev/null
+++ b/tests/dictionaries_old/60extra_group/tiramisu/base.py
@@ -0,0 +1,37 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_4 = StrOption(name="activer_ejabberd", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="général", children=[option_3, option_4], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_8 = StrOption(name="description", doc="description", multi=True, default=['test'], properties=frozenset({"mandatory"}))
+option_9 = StrOption(name="mode", doc="mode", multi=True, default_multi="pre", properties=frozenset({"mandatory", "normal"}))
+option_7 = Leadership(name="description", doc="description", children=[option_8, option_9], properties=frozenset({"normal"}))
+option_6 = OptionDescription(name="ejabberd", doc="ejabberd", children=[option_7], properties=frozenset({"normal"}))
+option_5 = OptionDescription(name="extra", doc="extra", children=[option_6])
+option_14 = FilenameOption(name="name", doc="name", default="/etc/mailname")
+option_15 = BoolOption(name="activate", doc="activate", default=True)
+option_13 = OptionDescription(name="mailname", doc="mailname", children=[option_14, option_15])
+option_13.impl_set_information('source', "mailname")
+option_17 = FilenameOption(name="name", doc="name", default="/etc/mailname2")
+option_18 = BoolOption(name="activate", doc="activate", default=True)
+option_16 = OptionDescription(name="mailname2", doc="mailname2", children=[option_17, option_18])
+option_16.impl_set_information('engine', "jinja2")
+option_16.impl_set_information('source', "mailname2")
+option_12 = OptionDescription(name="files", doc="files", children=[option_13, option_16])
+option_19 = BoolOption(name="activate", doc="activate", default=True)
+option_20 = BoolOption(name="manage", doc="manage", default=True)
+option_11 = OptionDescription(name="test", doc="test", children=[option_12, option_19, option_20])
+option_10 = OptionDescription(name="services", doc="services", children=[option_11], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_5, option_10])
diff --git a/tests/dictionaries_old/60extra_group/tmpl/mailname b/tests/dictionaries_old/60extra_group/tmpl/mailname
new file mode 100644
index 00000000..de1500e6
--- /dev/null
+++ b/tests/dictionaries_old/60extra_group/tmpl/mailname
@@ -0,0 +1,35 @@
+%if 'test' in %%extra.ejabberd.description
+contain test
+%end if
+%%len(%%extra.ejabberd.description)
+%if 'a' in %%extra.ejabberd.description
+contain a
+%end if
+%for %%description in %%extra.ejabberd.description
+leader: %%description
+follower: %%description.mode
+%if %%description <= %%description.mode
+infeq
+%end if
+%if %%description >= %%description.mode
+supeq
+%end if
+%if %%description < %%description.mode
+inf
+%end if
+%if %%description > %%description.mode
+sup
+%end if
+%if %%description == %%description.mode
+eq
+%end if
+%if %%description != %%description.mode
+diff
+%end if
+%set %%var = %%description + %%description.mode
+%%var
+%set %%var = %%description.mode + %%description
+%%var
+%end for
+leader2: %%extra.ejabberd.description[0]
+follower2: %%extra.ejabberd.description[0].mode
diff --git a/tests/dictionaries_old/60extra_group/tmpl/mailname2 b/tests/dictionaries_old/60extra_group/tmpl/mailname2
new file mode 100644
index 00000000..589c548e
--- /dev/null
+++ b/tests/dictionaries_old/60extra_group/tmpl/mailname2
@@ -0,0 +1,33 @@
+{% if 'test' in extra.ejabberd.description -%}
+contain test
+{% endif -%}
+{{ extra.ejabberd.description|length }}
+{% if 'a' in extra.ejabberd.description -%}
+contain a
+{% endif -%}
+{% for description in extra.ejabberd.description -%}
+leader: {{ description }}
+follower: {{ description.mode }}
+{% if description <= description.mode -%}
+infeq
+{% endif -%}
+{% if description >= description.mode -%}
+supeq
+{% endif -%}
+{% if description < description.mode -%}
+inf
+{% endif -%}
+{% if description > description.mode -%}
+sup
+{% endif -%}
+{% if description == description.mode -%}
+eq
+{% endif -%}
+{% if description != description.mode -%}
+diff
+{% endif -%}
+{{ description + description.mode }}
+{{ description.mode + description }}
+{% endfor -%}
+leader2: {{ extra.ejabberd.description[0] }}
+follower2: {{ extra.ejabberd.description[0].mode }}
diff --git a/tests/dictionaries_old/60extra_group_name/00-base.xml b/tests/dictionaries_old/60extra_group_name/00-base.xml
new file mode 100644
index 00000000..22be2589
--- /dev/null
+++ b/tests/dictionaries_old/60extra_group_name/00-base.xml
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="test">
+      <file>/etc/mailname</file>
+      <file engine="jinja2">/etc/mailname2</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/60extra_group_name/__init__.py b/tests/dictionaries_old/60extra_group_name/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/60extra_group_name/extra_dirs/extra/00-base.xml b/tests/dictionaries_old/60extra_group_name/extra_dirs/extra/00-base.xml
new file mode 100644
index 00000000..8b03d076
--- /dev/null
+++ b/tests/dictionaries_old/60extra_group_name/extra_dirs/extra/00-base.xml
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="ejabberd">
+      <variable name="description" type="string" multi="True">
+        <value>test</value>
+      </variable>
+      <variable name="mode" type="string">
+        <value>pre</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <group leader="extra.ejabberd.description" name="new_name">
+      <follower>mode</follower>
+    </group>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/60extra_group_name/makedict/after.json b/tests/dictionaries_old/60extra_group_name/makedict/after.json
new file mode 100644
index 00000000..706146a9
--- /dev/null
+++ b/tests/dictionaries_old/60extra_group_name/makedict/after.json
@@ -0,0 +1,48 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.activer_ejabberd": {
+        "owner": "default",
+        "value": "non"
+    },
+    "extra.ejabberd.new_name.description": {
+        "owner": "default",
+        "value": [
+            "test"
+        ]
+    },
+    "extra.ejabberd.new_name.mode": {
+        "owner": [
+            "default"
+        ],
+        "value": [
+            "pre"
+        ]
+    },
+    "services.test.files.mailname.name": {
+        "owner": "default",
+        "value": "/etc/mailname"
+    },
+    "services.test.files.mailname.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.files.mailname2.name": {
+        "owner": "default",
+        "value": "/etc/mailname2"
+    },
+    "services.test.files.mailname2.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/60extra_group_name/makedict/base.json b/tests/dictionaries_old/60extra_group_name/makedict/base.json
new file mode 100644
index 00000000..5e9f4d0f
--- /dev/null
+++ b/tests/dictionaries_old/60extra_group_name/makedict/base.json
@@ -0,0 +1,16 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general.activer_ejabberd": "non",
+    "extra.ejabberd.new_name.description": [
+        {
+            "extra.ejabberd.new_name.description": "test",
+            "extra.ejabberd.new_name.mode": "pre"
+        }
+    ],
+    "services.test.files.mailname.name": "/etc/mailname",
+    "services.test.files.mailname.activate": true,
+    "services.test.files.mailname2.name": "/etc/mailname2",
+    "services.test.files.mailname2.activate": true,
+    "services.test.activate": true,
+    "services.test.manage": true
+}
diff --git a/tests/dictionaries_old/60extra_group_name/makedict/before.json b/tests/dictionaries_old/60extra_group_name/makedict/before.json
new file mode 100644
index 00000000..706146a9
--- /dev/null
+++ b/tests/dictionaries_old/60extra_group_name/makedict/before.json
@@ -0,0 +1,48 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.activer_ejabberd": {
+        "owner": "default",
+        "value": "non"
+    },
+    "extra.ejabberd.new_name.description": {
+        "owner": "default",
+        "value": [
+            "test"
+        ]
+    },
+    "extra.ejabberd.new_name.mode": {
+        "owner": [
+            "default"
+        ],
+        "value": [
+            "pre"
+        ]
+    },
+    "services.test.files.mailname.name": {
+        "owner": "default",
+        "value": "/etc/mailname"
+    },
+    "services.test.files.mailname.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.files.mailname2.name": {
+        "owner": "default",
+        "value": "/etc/mailname2"
+    },
+    "services.test.files.mailname2.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/60extra_group_name/result/etc/mailname b/tests/dictionaries_old/60extra_group_name/result/etc/mailname
new file mode 100644
index 00000000..dc34cc5b
--- /dev/null
+++ b/tests/dictionaries_old/60extra_group_name/result/etc/mailname
@@ -0,0 +1,11 @@
+contain test
+1
+leader: test
+follower: pre
+supeq
+sup
+diff
+testpre
+pretest
+leader2: test
+follower2: pre
diff --git a/tests/dictionaries_old/60extra_group_name/result/etc/mailname2 b/tests/dictionaries_old/60extra_group_name/result/etc/mailname2
new file mode 100644
index 00000000..dc34cc5b
--- /dev/null
+++ b/tests/dictionaries_old/60extra_group_name/result/etc/mailname2
@@ -0,0 +1,11 @@
+contain test
+1
+leader: test
+follower: pre
+supeq
+sup
+diff
+testpre
+pretest
+leader2: test
+follower2: pre
diff --git a/tests/dictionaries_old/60extra_group_name/result/tmpfiles.d/rougail.conf b/tests/dictionaries_old/60extra_group_name/result/tmpfiles.d/rougail.conf
new file mode 100644
index 00000000..7a8d00f4
--- /dev/null
+++ b/tests/dictionaries_old/60extra_group_name/result/tmpfiles.d/rougail.conf
@@ -0,0 +1,4 @@
+C /etc/mailname 0644 root root - /usr/local/lib/etc/mailname
+z /etc/mailname - - - - -
+C /etc/mailname2 0644 root root - /usr/local/lib/etc/mailname2
+z /etc/mailname2 - - - - -
diff --git a/tests/dictionaries_old/60extra_group_name/tiramisu/base.py b/tests/dictionaries_old/60extra_group_name/tiramisu/base.py
new file mode 100644
index 00000000..13ce8ee0
--- /dev/null
+++ b/tests/dictionaries_old/60extra_group_name/tiramisu/base.py
@@ -0,0 +1,37 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_4 = StrOption(name="activer_ejabberd", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="général", children=[option_3, option_4], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_8 = StrOption(name="description", doc="description", multi=True, default=['test'], properties=frozenset({"mandatory"}))
+option_9 = StrOption(name="mode", doc="mode", multi=True, default_multi="pre", properties=frozenset({"mandatory", "normal"}))
+option_7 = Leadership(name="new_name", doc="new_name", children=[option_8, option_9], properties=frozenset({"normal"}))
+option_6 = OptionDescription(name="ejabberd", doc="ejabberd", children=[option_7], properties=frozenset({"normal"}))
+option_5 = OptionDescription(name="extra", doc="extra", children=[option_6])
+option_14 = FilenameOption(name="name", doc="name", default="/etc/mailname")
+option_15 = BoolOption(name="activate", doc="activate", default=True)
+option_13 = OptionDescription(name="mailname", doc="mailname", children=[option_14, option_15])
+option_13.impl_set_information('source', "mailname")
+option_17 = FilenameOption(name="name", doc="name", default="/etc/mailname2")
+option_18 = BoolOption(name="activate", doc="activate", default=True)
+option_16 = OptionDescription(name="mailname2", doc="mailname2", children=[option_17, option_18])
+option_16.impl_set_information('engine', "jinja2")
+option_16.impl_set_information('source', "mailname2")
+option_12 = OptionDescription(name="files", doc="files", children=[option_13, option_16])
+option_19 = BoolOption(name="activate", doc="activate", default=True)
+option_20 = BoolOption(name="manage", doc="manage", default=True)
+option_11 = OptionDescription(name="test", doc="test", children=[option_12, option_19, option_20])
+option_10 = OptionDescription(name="services", doc="services", children=[option_11], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_5, option_10])
diff --git a/tests/dictionaries_old/60extra_group_name/tmpl/mailname b/tests/dictionaries_old/60extra_group_name/tmpl/mailname
new file mode 100644
index 00000000..23cbe10e
--- /dev/null
+++ b/tests/dictionaries_old/60extra_group_name/tmpl/mailname
@@ -0,0 +1,35 @@
+%if 'test' in %%extra.ejabberd.new_name
+contain test
+%end if
+%%len(%%extra.ejabberd.new_name)
+%if 'a' in %%extra.ejabberd.new_name
+contain a
+%end if
+%for %%description in %%extra.ejabberd.new_name
+leader: %%description
+follower: %%description.mode
+%if %%description <= %%description.mode
+infeq
+%end if
+%if %%description >= %%description.mode
+supeq
+%end if
+%if %%description < %%description.mode
+inf
+%end if
+%if %%description > %%description.mode
+sup
+%end if
+%if %%description == %%description.mode
+eq
+%end if
+%if %%description != %%description.mode
+diff
+%end if
+%set %%var = %%description + %%description.mode
+%%var
+%set %%var = %%description.mode + %%description
+%%var
+%end for
+leader2: %%extra.ejabberd.new_name[0].description
+follower2: %%extra.ejabberd.new_name[0].mode
diff --git a/tests/dictionaries_old/60extra_group_name/tmpl/mailname2 b/tests/dictionaries_old/60extra_group_name/tmpl/mailname2
new file mode 100644
index 00000000..4860700d
--- /dev/null
+++ b/tests/dictionaries_old/60extra_group_name/tmpl/mailname2
@@ -0,0 +1,33 @@
+{% if 'test' in extra.ejabberd.new_name -%}
+contain test
+{% endif -%}
+{{ extra.ejabberd.new_name |length }}
+{% if 'a' in extra.ejabberd.new_name -%}
+contain a
+{% endif -%}
+{% for description in extra.ejabberd.new_name -%}
+leader: {{ description }}
+follower: {{ description.mode }}
+{% if description <= description.mode -%}
+infeq
+{% endif -%}
+{% if description >= description.mode -%}
+supeq
+{% endif -%}
+{% if description < description.mode -%}
+inf
+{% endif -%}
+{% if description > description.mode -%}
+sup
+{% endif -%}
+{% if description == description.mode -%}
+eq
+{% endif -%}
+{% if description != description.mode -%}
+diff
+{% endif -%}
+{{ description + description.mode }}
+{{ description.mode + description }}
+{% endfor -%}
+leader2: {{ extra.ejabberd.new_name[0].description }}
+follower2: {{ extra.ejabberd.new_name[0].mode }}
diff --git a/tests/dictionaries_old/60extra_help/00-base.xml b/tests/dictionaries_old/60extra_help/00-base.xml
new file mode 100644
index 00000000..5299dde1
--- /dev/null
+++ b/tests/dictionaries_old/60extra_help/00-base.xml
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="test">
+      <file>/etc/mailname</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/60extra_help/__init__.py b/tests/dictionaries_old/60extra_help/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/60extra_help/extra_dirs/extra/00-base.xml b/tests/dictionaries_old/60extra_help/extra_dirs/extra/00-base.xml
new file mode 100644
index 00000000..dff47ea3
--- /dev/null
+++ b/tests/dictionaries_old/60extra_help/extra_dirs/extra/00-base.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="ejabberd">
+      <variable name="description" type="string">
+        <value>Exportation de la base de ejabberd</value>
+      </variable>
+      <variable name="day" type="schedule" help="Test help"/>
+      <variable name="mode" type="schedulemod">
+        <value>pre</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_multi_condition">
+      <param>non</param>
+      <param type="variable" name="condition_1" propertyerror="False">activer_ejabberd</param>
+      <param name="match">none</param>
+      <param name="mismatch">daily</param>
+      <target>extra.ejabberd.day</target>
+    </fill>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/60extra_help/makedict/after.json b/tests/dictionaries_old/60extra_help/makedict/after.json
new file mode 100644
index 00000000..6cf540ce
--- /dev/null
+++ b/tests/dictionaries_old/60extra_help/makedict/after.json
@@ -0,0 +1,38 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.activer_ejabberd": {
+        "owner": "default",
+        "value": "non"
+    },
+    "extra.ejabberd.description": {
+        "owner": "default",
+        "value": "Exportation de la base de ejabberd"
+    },
+    "extra.ejabberd.day": {
+        "owner": "default",
+        "value": null
+    },
+    "extra.ejabberd.mode": {
+        "owner": "default",
+        "value": "pre"
+    },
+    "services.test.files.mailname.name": {
+        "owner": "default",
+        "value": "/etc/mailname"
+    },
+    "services.test.files.mailname.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/60extra_help/makedict/base.json b/tests/dictionaries_old/60extra_help/makedict/base.json
new file mode 100644
index 00000000..37a6c4d4
--- /dev/null
+++ b/tests/dictionaries_old/60extra_help/makedict/base.json
@@ -0,0 +1,11 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general.activer_ejabberd": "non",
+    "extra.ejabberd.description": "Exportation de la base de ejabberd",
+    "extra.ejabberd.day": null,
+    "extra.ejabberd.mode": "pre",
+    "services.test.files.mailname.name": "/etc/mailname",
+    "services.test.files.mailname.activate": true,
+    "services.test.activate": true,
+    "services.test.manage": true
+}
diff --git a/tests/dictionaries_old/60extra_help/makedict/before.json b/tests/dictionaries_old/60extra_help/makedict/before.json
new file mode 100644
index 00000000..6cf540ce
--- /dev/null
+++ b/tests/dictionaries_old/60extra_help/makedict/before.json
@@ -0,0 +1,38 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.activer_ejabberd": {
+        "owner": "default",
+        "value": "non"
+    },
+    "extra.ejabberd.description": {
+        "owner": "default",
+        "value": "Exportation de la base de ejabberd"
+    },
+    "extra.ejabberd.day": {
+        "owner": "default",
+        "value": null
+    },
+    "extra.ejabberd.mode": {
+        "owner": "default",
+        "value": "pre"
+    },
+    "services.test.files.mailname.name": {
+        "owner": "default",
+        "value": "/etc/mailname"
+    },
+    "services.test.files.mailname.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/60extra_help/tiramisu/base.py b/tests/dictionaries_old/60extra_help/tiramisu/base.py
new file mode 100644
index 00000000..7b861b23
--- /dev/null
+++ b/tests/dictionaries_old/60extra_help/tiramisu/base.py
@@ -0,0 +1,33 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_4 = StrOption(name="activer_ejabberd", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="général", children=[option_3, option_4], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_7 = StrOption(name="description", doc="description", default="Exportation de la base de ejabberd", properties=frozenset({"mandatory", "normal"}))
+option_8 = ChoiceOption(name="day", doc="day", values=('none', 'daily', 'weekly', 'monthly'), default=Calculation(func.calc_multi_condition, Params((ParamValue("non")), kwargs={'condition_1': ParamOption(option_4, notraisepropertyerror=True), 'match': ParamValue("none"), 'mismatch': ParamValue("daily")})), properties=frozenset({"mandatory", "normal"}))
+option_8.impl_set_information('help', "Test help")
+option_9 = ChoiceOption(name="mode", doc="mode", values=('pre', 'post'), default="pre", properties=frozenset({"mandatory", "normal"}))
+option_6 = OptionDescription(name="ejabberd", doc="ejabberd", children=[option_7, option_8, option_9], properties=frozenset({"normal"}))
+option_5 = OptionDescription(name="extra", doc="extra", children=[option_6])
+option_14 = FilenameOption(name="name", doc="name", default="/etc/mailname")
+option_15 = BoolOption(name="activate", doc="activate", default=True)
+option_13 = OptionDescription(name="mailname", doc="mailname", children=[option_14, option_15])
+option_13.impl_set_information('source', "mailname")
+option_12 = OptionDescription(name="files", doc="files", children=[option_13])
+option_16 = BoolOption(name="activate", doc="activate", default=True)
+option_17 = BoolOption(name="manage", doc="manage", default=True)
+option_11 = OptionDescription(name="test", doc="test", children=[option_12, option_16, option_17])
+option_10 = OptionDescription(name="services", doc="services", children=[option_11], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_5, option_10])
diff --git a/tests/dictionaries_old/60extra_load/00-base.xml b/tests/dictionaries_old/60extra_load/00-base.xml
new file mode 100644
index 00000000..8c0f3365
--- /dev/null
+++ b/tests/dictionaries_old/60extra_load/00-base.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/60extra_load/__init__.py b/tests/dictionaries_old/60extra_load/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/60extra_load/extra_dirs/extra/00-base.xml b/tests/dictionaries_old/60extra_load/extra_dirs/extra/00-base.xml
new file mode 100644
index 00000000..a11e423b
--- /dev/null
+++ b/tests/dictionaries_old/60extra_load/extra_dirs/extra/00-base.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="ejabberd">
+      <variable name="description" type="string">
+        <value>Exportation de la base de ejabberd</value>
+      </variable>
+      <variable name="day" type="schedule"/>
+      <variable name="mode" type="schedulemod">
+        <value>pre</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_multi_condition">
+      <param>non</param>
+      <param type="variable" name="condition_1" propertyerror="False">activer_ejabberd</param>
+      <param name="match">none</param>
+      <param name="mismatch">daily</param>
+      <target>extra.ejabberd.day</target>
+    </fill>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/60extra_load/makedict/after.json b/tests/dictionaries_old/60extra_load/makedict/after.json
new file mode 100644
index 00000000..383ce093
--- /dev/null
+++ b/tests/dictionaries_old/60extra_load/makedict/after.json
@@ -0,0 +1,22 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.activer_ejabberd": {
+        "owner": "default",
+        "value": "non"
+    },
+    "extra.ejabberd.description": {
+        "owner": "default",
+        "value": "Exportation de la base de ejabberd"
+    },
+    "extra.ejabberd.day": {
+        "owner": "default",
+        "value": null
+    },
+    "extra.ejabberd.mode": {
+        "owner": "default",
+        "value": "pre"
+    }
+}
diff --git a/tests/dictionaries_old/60extra_load/makedict/base.json b/tests/dictionaries_old/60extra_load/makedict/base.json
new file mode 100644
index 00000000..242a818d
--- /dev/null
+++ b/tests/dictionaries_old/60extra_load/makedict/base.json
@@ -0,0 +1,7 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general.activer_ejabberd": "non",
+    "extra.ejabberd.description": "Exportation de la base de ejabberd",
+    "extra.ejabberd.day": null,
+    "extra.ejabberd.mode": "pre"
+}
diff --git a/tests/dictionaries_old/60extra_load/makedict/before.json b/tests/dictionaries_old/60extra_load/makedict/before.json
new file mode 100644
index 00000000..383ce093
--- /dev/null
+++ b/tests/dictionaries_old/60extra_load/makedict/before.json
@@ -0,0 +1,22 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.activer_ejabberd": {
+        "owner": "default",
+        "value": "non"
+    },
+    "extra.ejabberd.description": {
+        "owner": "default",
+        "value": "Exportation de la base de ejabberd"
+    },
+    "extra.ejabberd.day": {
+        "owner": "default",
+        "value": null
+    },
+    "extra.ejabberd.mode": {
+        "owner": "default",
+        "value": "pre"
+    }
+}
diff --git a/tests/dictionaries_old/60extra_load/tiramisu/base.py b/tests/dictionaries_old/60extra_load/tiramisu/base.py
new file mode 100644
index 00000000..d47bb6a3
--- /dev/null
+++ b/tests/dictionaries_old/60extra_load/tiramisu/base.py
@@ -0,0 +1,23 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_4 = StrOption(name="activer_ejabberd", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="général", children=[option_3, option_4], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_7 = StrOption(name="description", doc="description", default="Exportation de la base de ejabberd", properties=frozenset({"mandatory", "normal"}))
+option_8 = ChoiceOption(name="day", doc="day", values=('none', 'daily', 'weekly', 'monthly'), default=Calculation(func.calc_multi_condition, Params((ParamValue("non")), kwargs={'condition_1': ParamOption(option_4, notraisepropertyerror=True), 'match': ParamValue("none"), 'mismatch': ParamValue("daily")})), properties=frozenset({"mandatory", "normal"}))
+option_9 = ChoiceOption(name="mode", doc="mode", values=('pre', 'post'), default="pre", properties=frozenset({"mandatory", "normal"}))
+option_6 = OptionDescription(name="ejabberd", doc="ejabberd", children=[option_7, option_8, option_9], properties=frozenset({"normal"}))
+option_5 = OptionDescription(name="extra", doc="extra", children=[option_6])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_5])
diff --git a/tests/dictionaries_old/60extra_mandatory/00-base.xml b/tests/dictionaries_old/60extra_mandatory/00-base.xml
new file mode 100644
index 00000000..8c0f3365
--- /dev/null
+++ b/tests/dictionaries_old/60extra_mandatory/00-base.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/60extra_mandatory/__init__.py b/tests/dictionaries_old/60extra_mandatory/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/60extra_mandatory/extra_dirs/extra/00-base.xml b/tests/dictionaries_old/60extra_mandatory/extra_dirs/extra/00-base.xml
new file mode 100644
index 00000000..fd6e7405
--- /dev/null
+++ b/tests/dictionaries_old/60extra_mandatory/extra_dirs/extra/00-base.xml
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="ejabberd">
+      <variable name="description" type="string">
+        <value>Exportation de la base de ejabberd</value>
+      </variable>
+      <variable name="day" type="schedule" mandatory="True"/>
+      <variable name="mode" type="schedulemod" mandatory="True"/>
+      <variable name="var1" type="string" mandatory="True"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_multi_condition">
+      <param>non</param>
+      <param type="variable" name="condition_1" propertyerror="False">activer_ejabberd</param>
+      <param name="match">none</param>
+      <param name="mismatch">daily</param>
+      <target>extra.ejabberd.day</target>
+    </fill>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/60extra_mandatory/makedict/after.json b/tests/dictionaries_old/60extra_mandatory/makedict/after.json
new file mode 100644
index 00000000..bd4b713a
--- /dev/null
+++ b/tests/dictionaries_old/60extra_mandatory/makedict/after.json
@@ -0,0 +1,26 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.activer_ejabberd": {
+        "owner": "default",
+        "value": "non"
+    },
+    "extra.ejabberd.description": {
+        "owner": "default",
+        "value": "Exportation de la base de ejabberd"
+    },
+    "extra.ejabberd.day": {
+        "owner": "default",
+        "value": null
+    },
+    "extra.ejabberd.mode": {
+        "owner": "default",
+        "value": "pre"
+    },
+    "extra.ejabberd.var1": {
+        "owner": "default",
+        "value": null
+    }
+}
diff --git a/tests/dictionaries_old/60extra_mandatory/makedict/base.json b/tests/dictionaries_old/60extra_mandatory/makedict/base.json
new file mode 100644
index 00000000..1934991a
--- /dev/null
+++ b/tests/dictionaries_old/60extra_mandatory/makedict/base.json
@@ -0,0 +1,8 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general.activer_ejabberd": "non",
+    "extra.ejabberd.description": "Exportation de la base de ejabberd",
+    "extra.ejabberd.day": null,
+    "extra.ejabberd.mode": "pre",
+    "extra.ejabberd.var1": null
+}
diff --git a/tests/dictionaries_old/60extra_mandatory/makedict/before.json b/tests/dictionaries_old/60extra_mandatory/makedict/before.json
new file mode 100644
index 00000000..bd4b713a
--- /dev/null
+++ b/tests/dictionaries_old/60extra_mandatory/makedict/before.json
@@ -0,0 +1,26 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.activer_ejabberd": {
+        "owner": "default",
+        "value": "non"
+    },
+    "extra.ejabberd.description": {
+        "owner": "default",
+        "value": "Exportation de la base de ejabberd"
+    },
+    "extra.ejabberd.day": {
+        "owner": "default",
+        "value": null
+    },
+    "extra.ejabberd.mode": {
+        "owner": "default",
+        "value": "pre"
+    },
+    "extra.ejabberd.var1": {
+        "owner": "default",
+        "value": null
+    }
+}
diff --git a/tests/dictionaries_old/60extra_mandatory/tiramisu/base.py b/tests/dictionaries_old/60extra_mandatory/tiramisu/base.py
new file mode 100644
index 00000000..d9d56446
--- /dev/null
+++ b/tests/dictionaries_old/60extra_mandatory/tiramisu/base.py
@@ -0,0 +1,24 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_4 = StrOption(name="activer_ejabberd", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="général", children=[option_3, option_4], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_7 = StrOption(name="description", doc="description", default="Exportation de la base de ejabberd", properties=frozenset({"mandatory", "normal"}))
+option_8 = ChoiceOption(name="day", doc="day", values=('none', 'daily', 'weekly', 'monthly'), default=Calculation(func.calc_multi_condition, Params((ParamValue("non")), kwargs={'condition_1': ParamOption(option_4, notraisepropertyerror=True), 'match': ParamValue("none"), 'mismatch': ParamValue("daily")})), properties=frozenset({"mandatory", "normal"}))
+option_9 = ChoiceOption(name="mode", doc="mode", values=('pre', 'post'), default="pre", properties=frozenset({"mandatory", "normal"}))
+option_10 = StrOption(name="var1", doc="var1", properties=frozenset({"basic", "mandatory"}))
+option_6 = OptionDescription(name="ejabberd", doc="ejabberd", children=[option_7, option_8, option_9, option_10], properties=frozenset({"basic"}))
+option_5 = OptionDescription(name="extra", doc="extra", children=[option_6])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_5])
diff --git a/tests/dictionaries_old/60extra_name_family/00-base.xml b/tests/dictionaries_old/60extra_name_family/00-base.xml
new file mode 100644
index 00000000..2279aa8d
--- /dev/null
+++ b/tests/dictionaries_old/60extra_name_family/00-base.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="extra">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/60extra_name_family/__init__.py b/tests/dictionaries_old/60extra_name_family/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/60extra_name_family/extra_dirs/extra/00-base.xml b/tests/dictionaries_old/60extra_name_family/extra_dirs/extra/00-base.xml
new file mode 100644
index 00000000..a11e423b
--- /dev/null
+++ b/tests/dictionaries_old/60extra_name_family/extra_dirs/extra/00-base.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="ejabberd">
+      <variable name="description" type="string">
+        <value>Exportation de la base de ejabberd</value>
+      </variable>
+      <variable name="day" type="schedule"/>
+      <variable name="mode" type="schedulemod">
+        <value>pre</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_multi_condition">
+      <param>non</param>
+      <param type="variable" name="condition_1" propertyerror="False">activer_ejabberd</param>
+      <param name="match">none</param>
+      <param name="mismatch">daily</param>
+      <target>extra.ejabberd.day</target>
+    </fill>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/60extra_name_family/makedict/after.json b/tests/dictionaries_old/60extra_name_family/makedict/after.json
new file mode 100644
index 00000000..19d92883
--- /dev/null
+++ b/tests/dictionaries_old/60extra_name_family/makedict/after.json
@@ -0,0 +1,22 @@
+{
+    "rougail.extra.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.extra.activer_ejabberd": {
+        "owner": "default",
+        "value": "non"
+    },
+    "extra.ejabberd.description": {
+        "owner": "default",
+        "value": "Exportation de la base de ejabberd"
+    },
+    "extra.ejabberd.day": {
+        "owner": "default",
+        "value": null
+    },
+    "extra.ejabberd.mode": {
+        "owner": "default",
+        "value": "pre"
+    }
+}
diff --git a/tests/dictionaries_old/60extra_name_family/makedict/base.json b/tests/dictionaries_old/60extra_name_family/makedict/base.json
new file mode 100644
index 00000000..08a3bf0f
--- /dev/null
+++ b/tests/dictionaries_old/60extra_name_family/makedict/base.json
@@ -0,0 +1,7 @@
+{
+    "rougail.extra.mode_conteneur_actif": "non",
+    "rougail.extra.activer_ejabberd": "non",
+    "extra.ejabberd.description": "Exportation de la base de ejabberd",
+    "extra.ejabberd.day": null,
+    "extra.ejabberd.mode": "pre"
+}
diff --git a/tests/dictionaries_old/60extra_name_family/makedict/before.json b/tests/dictionaries_old/60extra_name_family/makedict/before.json
new file mode 100644
index 00000000..19d92883
--- /dev/null
+++ b/tests/dictionaries_old/60extra_name_family/makedict/before.json
@@ -0,0 +1,22 @@
+{
+    "rougail.extra.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.extra.activer_ejabberd": {
+        "owner": "default",
+        "value": "non"
+    },
+    "extra.ejabberd.description": {
+        "owner": "default",
+        "value": "Exportation de la base de ejabberd"
+    },
+    "extra.ejabberd.day": {
+        "owner": "default",
+        "value": null
+    },
+    "extra.ejabberd.mode": {
+        "owner": "default",
+        "value": "pre"
+    }
+}
diff --git a/tests/dictionaries_old/60extra_name_family/tiramisu/base.py b/tests/dictionaries_old/60extra_name_family/tiramisu/base.py
new file mode 100644
index 00000000..706f671e
--- /dev/null
+++ b/tests/dictionaries_old/60extra_name_family/tiramisu/base.py
@@ -0,0 +1,23 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_4 = StrOption(name="activer_ejabberd", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_2 = OptionDescription(name="extra", doc="extra", children=[option_3, option_4], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_7 = StrOption(name="description", doc="description", default="Exportation de la base de ejabberd", properties=frozenset({"mandatory", "normal"}))
+option_8 = ChoiceOption(name="day", doc="day", values=('none', 'daily', 'weekly', 'monthly'), default=Calculation(func.calc_multi_condition, Params((ParamValue("non")), kwargs={'condition_1': ParamOption(option_4, notraisepropertyerror=True), 'match': ParamValue("none"), 'mismatch': ParamValue("daily")})), properties=frozenset({"mandatory", "normal"}))
+option_9 = ChoiceOption(name="mode", doc="mode", values=('pre', 'post'), default="pre", properties=frozenset({"mandatory", "normal"}))
+option_6 = OptionDescription(name="ejabberd", doc="ejabberd", children=[option_7, option_8, option_9], properties=frozenset({"normal"}))
+option_5 = OptionDescription(name="extra", doc="extra", children=[option_6])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_5])
diff --git a/tests/dictionaries_old/60extra_no_condition/00-base.xml b/tests/dictionaries_old/60extra_no_condition/00-base.xml
new file mode 100644
index 00000000..791dcd42
--- /dev/null
+++ b/tests/dictionaries_old/60extra_no_condition/00-base.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="module_instancie" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/60extra_no_condition/__init__.py b/tests/dictionaries_old/60extra_no_condition/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/60extra_no_condition/extra_dirs/extra/00-base.xml b/tests/dictionaries_old/60extra_no_condition/extra_dirs/extra/00-base.xml
new file mode 100644
index 00000000..52089bf3
--- /dev/null
+++ b/tests/dictionaries_old/60extra_no_condition/extra_dirs/extra/00-base.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="ejabberd">
+      <variable name="description" type="string">
+        <value>Exportation de la base de ejabberd</value>
+      </variable>
+      <variable name="day" type="schedule"/>
+      <variable name="mode" type="schedulemod">
+        <value>pre</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/60extra_no_condition/makedict/after.json b/tests/dictionaries_old/60extra_no_condition/makedict/after.json
new file mode 100644
index 00000000..0b78d652
--- /dev/null
+++ b/tests/dictionaries_old/60extra_no_condition/makedict/after.json
@@ -0,0 +1,26 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.activer_ejabberd": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.module_instancie": {
+        "owner": "default",
+        "value": "non"
+    },
+    "extra.ejabberd.description": {
+        "owner": "default",
+        "value": "Exportation de la base de ejabberd"
+    },
+    "extra.ejabberd.day": {
+        "owner": "default",
+        "value": "none"
+    },
+    "extra.ejabberd.mode": {
+        "owner": "default",
+        "value": "pre"
+    }
+}
diff --git a/tests/dictionaries_old/60extra_no_condition/makedict/base.json b/tests/dictionaries_old/60extra_no_condition/makedict/base.json
new file mode 100644
index 00000000..5efa7f94
--- /dev/null
+++ b/tests/dictionaries_old/60extra_no_condition/makedict/base.json
@@ -0,0 +1,8 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general.activer_ejabberd": "non",
+    "rougail.general.module_instancie": "non",
+    "extra.ejabberd.description": "Exportation de la base de ejabberd",
+    "extra.ejabberd.day": "none",
+    "extra.ejabberd.mode": "pre"
+}
diff --git a/tests/dictionaries_old/60extra_no_condition/makedict/before.json b/tests/dictionaries_old/60extra_no_condition/makedict/before.json
new file mode 100644
index 00000000..0b78d652
--- /dev/null
+++ b/tests/dictionaries_old/60extra_no_condition/makedict/before.json
@@ -0,0 +1,26 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.activer_ejabberd": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.module_instancie": {
+        "owner": "default",
+        "value": "non"
+    },
+    "extra.ejabberd.description": {
+        "owner": "default",
+        "value": "Exportation de la base de ejabberd"
+    },
+    "extra.ejabberd.day": {
+        "owner": "default",
+        "value": "none"
+    },
+    "extra.ejabberd.mode": {
+        "owner": "default",
+        "value": "pre"
+    }
+}
diff --git a/tests/dictionaries_old/60extra_no_condition/tiramisu/base.py b/tests/dictionaries_old/60extra_no_condition/tiramisu/base.py
new file mode 100644
index 00000000..581f42b8
--- /dev/null
+++ b/tests/dictionaries_old/60extra_no_condition/tiramisu/base.py
@@ -0,0 +1,24 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_4 = StrOption(name="activer_ejabberd", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_5 = StrOption(name="module_instancie", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="général", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_8 = StrOption(name="description", doc="description", default="Exportation de la base de ejabberd", properties=frozenset({"mandatory", "normal"}))
+option_9 = ChoiceOption(name="day", doc="day", values=('none', 'daily', 'weekly', 'monthly'), default="none", properties=frozenset({"mandatory", "normal"}))
+option_10 = ChoiceOption(name="mode", doc="mode", values=('pre', 'post'), default="pre", properties=frozenset({"mandatory", "normal"}))
+option_7 = OptionDescription(name="ejabberd", doc="ejabberd", children=[option_8, option_9, option_10], properties=frozenset({"normal"}))
+option_6 = OptionDescription(name="extra", doc="extra", children=[option_7])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_6])
diff --git a/tests/dictionaries_old/60extra_redefine/00-base.xml b/tests/dictionaries_old/60extra_redefine/00-base.xml
new file mode 100644
index 00000000..8c0f3365
--- /dev/null
+++ b/tests/dictionaries_old/60extra_redefine/00-base.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/60extra_redefine/__init__.py b/tests/dictionaries_old/60extra_redefine/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/60extra_redefine/extra_dirs/extra/00-base.xml b/tests/dictionaries_old/60extra_redefine/extra_dirs/extra/00-base.xml
new file mode 100644
index 00000000..a11e423b
--- /dev/null
+++ b/tests/dictionaries_old/60extra_redefine/extra_dirs/extra/00-base.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="ejabberd">
+      <variable name="description" type="string">
+        <value>Exportation de la base de ejabberd</value>
+      </variable>
+      <variable name="day" type="schedule"/>
+      <variable name="mode" type="schedulemod">
+        <value>pre</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_multi_condition">
+      <param>non</param>
+      <param type="variable" name="condition_1" propertyerror="False">activer_ejabberd</param>
+      <param name="match">none</param>
+      <param name="mismatch">daily</param>
+      <target>extra.ejabberd.day</target>
+    </fill>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/60extra_redefine/extra_dirs/extra/01-redefine.xml b/tests/dictionaries_old/60extra_redefine/extra_dirs/extra/01-redefine.xml
new file mode 100644
index 00000000..9103416e
--- /dev/null
+++ b/tests/dictionaries_old/60extra_redefine/extra_dirs/extra/01-redefine.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="ejabberd">
+      <variable name="description" redefine="True" hidden="True"/>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/60extra_redefine/makedict/after.json b/tests/dictionaries_old/60extra_redefine/makedict/after.json
new file mode 100644
index 00000000..383ce093
--- /dev/null
+++ b/tests/dictionaries_old/60extra_redefine/makedict/after.json
@@ -0,0 +1,22 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.activer_ejabberd": {
+        "owner": "default",
+        "value": "non"
+    },
+    "extra.ejabberd.description": {
+        "owner": "default",
+        "value": "Exportation de la base de ejabberd"
+    },
+    "extra.ejabberd.day": {
+        "owner": "default",
+        "value": null
+    },
+    "extra.ejabberd.mode": {
+        "owner": "default",
+        "value": "pre"
+    }
+}
diff --git a/tests/dictionaries_old/60extra_redefine/makedict/base.json b/tests/dictionaries_old/60extra_redefine/makedict/base.json
new file mode 100644
index 00000000..242a818d
--- /dev/null
+++ b/tests/dictionaries_old/60extra_redefine/makedict/base.json
@@ -0,0 +1,7 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general.activer_ejabberd": "non",
+    "extra.ejabberd.description": "Exportation de la base de ejabberd",
+    "extra.ejabberd.day": null,
+    "extra.ejabberd.mode": "pre"
+}
diff --git a/tests/dictionaries_old/60extra_redefine/makedict/before.json b/tests/dictionaries_old/60extra_redefine/makedict/before.json
new file mode 100644
index 00000000..383ce093
--- /dev/null
+++ b/tests/dictionaries_old/60extra_redefine/makedict/before.json
@@ -0,0 +1,22 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.activer_ejabberd": {
+        "owner": "default",
+        "value": "non"
+    },
+    "extra.ejabberd.description": {
+        "owner": "default",
+        "value": "Exportation de la base de ejabberd"
+    },
+    "extra.ejabberd.day": {
+        "owner": "default",
+        "value": null
+    },
+    "extra.ejabberd.mode": {
+        "owner": "default",
+        "value": "pre"
+    }
+}
diff --git a/tests/dictionaries_old/60extra_redefine/tiramisu/base.py b/tests/dictionaries_old/60extra_redefine/tiramisu/base.py
new file mode 100644
index 00000000..6ddcd90e
--- /dev/null
+++ b/tests/dictionaries_old/60extra_redefine/tiramisu/base.py
@@ -0,0 +1,23 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_4 = StrOption(name="activer_ejabberd", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="général", children=[option_3, option_4], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_7 = StrOption(name="description", doc="description", default="Exportation de la base de ejabberd", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_8 = ChoiceOption(name="day", doc="day", values=('none', 'daily', 'weekly', 'monthly'), default=Calculation(func.calc_multi_condition, Params((ParamValue("non")), kwargs={'condition_1': ParamOption(option_4, notraisepropertyerror=True), 'match': ParamValue("none"), 'mismatch': ParamValue("daily")})), properties=frozenset({"mandatory", "normal"}))
+option_9 = ChoiceOption(name="mode", doc="mode", values=('pre', 'post'), default="pre", properties=frozenset({"mandatory", "normal"}))
+option_6 = OptionDescription(name="ejabberd", doc="ejabberd", children=[option_7, option_8, option_9], properties=frozenset({"normal"}))
+option_5 = OptionDescription(name="extra", doc="extra", children=[option_6])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_5])
diff --git a/tests/dictionaries_old/60extra_variable_name_extra/00-base.xml b/tests/dictionaries_old/60extra_variable_name_extra/00-base.xml
new file mode 100644
index 00000000..8c0f3365
--- /dev/null
+++ b/tests/dictionaries_old/60extra_variable_name_extra/00-base.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/60extra_variable_name_extra/__init__.py b/tests/dictionaries_old/60extra_variable_name_extra/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/60extra_variable_name_extra/extra_dirs/extra/00-base.xml b/tests/dictionaries_old/60extra_variable_name_extra/extra_dirs/extra/00-base.xml
new file mode 100644
index 00000000..1b43cfb7
--- /dev/null
+++ b/tests/dictionaries_old/60extra_variable_name_extra/extra_dirs/extra/00-base.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <variable name="extra"/>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/60extra_variable_name_extra/makedict/after.json b/tests/dictionaries_old/60extra_variable_name_extra/makedict/after.json
new file mode 100644
index 00000000..12c84953
--- /dev/null
+++ b/tests/dictionaries_old/60extra_variable_name_extra/makedict/after.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.activer_ejabberd": {
+        "owner": "default",
+        "value": "non"
+    },
+    "extra.extra": {
+        "owner": "default",
+        "value": null
+    }
+}
diff --git a/tests/dictionaries_old/60extra_variable_name_extra/makedict/base.json b/tests/dictionaries_old/60extra_variable_name_extra/makedict/base.json
new file mode 100644
index 00000000..1c12b906
--- /dev/null
+++ b/tests/dictionaries_old/60extra_variable_name_extra/makedict/base.json
@@ -0,0 +1,5 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general.activer_ejabberd": "non",
+    "extra.extra": null
+}
diff --git a/tests/dictionaries_old/60extra_variable_name_extra/makedict/before.json b/tests/dictionaries_old/60extra_variable_name_extra/makedict/before.json
new file mode 100644
index 00000000..12c84953
--- /dev/null
+++ b/tests/dictionaries_old/60extra_variable_name_extra/makedict/before.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.activer_ejabberd": {
+        "owner": "default",
+        "value": "non"
+    },
+    "extra.extra": {
+        "owner": "default",
+        "value": null
+    }
+}
diff --git a/tests/dictionaries_old/60extra_variable_name_extra/tiramisu/base.py b/tests/dictionaries_old/60extra_variable_name_extra/tiramisu/base.py
new file mode 100644
index 00000000..dda96b9b
--- /dev/null
+++ b/tests/dictionaries_old/60extra_variable_name_extra/tiramisu/base.py
@@ -0,0 +1,20 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_4 = StrOption(name="activer_ejabberd", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="général", children=[option_3, option_4], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_6 = StrOption(name="extra", doc="extra", properties=frozenset({"normal"}))
+option_5 = OptionDescription(name="extra", doc="extra", children=[option_6])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_5])
diff --git a/tests/dictionaries_old/60familyaction/00-base.xml b/tests/dictionaries_old/60familyaction/00-base.xml
new file mode 100644
index 00000000..84913090
--- /dev/null
+++ b/tests/dictionaries_old/60familyaction/00-base.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/60familyaction/__init__.py b/tests/dictionaries_old/60familyaction/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/60familyaction/extra_dirs/extra/00-base.xml b/tests/dictionaries_old/60familyaction/extra_dirs/extra/00-base.xml
new file mode 100644
index 00000000..9fcc6478
--- /dev/null
+++ b/tests/dictionaries_old/60familyaction/extra_dirs/extra/00-base.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="test">
+      <variable name="delay" type="number" description="délai en minutes avant lancement">
+        <value>0</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/60familyaction/makedict/after.json b/tests/dictionaries_old/60familyaction/makedict/after.json
new file mode 100644
index 00000000..00d8ee8c
--- /dev/null
+++ b/tests/dictionaries_old/60familyaction/makedict/after.json
@@ -0,0 +1,10 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "extra.test.delay": {
+        "owner": "default",
+        "value": 0
+    }
+}
diff --git a/tests/dictionaries_old/60familyaction/makedict/base.json b/tests/dictionaries_old/60familyaction/makedict/base.json
new file mode 100644
index 00000000..9a96ae51
--- /dev/null
+++ b/tests/dictionaries_old/60familyaction/makedict/base.json
@@ -0,0 +1,4 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "extra.test.delay": 0
+}
diff --git a/tests/dictionaries_old/60familyaction/makedict/before.json b/tests/dictionaries_old/60familyaction/makedict/before.json
new file mode 100644
index 00000000..00d8ee8c
--- /dev/null
+++ b/tests/dictionaries_old/60familyaction/makedict/before.json
@@ -0,0 +1,10 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "extra.test.delay": {
+        "owner": "default",
+        "value": 0
+    }
+}
diff --git a/tests/dictionaries_old/60familyaction/tiramisu/base.py b/tests/dictionaries_old/60familyaction/tiramisu/base.py
new file mode 100644
index 00000000..6f61d69e
--- /dev/null
+++ b/tests/dictionaries_old/60familyaction/tiramisu/base.py
@@ -0,0 +1,20 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="général", children=[option_3], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_6 = IntOption(name="delay", doc="délai en minutes avant lancement", default=0, properties=frozenset({"mandatory", "normal"}))
+option_5 = OptionDescription(name="test", doc="test", children=[option_6], properties=frozenset({"normal"}))
+option_4 = OptionDescription(name="extra", doc="extra", children=[option_5])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4])
diff --git a/tests/dictionaries_old/60familyaction_mandatory/00-base.xml b/tests/dictionaries_old/60familyaction_mandatory/00-base.xml
new file mode 100644
index 00000000..84913090
--- /dev/null
+++ b/tests/dictionaries_old/60familyaction_mandatory/00-base.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/60familyaction_mandatory/__init__.py b/tests/dictionaries_old/60familyaction_mandatory/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/60familyaction_mandatory/extra_dirs/extra/00-base.xml b/tests/dictionaries_old/60familyaction_mandatory/extra_dirs/extra/00-base.xml
new file mode 100644
index 00000000..35fecda4
--- /dev/null
+++ b/tests/dictionaries_old/60familyaction_mandatory/extra_dirs/extra/00-base.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="test">
+      <variable name="delay" type="number" description="délai en minutes avant lancement">
+        <value>0</value>
+      </variable>
+      <variable name="day" type="number" description="day avant lancement" mandatory="True"/>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/60familyaction_mandatory/makedict/after.json b/tests/dictionaries_old/60familyaction_mandatory/makedict/after.json
new file mode 100644
index 00000000..8ba0e34e
--- /dev/null
+++ b/tests/dictionaries_old/60familyaction_mandatory/makedict/after.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "extra.test.delay": {
+        "owner": "default",
+        "value": 0
+    },
+    "extra.test.day": {
+        "owner": "default",
+        "value": null
+    }
+}
diff --git a/tests/dictionaries_old/60familyaction_mandatory/makedict/base.json b/tests/dictionaries_old/60familyaction_mandatory/makedict/base.json
new file mode 100644
index 00000000..8287bf85
--- /dev/null
+++ b/tests/dictionaries_old/60familyaction_mandatory/makedict/base.json
@@ -0,0 +1,5 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "extra.test.delay": 0,
+    "extra.test.day": null
+}
diff --git a/tests/dictionaries_old/60familyaction_mandatory/makedict/before.json b/tests/dictionaries_old/60familyaction_mandatory/makedict/before.json
new file mode 100644
index 00000000..8ba0e34e
--- /dev/null
+++ b/tests/dictionaries_old/60familyaction_mandatory/makedict/before.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "extra.test.delay": {
+        "owner": "default",
+        "value": 0
+    },
+    "extra.test.day": {
+        "owner": "default",
+        "value": null
+    }
+}
diff --git a/tests/dictionaries_old/60familyaction_mandatory/tiramisu/base.py b/tests/dictionaries_old/60familyaction_mandatory/tiramisu/base.py
new file mode 100644
index 00000000..43d104bb
--- /dev/null
+++ b/tests/dictionaries_old/60familyaction_mandatory/tiramisu/base.py
@@ -0,0 +1,21 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="général", children=[option_3], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_6 = IntOption(name="delay", doc="délai en minutes avant lancement", default=0, properties=frozenset({"mandatory", "normal"}))
+option_7 = IntOption(name="day", doc="day avant lancement", properties=frozenset({"basic", "mandatory"}))
+option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_7], properties=frozenset({"basic"}))
+option_4 = OptionDescription(name="extra", doc="extra", children=[option_5])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4])
diff --git a/tests/dictionaries_old/61extra_auto_freeze/00-base.xml b/tests/dictionaries_old/61extra_auto_freeze/00-base.xml
new file mode 100644
index 00000000..0ab77a36
--- /dev/null
+++ b/tests/dictionaries_old/61extra_auto_freeze/00-base.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general" description="général">
+      <variable name="server_deployed" type="boolean" description="No change"/>
+      <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/61extra_auto_freeze/__init__.py b/tests/dictionaries_old/61extra_auto_freeze/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/61extra_auto_freeze/extra_dirs/extra/00-base.xml b/tests/dictionaries_old/61extra_auto_freeze/extra_dirs/extra/00-base.xml
new file mode 100644
index 00000000..3d92c2c9
--- /dev/null
+++ b/tests/dictionaries_old/61extra_auto_freeze/extra_dirs/extra/00-base.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="ejabberd">
+      <variable name="mode" type="string" auto_freeze="True">
+        <value>pre</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/61extra_auto_freeze/makedict/after.json b/tests/dictionaries_old/61extra_auto_freeze/makedict/after.json
new file mode 100644
index 00000000..fbe17107
--- /dev/null
+++ b/tests/dictionaries_old/61extra_auto_freeze/makedict/after.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.server_deployed": {
+        "owner": "default",
+        "value": true
+    },
+    "rougail.general.activer_ejabberd": {
+        "owner": "default",
+        "value": "non"
+    },
+    "extra.ejabberd.mode": {
+        "owner": "forced",
+        "value": "pre"
+    }
+}
diff --git a/tests/dictionaries_old/61extra_auto_freeze/makedict/base.json b/tests/dictionaries_old/61extra_auto_freeze/makedict/base.json
new file mode 100644
index 00000000..42890f47
--- /dev/null
+++ b/tests/dictionaries_old/61extra_auto_freeze/makedict/base.json
@@ -0,0 +1,5 @@
+{
+    "rougail.general.server_deployed": true,
+    "rougail.general.activer_ejabberd": "non",
+    "extra.ejabberd.mode": "pre"
+}
diff --git a/tests/dictionaries_old/61extra_auto_freeze/makedict/before.json b/tests/dictionaries_old/61extra_auto_freeze/makedict/before.json
new file mode 100644
index 00000000..8f32cc77
--- /dev/null
+++ b/tests/dictionaries_old/61extra_auto_freeze/makedict/before.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.server_deployed": {
+        "owner": "default",
+        "value": true
+    },
+    "rougail.general.activer_ejabberd": {
+        "owner": "default",
+        "value": "non"
+    },
+    "extra.ejabberd.mode": {
+        "owner": "default",
+        "value": "pre"
+    }
+}
diff --git a/tests/dictionaries_old/61extra_auto_freeze/tiramisu/base.py b/tests/dictionaries_old/61extra_auto_freeze/tiramisu/base.py
new file mode 100644
index 00000000..e71f2178
--- /dev/null
+++ b/tests/dictionaries_old/61extra_auto_freeze/tiramisu/base.py
@@ -0,0 +1,21 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = BoolOption(name="server_deployed", doc="No change", default=True, properties=frozenset({"mandatory", "normal"}))
+option_4 = StrOption(name="activer_ejabberd", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="général", children=[option_3, option_4], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_7 = StrOption(name="mode", doc="mode", default="pre", properties=frozenset({"basic", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue(True)}))}))
+option_6 = OptionDescription(name="ejabberd", doc="ejabberd", children=[option_7], properties=frozenset({"basic"}))
+option_5 = OptionDescription(name="extra", doc="extra", children=[option_6])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_5])
diff --git a/tests/dictionaries_old/61extra_dyn/00-base.xml b/tests/dictionaries_old/61extra_dyn/00-base.xml
new file mode 100644
index 00000000..95b53406
--- /dev/null
+++ b/tests/dictionaries_old/61extra_dyn/00-base.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general" description="général">
+      <variable name="varname" type="string" description="No change" multi="True">
+        <value>a</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/61extra_dyn/__init__.py b/tests/dictionaries_old/61extra_dyn/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/61extra_dyn/extra_dirs/extra/00-base.xml b/tests/dictionaries_old/61extra_dyn/extra_dirs/extra/00-base.xml
new file mode 100644
index 00000000..84709bfe
--- /dev/null
+++ b/tests/dictionaries_old/61extra_dyn/extra_dirs/extra/00-base.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="ejabberd" dynamic="varname">
+      <variable name="mode" type="string"/>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/61extra_dyn/makedict/after.json b/tests/dictionaries_old/61extra_dyn/makedict/after.json
new file mode 100644
index 00000000..648ee5b1
--- /dev/null
+++ b/tests/dictionaries_old/61extra_dyn/makedict/after.json
@@ -0,0 +1,12 @@
+{
+    "rougail.general.varname": {
+        "owner": "default",
+        "value": [
+            "a"
+        ]
+    },
+    "extra.ejabberda.modea": {
+        "owner": "default",
+        "value": null
+    }
+}
diff --git a/tests/dictionaries_old/61extra_dyn/makedict/base.json b/tests/dictionaries_old/61extra_dyn/makedict/base.json
new file mode 100644
index 00000000..5315f611
--- /dev/null
+++ b/tests/dictionaries_old/61extra_dyn/makedict/base.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.varname": [
+        "a"
+    ],
+    "extra.ejabberda.modea": null
+}
diff --git a/tests/dictionaries_old/61extra_dyn/makedict/before.json b/tests/dictionaries_old/61extra_dyn/makedict/before.json
new file mode 100644
index 00000000..648ee5b1
--- /dev/null
+++ b/tests/dictionaries_old/61extra_dyn/makedict/before.json
@@ -0,0 +1,12 @@
+{
+    "rougail.general.varname": {
+        "owner": "default",
+        "value": [
+            "a"
+        ]
+    },
+    "extra.ejabberda.modea": {
+        "owner": "default",
+        "value": null
+    }
+}
diff --git a/tests/dictionaries_old/61extra_dyn/tiramisu/base.py b/tests/dictionaries_old/61extra_dyn/tiramisu/base.py
new file mode 100644
index 00000000..82721798
--- /dev/null
+++ b/tests/dictionaries_old/61extra_dyn/tiramisu/base.py
@@ -0,0 +1,21 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+from rougail.tiramisu import ConvertDynOptionDescription
+option_3 = StrOption(name="varname", doc="No change", multi=True, default=['a'], default_multi="a", properties=frozenset({"mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="général", children=[option_3], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_6 = StrOption(name="mode", doc="mode", properties=frozenset({"normal"}))
+option_5 = ConvertDynOptionDescription(name="ejabberd", doc="ejabberd", suffixes=Calculation(func.calc_value, Params((ParamOption(option_3, notraisepropertyerror=True)))), children=[option_6], properties=frozenset({"normal"}))
+option_4 = OptionDescription(name="extra", doc="extra", children=[option_5])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4])
diff --git a/tests/dictionaries_old/61extra_dyn_extra/00-base.xml b/tests/dictionaries_old/61extra_dyn_extra/00-base.xml
new file mode 100644
index 00000000..95b53406
--- /dev/null
+++ b/tests/dictionaries_old/61extra_dyn_extra/00-base.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general" description="général">
+      <variable name="varname" type="string" description="No change" multi="True">
+        <value>a</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/61extra_dyn_extra/__init__.py b/tests/dictionaries_old/61extra_dyn_extra/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/61extra_dyn_extra/extra_dirs/extra/00-base.xml b/tests/dictionaries_old/61extra_dyn_extra/extra_dirs/extra/00-base.xml
new file mode 100644
index 00000000..96ab370d
--- /dev/null
+++ b/tests/dictionaries_old/61extra_dyn_extra/extra_dirs/extra/00-base.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general" description="général">
+      <variable name="varname" type="string" description="No change" multi="True">
+        <value>a</value>
+      </variable>
+    </family>
+    <family name="ejabberd" dynamic="extra.general.varname">
+      <variable name="mode" type="string"/>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/61extra_dyn_extra/makedict/after.json b/tests/dictionaries_old/61extra_dyn_extra/makedict/after.json
new file mode 100644
index 00000000..a14294f6
--- /dev/null
+++ b/tests/dictionaries_old/61extra_dyn_extra/makedict/after.json
@@ -0,0 +1,18 @@
+{
+    "rougail.general.varname": {
+        "owner": "default",
+        "value": [
+            "a"
+        ]
+    },
+    "extra.general.varname": {
+        "owner": "default",
+        "value": [
+            "a"
+        ]
+    },
+    "extra.ejabberda.modea": {
+        "owner": "default",
+        "value": null
+    }
+}
diff --git a/tests/dictionaries_old/61extra_dyn_extra/makedict/base.json b/tests/dictionaries_old/61extra_dyn_extra/makedict/base.json
new file mode 100644
index 00000000..ac9cdf70
--- /dev/null
+++ b/tests/dictionaries_old/61extra_dyn_extra/makedict/base.json
@@ -0,0 +1,9 @@
+{
+    "rougail.general.varname": [
+        "a"
+    ],
+    "extra.general.varname": [
+        "a"
+    ],
+    "extra.ejabberda.modea": null
+}
diff --git a/tests/dictionaries_old/61extra_dyn_extra/makedict/before.json b/tests/dictionaries_old/61extra_dyn_extra/makedict/before.json
new file mode 100644
index 00000000..a14294f6
--- /dev/null
+++ b/tests/dictionaries_old/61extra_dyn_extra/makedict/before.json
@@ -0,0 +1,18 @@
+{
+    "rougail.general.varname": {
+        "owner": "default",
+        "value": [
+            "a"
+        ]
+    },
+    "extra.general.varname": {
+        "owner": "default",
+        "value": [
+            "a"
+        ]
+    },
+    "extra.ejabberda.modea": {
+        "owner": "default",
+        "value": null
+    }
+}
diff --git a/tests/dictionaries_old/61extra_dyn_extra/tiramisu/base.py b/tests/dictionaries_old/61extra_dyn_extra/tiramisu/base.py
new file mode 100644
index 00000000..b5f31810
--- /dev/null
+++ b/tests/dictionaries_old/61extra_dyn_extra/tiramisu/base.py
@@ -0,0 +1,23 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+from rougail.tiramisu import ConvertDynOptionDescription
+option_3 = StrOption(name="varname", doc="No change", multi=True, default=['a'], default_multi="a", properties=frozenset({"mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="général", children=[option_3], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_6 = StrOption(name="varname", doc="No change", multi=True, default=['a'], default_multi="a", properties=frozenset({"mandatory", "normal"}))
+option_5 = OptionDescription(name="general", doc="général", children=[option_6], properties=frozenset({"normal"}))
+option_8 = StrOption(name="mode", doc="mode", properties=frozenset({"normal"}))
+option_7 = ConvertDynOptionDescription(name="ejabberd", doc="ejabberd", suffixes=Calculation(func.calc_value, Params((ParamOption(option_6, notraisepropertyerror=True)))), children=[option_8], properties=frozenset({"normal"}))
+option_4 = OptionDescription(name="extra", doc="extra", children=[option_5, option_7])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4])
diff --git a/tests/dictionaries_old/70container_files/00-base.xml b/tests/dictionaries_old/70container_files/00-base.xml
new file mode 100644
index 00000000..48ce7ce0
--- /dev/null
+++ b/tests/dictionaries_old/70container_files/00-base.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="test">
+      <file>/etc/mailname</file>
+      <file>/rougail.conf</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>oui</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/70container_files/__init__.py b/tests/dictionaries_old/70container_files/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/70container_files/makedict/after.json b/tests/dictionaries_old/70container_files/makedict/after.json
new file mode 100644
index 00000000..0329a8b5
--- /dev/null
+++ b/tests/dictionaries_old/70container_files/makedict/after.json
@@ -0,0 +1,30 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "oui"
+    },
+    "services.test.files.mailname.name": {
+        "owner": "default",
+        "value": "/etc/mailname"
+    },
+    "services.test.files.mailname.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.files.rougail_conf.name": {
+        "owner": "default",
+        "value": "/rougail.conf"
+    },
+    "services.test.files.rougail_conf.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/70container_files/makedict/base.json b/tests/dictionaries_old/70container_files/makedict/base.json
new file mode 100644
index 00000000..ab53f2b8
--- /dev/null
+++ b/tests/dictionaries_old/70container_files/makedict/base.json
@@ -0,0 +1,9 @@
+{
+    "rougail.general.mode_conteneur_actif": "oui",
+    "services.test.files.mailname.name": "/etc/mailname",
+    "services.test.files.mailname.activate": true,
+    "services.test.files.rougail_conf.name": "/rougail.conf",
+    "services.test.files.rougail_conf.activate": true,
+    "services.test.activate": true,
+    "services.test.manage": true
+}
diff --git a/tests/dictionaries_old/70container_files/makedict/before.json b/tests/dictionaries_old/70container_files/makedict/before.json
new file mode 100644
index 00000000..0329a8b5
--- /dev/null
+++ b/tests/dictionaries_old/70container_files/makedict/before.json
@@ -0,0 +1,30 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "oui"
+    },
+    "services.test.files.mailname.name": {
+        "owner": "default",
+        "value": "/etc/mailname"
+    },
+    "services.test.files.mailname.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.files.rougail_conf.name": {
+        "owner": "default",
+        "value": "/rougail.conf"
+    },
+    "services.test.files.rougail_conf.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/70container_files/result/etc/mailname b/tests/dictionaries_old/70container_files/result/etc/mailname
new file mode 100644
index 00000000..bd51bf63
--- /dev/null
+++ b/tests/dictionaries_old/70container_files/result/etc/mailname
@@ -0,0 +1 @@
+oui
diff --git a/tests/dictionaries_old/70container_files/result/rougail.conf b/tests/dictionaries_old/70container_files/result/rougail.conf
new file mode 100644
index 00000000..b8f8a226
--- /dev/null
+++ b/tests/dictionaries_old/70container_files/result/rougail.conf
@@ -0,0 +1,2 @@
+C /etc/mailname 0644 root root - /usr/local/share/factory/etc/mailname
+z /etc/mailname - - - - -
diff --git a/tests/dictionaries_old/70container_files/result/tmpfiles.d/rougail.conf b/tests/dictionaries_old/70container_files/result/tmpfiles.d/rougail.conf
new file mode 100644
index 00000000..46697e03
--- /dev/null
+++ b/tests/dictionaries_old/70container_files/result/tmpfiles.d/rougail.conf
@@ -0,0 +1,2 @@
+C /etc/mailname 0644 root root - /usr/local/lib/etc/mailname
+z /etc/mailname - - - - -
diff --git a/tests/dictionaries_old/70container_files/tiramisu/base.py b/tests/dictionaries_old/70container_files/tiramisu/base.py
new file mode 100644
index 00000000..8afa8c72
--- /dev/null
+++ b/tests/dictionaries_old/70container_files/tiramisu/base.py
@@ -0,0 +1,30 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="général", children=[option_3], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_8 = FilenameOption(name="name", doc="name", default="/etc/mailname")
+option_9 = BoolOption(name="activate", doc="activate", default=True)
+option_7 = OptionDescription(name="mailname", doc="mailname", children=[option_8, option_9])
+option_7.impl_set_information('source', "mailname")
+option_11 = FilenameOption(name="name", doc="name", default="/rougail.conf")
+option_12 = BoolOption(name="activate", doc="activate", default=True)
+option_10 = OptionDescription(name="rougail_conf", doc="rougail.conf", children=[option_11, option_12])
+option_10.impl_set_information('source', "rougail.conf")
+option_6 = OptionDescription(name="files", doc="files", children=[option_7, option_10])
+option_13 = BoolOption(name="activate", doc="activate", default=True)
+option_14 = BoolOption(name="manage", doc="manage", default=True)
+option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_13, option_14])
+option_4 = OptionDescription(name="services", doc="services", children=[option_5], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4])
diff --git a/tests/dictionaries_old/70container_files/tmpl/mailname b/tests/dictionaries_old/70container_files/tmpl/mailname
new file mode 100644
index 00000000..3ae41fab
--- /dev/null
+++ b/tests/dictionaries_old/70container_files/tmpl/mailname
@@ -0,0 +1,6 @@
+%if %%varExists('mode_conteneur_actif')
+%%mode_conteneur_actif
+%end if
+%if %%varExists('mode_conteneur_actif3')
+%%mode_conteneur_actif3
+%end if
diff --git a/tests/dictionaries_old/70container_files/tmpl/rougail.conf b/tests/dictionaries_old/70container_files/tmpl/rougail.conf
new file mode 100644
index 00000000..cd853a0e
--- /dev/null
+++ b/tests/dictionaries_old/70container_files/tmpl/rougail.conf
@@ -0,0 +1,10 @@
+%for %%service in %%services
+  %if %%hasattr(%%service, 'files')
+    %for %%file in %%service.files
+      %if %%file.name != %%rougail_filename and %%hasattr(%%file, 'activate') and %%file.activate == True
+C %%file.name %%file.mode %%file.owner %%file.group - /usr/local/share/factory%%file.name
+z %%file.name - - - - -
+      %end if
+    %end for
+  %end if
+%end for
diff --git a/tests/dictionaries_old/70container_files_symlink_multi/00-base.xml b/tests/dictionaries_old/70container_files_symlink_multi/00-base.xml
new file mode 100644
index 00000000..6cdab522
--- /dev/null
+++ b/tests/dictionaries_old/70container_files_symlink_multi/00-base.xml
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="test">
+      <file file_type="variable" source="mailname">file_name</file>
+      <file file_type="variable" source="mailname2" engine="jinja2">file_name2</file>
+    </service>
+  </services>
+  <variables>
+    <variable name="file_name" type="filename" multi="True">
+      <value>/etc/mailname</value>
+      <value>/etc/mailname2</value>
+    </variable>
+    <variable name="file_name2" type="filename" multi="True">
+      <value>/etc/mailname3</value>
+      <value>/etc/mailname4</value>
+    </variable>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/70container_files_symlink_multi/__init__.py b/tests/dictionaries_old/70container_files_symlink_multi/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/70container_files_symlink_multi/makedict/after.json b/tests/dictionaries_old/70container_files_symlink_multi/makedict/after.json
new file mode 100644
index 00000000..38b626a1
--- /dev/null
+++ b/tests/dictionaries_old/70container_files_symlink_multi/makedict/after.json
@@ -0,0 +1,46 @@
+{
+    "rougail.file_name": {
+        "owner": "default",
+        "value": [
+            "/etc/mailname",
+            "/etc/mailname2"
+        ]
+    },
+    "rougail.file_name2": {
+        "owner": "default",
+        "value": [
+            "/etc/mailname3",
+            "/etc/mailname4"
+        ]
+    },
+    "services.test.files.mailname.name": {
+        "owner": "default",
+        "value": [
+            "/etc/mailname",
+            "/etc/mailname2"
+        ]
+    },
+    "services.test.files.mailname.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.files.mailname2.name": {
+        "owner": "default",
+        "value": [
+            "/etc/mailname3",
+            "/etc/mailname4"
+        ]
+    },
+    "services.test.files.mailname2.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/70container_files_symlink_multi/makedict/base.json b/tests/dictionaries_old/70container_files_symlink_multi/makedict/base.json
new file mode 100644
index 00000000..ca49f33b
--- /dev/null
+++ b/tests/dictionaries_old/70container_files_symlink_multi/makedict/base.json
@@ -0,0 +1,22 @@
+{
+    "rougail.file_name": [
+        "/etc/mailname",
+        "/etc/mailname2"
+    ],
+    "rougail.file_name2": [
+        "/etc/mailname3",
+        "/etc/mailname4"
+    ],
+    "services.test.files.mailname.name": [
+        "/etc/mailname",
+        "/etc/mailname2"
+    ],
+    "services.test.files.mailname.activate": true,
+    "services.test.files.mailname2.name": [
+        "/etc/mailname3",
+        "/etc/mailname4"
+    ],
+    "services.test.files.mailname2.activate": true,
+    "services.test.activate": true,
+    "services.test.manage": true
+}
diff --git a/tests/dictionaries_old/70container_files_symlink_multi/makedict/before.json b/tests/dictionaries_old/70container_files_symlink_multi/makedict/before.json
new file mode 100644
index 00000000..38b626a1
--- /dev/null
+++ b/tests/dictionaries_old/70container_files_symlink_multi/makedict/before.json
@@ -0,0 +1,46 @@
+{
+    "rougail.file_name": {
+        "owner": "default",
+        "value": [
+            "/etc/mailname",
+            "/etc/mailname2"
+        ]
+    },
+    "rougail.file_name2": {
+        "owner": "default",
+        "value": [
+            "/etc/mailname3",
+            "/etc/mailname4"
+        ]
+    },
+    "services.test.files.mailname.name": {
+        "owner": "default",
+        "value": [
+            "/etc/mailname",
+            "/etc/mailname2"
+        ]
+    },
+    "services.test.files.mailname.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.files.mailname2.name": {
+        "owner": "default",
+        "value": [
+            "/etc/mailname3",
+            "/etc/mailname4"
+        ]
+    },
+    "services.test.files.mailname2.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/70container_files_symlink_multi/result/etc/mailname b/tests/dictionaries_old/70container_files_symlink_multi/result/etc/mailname
new file mode 100644
index 00000000..1a03818d
--- /dev/null
+++ b/tests/dictionaries_old/70container_files_symlink_multi/result/etc/mailname
@@ -0,0 +1 @@
+/etc/mailname
diff --git a/tests/dictionaries_old/70container_files_symlink_multi/result/etc/mailname2 b/tests/dictionaries_old/70container_files_symlink_multi/result/etc/mailname2
new file mode 100644
index 00000000..03e21796
--- /dev/null
+++ b/tests/dictionaries_old/70container_files_symlink_multi/result/etc/mailname2
@@ -0,0 +1 @@
+/etc/mailname2
diff --git a/tests/dictionaries_old/70container_files_symlink_multi/result/etc/mailname3 b/tests/dictionaries_old/70container_files_symlink_multi/result/etc/mailname3
new file mode 100644
index 00000000..2585efaa
--- /dev/null
+++ b/tests/dictionaries_old/70container_files_symlink_multi/result/etc/mailname3
@@ -0,0 +1 @@
+/etc/mailname3
diff --git a/tests/dictionaries_old/70container_files_symlink_multi/result/etc/mailname4 b/tests/dictionaries_old/70container_files_symlink_multi/result/etc/mailname4
new file mode 100644
index 00000000..d58aef4b
--- /dev/null
+++ b/tests/dictionaries_old/70container_files_symlink_multi/result/etc/mailname4
@@ -0,0 +1 @@
+/etc/mailname4
diff --git a/tests/dictionaries_old/70container_files_symlink_multi/result/tmpfiles.d/rougail.conf b/tests/dictionaries_old/70container_files_symlink_multi/result/tmpfiles.d/rougail.conf
new file mode 100644
index 00000000..95445abe
--- /dev/null
+++ b/tests/dictionaries_old/70container_files_symlink_multi/result/tmpfiles.d/rougail.conf
@@ -0,0 +1,8 @@
+C /etc/mailname 0644 root root - /usr/local/lib/etc/mailname
+z /etc/mailname - - - - -
+C /etc/mailname2 0644 root root - /usr/local/lib/etc/mailname2
+z /etc/mailname2 - - - - -
+C /etc/mailname3 0644 root root - /usr/local/lib/etc/mailname3
+z /etc/mailname3 - - - - -
+C /etc/mailname4 0644 root root - /usr/local/lib/etc/mailname4
+z /etc/mailname4 - - - - -
diff --git a/tests/dictionaries_old/70container_files_symlink_multi/tiramisu/base.py b/tests/dictionaries_old/70container_files_symlink_multi/tiramisu/base.py
new file mode 100644
index 00000000..6202c21a
--- /dev/null
+++ b/tests/dictionaries_old/70container_files_symlink_multi/tiramisu/base.py
@@ -0,0 +1,31 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_2 = FilenameOption(name="file_name", doc="file_name", multi=True, default=['/etc/mailname', '/etc/mailname2'], default_multi="/etc/mailname", properties=frozenset({"mandatory", "normal"}))
+option_3 = FilenameOption(name="file_name2", doc="file_name2", multi=True, default=['/etc/mailname3', '/etc/mailname4'], default_multi="/etc/mailname3", properties=frozenset({"mandatory", "normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_3])
+option_8 = SymLinkOption(name="name", opt=option_2)
+option_9 = BoolOption(name="activate", doc="activate", default=True)
+option_7 = OptionDescription(name="mailname", doc="mailname", children=[option_8, option_9])
+option_7.impl_set_information('source', "mailname")
+option_11 = SymLinkOption(name="name", opt=option_3)
+option_12 = BoolOption(name="activate", doc="activate", default=True)
+option_10 = OptionDescription(name="mailname2", doc="mailname2", children=[option_11, option_12])
+option_10.impl_set_information('engine', "jinja2")
+option_10.impl_set_information('source', "mailname2")
+option_6 = OptionDescription(name="files", doc="files", children=[option_7, option_10])
+option_13 = BoolOption(name="activate", doc="activate", default=True)
+option_14 = BoolOption(name="manage", doc="manage", default=True)
+option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_13, option_14])
+option_4 = OptionDescription(name="services", doc="services", children=[option_5], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4])
diff --git a/tests/dictionaries_old/70container_files_symlink_multi/tmpl/mailname b/tests/dictionaries_old/70container_files_symlink_multi/tmpl/mailname
new file mode 100644
index 00000000..6a4cb448
--- /dev/null
+++ b/tests/dictionaries_old/70container_files_symlink_multi/tmpl/mailname
@@ -0,0 +1 @@
+%%rougail_filename
diff --git a/tests/dictionaries_old/70container_files_symlink_multi/tmpl/mailname2 b/tests/dictionaries_old/70container_files_symlink_multi/tmpl/mailname2
new file mode 100644
index 00000000..32fea5cb
--- /dev/null
+++ b/tests/dictionaries_old/70container_files_symlink_multi/tmpl/mailname2
@@ -0,0 +1 @@
+{{ rougail_filename }}
diff --git a/tests/dictionaries_old/70container_files_symlink_multi_variable/00-base.xml b/tests/dictionaries_old/70container_files_symlink_multi_variable/00-base.xml
new file mode 100644
index 00000000..3270dc10
--- /dev/null
+++ b/tests/dictionaries_old/70container_files_symlink_multi_variable/00-base.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="test">
+      <file file_type="variable" source="mailname" variable="var">file_name</file>
+      <file file_type="variable" source="mailname2" variable="var" engine="jinja2">file_name2</file>
+    </service>
+  </services>
+  <variables>
+    <variable name="file_name" type="filename" multi="True">
+      <value>/etc/mailname</value>
+      <value>/etc/mailname2</value>
+    </variable>
+    <variable name="file_name2" type="filename" multi="True">
+      <value>/etc/mailname3</value>
+      <value>/etc/mailname4</value>
+    </variable>
+    <variable name="var" type="string" multi="True">
+      <value>mailname</value>
+      <value>mailname2</value>
+    </variable>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/70container_files_symlink_multi_variable/__init__.py b/tests/dictionaries_old/70container_files_symlink_multi_variable/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/70container_files_symlink_multi_variable/makedict/after.json b/tests/dictionaries_old/70container_files_symlink_multi_variable/makedict/after.json
new file mode 100644
index 00000000..85f10914
--- /dev/null
+++ b/tests/dictionaries_old/70container_files_symlink_multi_variable/makedict/after.json
@@ -0,0 +1,67 @@
+{
+    "rougail.file_name": {
+        "owner": "default",
+        "value": [
+            "/etc/mailname",
+            "/etc/mailname2"
+        ]
+    },
+    "rougail.file_name2": {
+        "owner": "default",
+        "value": [
+            "/etc/mailname3",
+            "/etc/mailname4"
+        ]
+    },
+    "rougail.var": {
+        "owner": "default",
+        "value": [
+            "mailname",
+            "mailname2"
+        ]
+    },
+    "services.test.files.mailname.name": {
+        "owner": "default",
+        "value": [
+            "/etc/mailname",
+            "/etc/mailname2"
+        ]
+    },
+    "services.test.files.mailname.variable": {
+        "owner": "default",
+        "value": [
+            "mailname",
+            "mailname2"
+        ]
+    },
+    "services.test.files.mailname.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.files.mailname2.name": {
+        "owner": "default",
+        "value": [
+            "/etc/mailname3",
+            "/etc/mailname4"
+        ]
+    },
+    "services.test.files.mailname2.variable": {
+        "owner": "default",
+        "value": [
+            "mailname",
+            "mailname2"
+        ]
+    },
+    "services.test.files.mailname2.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/70container_files_symlink_multi_variable/makedict/base.json b/tests/dictionaries_old/70container_files_symlink_multi_variable/makedict/base.json
new file mode 100644
index 00000000..3d2fce35
--- /dev/null
+++ b/tests/dictionaries_old/70container_files_symlink_multi_variable/makedict/base.json
@@ -0,0 +1,34 @@
+{
+    "rougail.file_name": [
+        "/etc/mailname",
+        "/etc/mailname2"
+    ],
+    "rougail.file_name2": [
+        "/etc/mailname3",
+        "/etc/mailname4"
+    ],
+    "rougail.var": [
+        "mailname",
+        "mailname2"
+    ],
+    "services.test.files.mailname.name": [
+        "/etc/mailname",
+        "/etc/mailname2"
+    ],
+    "services.test.files.mailname.variable": [
+        "mailname",
+        "mailname2"
+    ],
+    "services.test.files.mailname.activate": true,
+    "services.test.files.mailname2.name": [
+        "/etc/mailname3",
+        "/etc/mailname4"
+    ],
+    "services.test.files.mailname2.variable": [
+        "mailname",
+        "mailname2"
+    ],
+    "services.test.files.mailname2.activate": true,
+    "services.test.activate": true,
+    "services.test.manage": true
+}
diff --git a/tests/dictionaries_old/70container_files_symlink_multi_variable/makedict/before.json b/tests/dictionaries_old/70container_files_symlink_multi_variable/makedict/before.json
new file mode 100644
index 00000000..85f10914
--- /dev/null
+++ b/tests/dictionaries_old/70container_files_symlink_multi_variable/makedict/before.json
@@ -0,0 +1,67 @@
+{
+    "rougail.file_name": {
+        "owner": "default",
+        "value": [
+            "/etc/mailname",
+            "/etc/mailname2"
+        ]
+    },
+    "rougail.file_name2": {
+        "owner": "default",
+        "value": [
+            "/etc/mailname3",
+            "/etc/mailname4"
+        ]
+    },
+    "rougail.var": {
+        "owner": "default",
+        "value": [
+            "mailname",
+            "mailname2"
+        ]
+    },
+    "services.test.files.mailname.name": {
+        "owner": "default",
+        "value": [
+            "/etc/mailname",
+            "/etc/mailname2"
+        ]
+    },
+    "services.test.files.mailname.variable": {
+        "owner": "default",
+        "value": [
+            "mailname",
+            "mailname2"
+        ]
+    },
+    "services.test.files.mailname.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.files.mailname2.name": {
+        "owner": "default",
+        "value": [
+            "/etc/mailname3",
+            "/etc/mailname4"
+        ]
+    },
+    "services.test.files.mailname2.variable": {
+        "owner": "default",
+        "value": [
+            "mailname",
+            "mailname2"
+        ]
+    },
+    "services.test.files.mailname2.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/70container_files_symlink_multi_variable/result/etc/mailname b/tests/dictionaries_old/70container_files_symlink_multi_variable/result/etc/mailname
new file mode 100644
index 00000000..0288f489
--- /dev/null
+++ b/tests/dictionaries_old/70container_files_symlink_multi_variable/result/etc/mailname
@@ -0,0 +1 @@
+mailname
diff --git a/tests/dictionaries_old/70container_files_symlink_multi_variable/result/etc/mailname2 b/tests/dictionaries_old/70container_files_symlink_multi_variable/result/etc/mailname2
new file mode 100644
index 00000000..80d43ca5
--- /dev/null
+++ b/tests/dictionaries_old/70container_files_symlink_multi_variable/result/etc/mailname2
@@ -0,0 +1 @@
+mailname2
diff --git a/tests/dictionaries_old/70container_files_symlink_multi_variable/result/etc/mailname3 b/tests/dictionaries_old/70container_files_symlink_multi_variable/result/etc/mailname3
new file mode 100644
index 00000000..0288f489
--- /dev/null
+++ b/tests/dictionaries_old/70container_files_symlink_multi_variable/result/etc/mailname3
@@ -0,0 +1 @@
+mailname
diff --git a/tests/dictionaries_old/70container_files_symlink_multi_variable/result/etc/mailname4 b/tests/dictionaries_old/70container_files_symlink_multi_variable/result/etc/mailname4
new file mode 100644
index 00000000..80d43ca5
--- /dev/null
+++ b/tests/dictionaries_old/70container_files_symlink_multi_variable/result/etc/mailname4
@@ -0,0 +1 @@
+mailname2
diff --git a/tests/dictionaries_old/70container_files_symlink_multi_variable/result/tmpfiles.d/rougail.conf b/tests/dictionaries_old/70container_files_symlink_multi_variable/result/tmpfiles.d/rougail.conf
new file mode 100644
index 00000000..95445abe
--- /dev/null
+++ b/tests/dictionaries_old/70container_files_symlink_multi_variable/result/tmpfiles.d/rougail.conf
@@ -0,0 +1,8 @@
+C /etc/mailname 0644 root root - /usr/local/lib/etc/mailname
+z /etc/mailname - - - - -
+C /etc/mailname2 0644 root root - /usr/local/lib/etc/mailname2
+z /etc/mailname2 - - - - -
+C /etc/mailname3 0644 root root - /usr/local/lib/etc/mailname3
+z /etc/mailname3 - - - - -
+C /etc/mailname4 0644 root root - /usr/local/lib/etc/mailname4
+z /etc/mailname4 - - - - -
diff --git a/tests/dictionaries_old/70container_files_symlink_multi_variable/tiramisu/base.py b/tests/dictionaries_old/70container_files_symlink_multi_variable/tiramisu/base.py
new file mode 100644
index 00000000..55a1ffa7
--- /dev/null
+++ b/tests/dictionaries_old/70container_files_symlink_multi_variable/tiramisu/base.py
@@ -0,0 +1,34 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_2 = FilenameOption(name="file_name", doc="file_name", multi=True, default=['/etc/mailname', '/etc/mailname2'], default_multi="/etc/mailname", properties=frozenset({"mandatory", "normal"}))
+option_3 = FilenameOption(name="file_name2", doc="file_name2", multi=True, default=['/etc/mailname3', '/etc/mailname4'], default_multi="/etc/mailname3", properties=frozenset({"mandatory", "normal"}))
+option_4 = StrOption(name="var", doc="var", multi=True, default=['mailname', 'mailname2'], default_multi="mailname", properties=frozenset({"mandatory", "normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_3, option_4])
+option_9 = SymLinkOption(name="name", opt=option_2)
+option_10 = SymLinkOption(name="variable", opt=option_4)
+option_11 = BoolOption(name="activate", doc="activate", default=True)
+option_8 = OptionDescription(name="mailname", doc="mailname", children=[option_9, option_10, option_11])
+option_8.impl_set_information('source', "mailname")
+option_13 = SymLinkOption(name="name", opt=option_3)
+option_14 = SymLinkOption(name="variable", opt=option_4)
+option_15 = BoolOption(name="activate", doc="activate", default=True)
+option_12 = OptionDescription(name="mailname2", doc="mailname2", children=[option_13, option_14, option_15])
+option_12.impl_set_information('engine', "jinja2")
+option_12.impl_set_information('source', "mailname2")
+option_7 = OptionDescription(name="files", doc="files", children=[option_8, option_12])
+option_16 = BoolOption(name="activate", doc="activate", default=True)
+option_17 = BoolOption(name="manage", doc="manage", default=True)
+option_6 = OptionDescription(name="test", doc="test", children=[option_7, option_16, option_17])
+option_5 = OptionDescription(name="services", doc="services", children=[option_6], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_5])
diff --git a/tests/dictionaries_old/70container_files_symlink_multi_variable/tmpl/mailname b/tests/dictionaries_old/70container_files_symlink_multi_variable/tmpl/mailname
new file mode 100644
index 00000000..5ecb01bb
--- /dev/null
+++ b/tests/dictionaries_old/70container_files_symlink_multi_variable/tmpl/mailname
@@ -0,0 +1 @@
+%%rougail_variable
diff --git a/tests/dictionaries_old/70container_files_symlink_multi_variable/tmpl/mailname2 b/tests/dictionaries_old/70container_files_symlink_multi_variable/tmpl/mailname2
new file mode 100644
index 00000000..25695444
--- /dev/null
+++ b/tests/dictionaries_old/70container_files_symlink_multi_variable/tmpl/mailname2
@@ -0,0 +1 @@
+{{ rougail_variable }}
diff --git a/tests/dictionaries_old/70container_files_symlink_variable/00-base.xml b/tests/dictionaries_old/70container_files_symlink_variable/00-base.xml
new file mode 100644
index 00000000..19f77a67
--- /dev/null
+++ b/tests/dictionaries_old/70container_files_symlink_variable/00-base.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="test">
+      <file file_type="variable" source="mailname" variable="var">file_name</file>
+    </service>
+  </services>
+  <variables>
+    <variable name="file_name" type="filename">
+      <value>/etc/mailname</value>
+    </variable>
+    <variable name="var" type="string">
+      <value>mailname</value>
+    </variable>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/70container_files_symlink_variable/__init__.py b/tests/dictionaries_old/70container_files_symlink_variable/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/70container_files_symlink_variable/makedict/after.json b/tests/dictionaries_old/70container_files_symlink_variable/makedict/after.json
new file mode 100644
index 00000000..06490541
--- /dev/null
+++ b/tests/dictionaries_old/70container_files_symlink_variable/makedict/after.json
@@ -0,0 +1,30 @@
+{
+    "rougail.file_name": {
+        "owner": "default",
+        "value": "/etc/mailname"
+    },
+    "rougail.var": {
+        "owner": "default",
+        "value": "mailname"
+    },
+    "services.test.files.mailname.name": {
+        "owner": "default",
+        "value": "/etc/mailname"
+    },
+    "services.test.files.mailname.variable": {
+        "owner": "default",
+        "value": "mailname"
+    },
+    "services.test.files.mailname.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/70container_files_symlink_variable/makedict/base.json b/tests/dictionaries_old/70container_files_symlink_variable/makedict/base.json
new file mode 100644
index 00000000..6f9a4fd0
--- /dev/null
+++ b/tests/dictionaries_old/70container_files_symlink_variable/makedict/base.json
@@ -0,0 +1,9 @@
+{
+    "rougail.file_name": "/etc/mailname",
+    "rougail.var": "mailname",
+    "services.test.files.mailname.name": "/etc/mailname",
+    "services.test.files.mailname.variable": "mailname",
+    "services.test.files.mailname.activate": true,
+    "services.test.activate": true,
+    "services.test.manage": true
+}
diff --git a/tests/dictionaries_old/70container_files_symlink_variable/makedict/before.json b/tests/dictionaries_old/70container_files_symlink_variable/makedict/before.json
new file mode 100644
index 00000000..06490541
--- /dev/null
+++ b/tests/dictionaries_old/70container_files_symlink_variable/makedict/before.json
@@ -0,0 +1,30 @@
+{
+    "rougail.file_name": {
+        "owner": "default",
+        "value": "/etc/mailname"
+    },
+    "rougail.var": {
+        "owner": "default",
+        "value": "mailname"
+    },
+    "services.test.files.mailname.name": {
+        "owner": "default",
+        "value": "/etc/mailname"
+    },
+    "services.test.files.mailname.variable": {
+        "owner": "default",
+        "value": "mailname"
+    },
+    "services.test.files.mailname.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/70container_files_symlink_variable/result/etc/mailname b/tests/dictionaries_old/70container_files_symlink_variable/result/etc/mailname
new file mode 100644
index 00000000..0288f489
--- /dev/null
+++ b/tests/dictionaries_old/70container_files_symlink_variable/result/etc/mailname
@@ -0,0 +1 @@
+mailname
diff --git a/tests/dictionaries_old/70container_files_symlink_variable/result/tmpfiles.d/rougail.conf b/tests/dictionaries_old/70container_files_symlink_variable/result/tmpfiles.d/rougail.conf
new file mode 100644
index 00000000..46697e03
--- /dev/null
+++ b/tests/dictionaries_old/70container_files_symlink_variable/result/tmpfiles.d/rougail.conf
@@ -0,0 +1,2 @@
+C /etc/mailname 0644 root root - /usr/local/lib/etc/mailname
+z /etc/mailname - - - - -
diff --git a/tests/dictionaries_old/70container_files_symlink_variable/tiramisu/base.py b/tests/dictionaries_old/70container_files_symlink_variable/tiramisu/base.py
new file mode 100644
index 00000000..55bee8bf
--- /dev/null
+++ b/tests/dictionaries_old/70container_files_symlink_variable/tiramisu/base.py
@@ -0,0 +1,27 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_2 = FilenameOption(name="file_name", doc="file_name", default="/etc/mailname", properties=frozenset({"mandatory", "normal"}))
+option_3 = StrOption(name="var", doc="var", default="mailname", properties=frozenset({"mandatory", "normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_3])
+option_8 = SymLinkOption(name="name", opt=option_2)
+option_9 = SymLinkOption(name="variable", opt=option_3)
+option_10 = BoolOption(name="activate", doc="activate", default=True)
+option_7 = OptionDescription(name="mailname", doc="mailname", children=[option_8, option_9, option_10])
+option_7.impl_set_information('source', "mailname")
+option_6 = OptionDescription(name="files", doc="files", children=[option_7])
+option_11 = BoolOption(name="activate", doc="activate", default=True)
+option_12 = BoolOption(name="manage", doc="manage", default=True)
+option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_11, option_12])
+option_4 = OptionDescription(name="services", doc="services", children=[option_5], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4])
diff --git a/tests/dictionaries_old/70container_files_symlink_variable/tmpl/mailname b/tests/dictionaries_old/70container_files_symlink_variable/tmpl/mailname
new file mode 100644
index 00000000..5ecb01bb
--- /dev/null
+++ b/tests/dictionaries_old/70container_files_symlink_variable/tmpl/mailname
@@ -0,0 +1 @@
+%%rougail_variable
diff --git a/tests/dictionaries_old/70container_files_twice/00-base.xml b/tests/dictionaries_old/70container_files_twice/00-base.xml
new file mode 100644
index 00000000..b817d912
--- /dev/null
+++ b/tests/dictionaries_old/70container_files_twice/00-base.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="test">
+      <file>/etc/mailname</file>
+      <file>/etc/eole/mailname</file>
+      <file>/rougail.conf</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>oui</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/70container_files_twice/__init__.py b/tests/dictionaries_old/70container_files_twice/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/70container_files_twice/makedict/after.json b/tests/dictionaries_old/70container_files_twice/makedict/after.json
new file mode 100644
index 00000000..784f895b
--- /dev/null
+++ b/tests/dictionaries_old/70container_files_twice/makedict/after.json
@@ -0,0 +1,38 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "oui"
+    },
+    "services.test.files.mailname.name": {
+        "owner": "default",
+        "value": "/etc/mailname"
+    },
+    "services.test.files.mailname.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.files.mailname_1.name": {
+        "owner": "default",
+        "value": "/etc/eole/mailname"
+    },
+    "services.test.files.mailname_1.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.files.rougail_conf.name": {
+        "owner": "default",
+        "value": "/rougail.conf"
+    },
+    "services.test.files.rougail_conf.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/70container_files_twice/makedict/base.json b/tests/dictionaries_old/70container_files_twice/makedict/base.json
new file mode 100644
index 00000000..0022daab
--- /dev/null
+++ b/tests/dictionaries_old/70container_files_twice/makedict/base.json
@@ -0,0 +1,11 @@
+{
+    "rougail.general.mode_conteneur_actif": "oui",
+    "services.test.files.mailname.name": "/etc/mailname",
+    "services.test.files.mailname.activate": true,
+    "services.test.files.mailname_1.name": "/etc/eole/mailname",
+    "services.test.files.mailname_1.activate": true,
+    "services.test.files.rougail_conf.name": "/rougail.conf",
+    "services.test.files.rougail_conf.activate": true,
+    "services.test.activate": true,
+    "services.test.manage": true
+}
diff --git a/tests/dictionaries_old/70container_files_twice/makedict/before.json b/tests/dictionaries_old/70container_files_twice/makedict/before.json
new file mode 100644
index 00000000..784f895b
--- /dev/null
+++ b/tests/dictionaries_old/70container_files_twice/makedict/before.json
@@ -0,0 +1,38 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "oui"
+    },
+    "services.test.files.mailname.name": {
+        "owner": "default",
+        "value": "/etc/mailname"
+    },
+    "services.test.files.mailname.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.files.mailname_1.name": {
+        "owner": "default",
+        "value": "/etc/eole/mailname"
+    },
+    "services.test.files.mailname_1.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.files.rougail_conf.name": {
+        "owner": "default",
+        "value": "/rougail.conf"
+    },
+    "services.test.files.rougail_conf.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/70container_files_twice/tiramisu/base.py b/tests/dictionaries_old/70container_files_twice/tiramisu/base.py
new file mode 100644
index 00000000..b41e4ef7
--- /dev/null
+++ b/tests/dictionaries_old/70container_files_twice/tiramisu/base.py
@@ -0,0 +1,34 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="général", children=[option_3], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_8 = FilenameOption(name="name", doc="name", default="/etc/mailname")
+option_9 = BoolOption(name="activate", doc="activate", default=True)
+option_7 = OptionDescription(name="mailname", doc="mailname", children=[option_8, option_9])
+option_7.impl_set_information('source', "mailname")
+option_11 = FilenameOption(name="name", doc="name", default="/etc/eole/mailname")
+option_12 = BoolOption(name="activate", doc="activate", default=True)
+option_10 = OptionDescription(name="mailname_1", doc="mailname_1", children=[option_11, option_12])
+option_10.impl_set_information('source', "mailname")
+option_14 = FilenameOption(name="name", doc="name", default="/rougail.conf")
+option_15 = BoolOption(name="activate", doc="activate", default=True)
+option_13 = OptionDescription(name="rougail_conf", doc="rougail.conf", children=[option_14, option_15])
+option_13.impl_set_information('source', "rougail.conf")
+option_6 = OptionDescription(name="files", doc="files", children=[option_7, option_10, option_13])
+option_16 = BoolOption(name="activate", doc="activate", default=True)
+option_17 = BoolOption(name="manage", doc="manage", default=True)
+option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_16, option_17])
+option_4 = OptionDescription(name="services", doc="services", children=[option_5], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4])
diff --git a/tests/dictionaries_old/70container_filesmulti/00-base.xml b/tests/dictionaries_old/70container_filesmulti/00-base.xml
new file mode 100644
index 00000000..517f4d9d
--- /dev/null
+++ b/tests/dictionaries_old/70container_filesmulti/00-base.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="test">
+      <file>/etc/mailname</file>
+      <file>/etc/mailname2</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>oui</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/70container_filesmulti/__init__.py b/tests/dictionaries_old/70container_filesmulti/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/70container_filesmulti/makedict/after.json b/tests/dictionaries_old/70container_filesmulti/makedict/after.json
new file mode 100644
index 00000000..24097e2e
--- /dev/null
+++ b/tests/dictionaries_old/70container_filesmulti/makedict/after.json
@@ -0,0 +1,30 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "oui"
+    },
+    "services.test.files.mailname.name": {
+        "owner": "default",
+        "value": "/etc/mailname"
+    },
+    "services.test.files.mailname.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.files.mailname2.name": {
+        "owner": "default",
+        "value": "/etc/mailname2"
+    },
+    "services.test.files.mailname2.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/70container_filesmulti/makedict/base.json b/tests/dictionaries_old/70container_filesmulti/makedict/base.json
new file mode 100644
index 00000000..deaab82d
--- /dev/null
+++ b/tests/dictionaries_old/70container_filesmulti/makedict/base.json
@@ -0,0 +1,9 @@
+{
+    "rougail.general.mode_conteneur_actif": "oui",
+    "services.test.files.mailname.name": "/etc/mailname",
+    "services.test.files.mailname.activate": true,
+    "services.test.files.mailname2.name": "/etc/mailname2",
+    "services.test.files.mailname2.activate": true,
+    "services.test.activate": true,
+    "services.test.manage": true
+}
diff --git a/tests/dictionaries_old/70container_filesmulti/makedict/before.json b/tests/dictionaries_old/70container_filesmulti/makedict/before.json
new file mode 100644
index 00000000..24097e2e
--- /dev/null
+++ b/tests/dictionaries_old/70container_filesmulti/makedict/before.json
@@ -0,0 +1,30 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "oui"
+    },
+    "services.test.files.mailname.name": {
+        "owner": "default",
+        "value": "/etc/mailname"
+    },
+    "services.test.files.mailname.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.files.mailname2.name": {
+        "owner": "default",
+        "value": "/etc/mailname2"
+    },
+    "services.test.files.mailname2.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/70container_filesmulti/tiramisu/base.py b/tests/dictionaries_old/70container_filesmulti/tiramisu/base.py
new file mode 100644
index 00000000..6b8c9c9b
--- /dev/null
+++ b/tests/dictionaries_old/70container_filesmulti/tiramisu/base.py
@@ -0,0 +1,30 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="général", children=[option_3], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_8 = FilenameOption(name="name", doc="name", default="/etc/mailname")
+option_9 = BoolOption(name="activate", doc="activate", default=True)
+option_7 = OptionDescription(name="mailname", doc="mailname", children=[option_8, option_9])
+option_7.impl_set_information('source', "mailname")
+option_11 = FilenameOption(name="name", doc="name", default="/etc/mailname2")
+option_12 = BoolOption(name="activate", doc="activate", default=True)
+option_10 = OptionDescription(name="mailname2", doc="mailname2", children=[option_11, option_12])
+option_10.impl_set_information('source', "mailname2")
+option_6 = OptionDescription(name="files", doc="files", children=[option_7, option_10])
+option_13 = BoolOption(name="activate", doc="activate", default=True)
+option_14 = BoolOption(name="manage", doc="manage", default=True)
+option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_13, option_14])
+option_4 = OptionDescription(name="services", doc="services", children=[option_5], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4])
diff --git a/tests/dictionaries_old/70container_filesredefine/00-base.xml b/tests/dictionaries_old/70container_filesredefine/00-base.xml
new file mode 100644
index 00000000..7a9c4c73
--- /dev/null
+++ b/tests/dictionaries_old/70container_filesredefine/00-base.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="test">
+      <file>/etc/mailname</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>oui</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/70container_filesredefine/01-base.xml b/tests/dictionaries_old/70container_filesredefine/01-base.xml
new file mode 100644
index 00000000..185b44d0
--- /dev/null
+++ b/tests/dictionaries_old/70container_filesredefine/01-base.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="test">
+      <file source="mailname.new" redefine="True">/etc/mailname</file>
+    </service>
+  </services>
+</rougail>
diff --git a/tests/dictionaries_old/70container_filesredefine/__init__.py b/tests/dictionaries_old/70container_filesredefine/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/70container_filesredefine/makedict/after.json b/tests/dictionaries_old/70container_filesredefine/makedict/after.json
new file mode 100644
index 00000000..4c4c7f95
--- /dev/null
+++ b/tests/dictionaries_old/70container_filesredefine/makedict/after.json
@@ -0,0 +1,22 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "oui"
+    },
+    "services.test.files.mailname_new.name": {
+        "owner": "default",
+        "value": "/etc/mailname"
+    },
+    "services.test.files.mailname_new.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/70container_filesredefine/makedict/base.json b/tests/dictionaries_old/70container_filesredefine/makedict/base.json
new file mode 100644
index 00000000..c7451841
--- /dev/null
+++ b/tests/dictionaries_old/70container_filesredefine/makedict/base.json
@@ -0,0 +1,7 @@
+{
+    "rougail.general.mode_conteneur_actif": "oui",
+    "services.test.files.mailname_new.name": "/etc/mailname",
+    "services.test.files.mailname_new.activate": true,
+    "services.test.activate": true,
+    "services.test.manage": true
+}
diff --git a/tests/dictionaries_old/70container_filesredefine/makedict/before.json b/tests/dictionaries_old/70container_filesredefine/makedict/before.json
new file mode 100644
index 00000000..4c4c7f95
--- /dev/null
+++ b/tests/dictionaries_old/70container_filesredefine/makedict/before.json
@@ -0,0 +1,22 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "oui"
+    },
+    "services.test.files.mailname_new.name": {
+        "owner": "default",
+        "value": "/etc/mailname"
+    },
+    "services.test.files.mailname_new.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/70container_filesredefine/tiramisu/base.py b/tests/dictionaries_old/70container_filesredefine/tiramisu/base.py
new file mode 100644
index 00000000..6b48225e
--- /dev/null
+++ b/tests/dictionaries_old/70container_filesredefine/tiramisu/base.py
@@ -0,0 +1,26 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="général", children=[option_3], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_8 = FilenameOption(name="name", doc="name", default="/etc/mailname")
+option_9 = BoolOption(name="activate", doc="activate", default=True)
+option_7 = OptionDescription(name="mailname_new", doc="mailname.new", children=[option_8, option_9])
+option_7.impl_set_information('source', "mailname.new")
+option_6 = OptionDescription(name="files", doc="files", children=[option_7])
+option_10 = BoolOption(name="activate", doc="activate", default=True)
+option_11 = BoolOption(name="manage", doc="manage", default=True)
+option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_10, option_11])
+option_4 = OptionDescription(name="services", doc="services", children=[option_5], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4])
diff --git a/tests/dictionaries_old/70container_new/00-base.xml b/tests/dictionaries_old/70container_new/00-base.xml
new file mode 100644
index 00000000..8e6a7e36
--- /dev/null
+++ b/tests/dictionaries_old/70container_new/00-base.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="test">
+        </service>
+  </services>
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>oui</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/70container_new/__init__.py b/tests/dictionaries_old/70container_new/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/70container_new/makedict/after.json b/tests/dictionaries_old/70container_new/makedict/after.json
new file mode 100644
index 00000000..07fda6ef
--- /dev/null
+++ b/tests/dictionaries_old/70container_new/makedict/after.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "oui"
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/70container_new/makedict/base.json b/tests/dictionaries_old/70container_new/makedict/base.json
new file mode 100644
index 00000000..a9753778
--- /dev/null
+++ b/tests/dictionaries_old/70container_new/makedict/base.json
@@ -0,0 +1,5 @@
+{
+    "rougail.general.mode_conteneur_actif": "oui",
+    "services.test.activate": true,
+    "services.test.manage": true
+}
diff --git a/tests/dictionaries_old/70container_new/makedict/before.json b/tests/dictionaries_old/70container_new/makedict/before.json
new file mode 100644
index 00000000..07fda6ef
--- /dev/null
+++ b/tests/dictionaries_old/70container_new/makedict/before.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "oui"
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/70container_new/tiramisu/base.py b/tests/dictionaries_old/70container_new/tiramisu/base.py
new file mode 100644
index 00000000..09c5d721
--- /dev/null
+++ b/tests/dictionaries_old/70container_new/tiramisu/base.py
@@ -0,0 +1,21 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="général", children=[option_3], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_6 = BoolOption(name="activate", doc="activate", default=True)
+option_7 = BoolOption(name="manage", doc="manage", default=True)
+option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_7])
+option_4 = OptionDescription(name="services", doc="services", children=[option_5], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4])
diff --git a/tests/dictionaries_old/70container_newnocont/00-base.xml b/tests/dictionaries_old/70container_newnocont/00-base.xml
new file mode 100644
index 00000000..3cd49c19
--- /dev/null
+++ b/tests/dictionaries_old/70container_newnocont/00-base.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="test">
+        </service>
+  </services>
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/70container_newnocont/__init__.py b/tests/dictionaries_old/70container_newnocont/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/70container_newnocont/makedict/after.json b/tests/dictionaries_old/70container_newnocont/makedict/after.json
new file mode 100644
index 00000000..b7f1fd9e
--- /dev/null
+++ b/tests/dictionaries_old/70container_newnocont/makedict/after.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/70container_newnocont/makedict/base.json b/tests/dictionaries_old/70container_newnocont/makedict/base.json
new file mode 100644
index 00000000..e38686ea
--- /dev/null
+++ b/tests/dictionaries_old/70container_newnocont/makedict/base.json
@@ -0,0 +1,5 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "services.test.activate": true,
+    "services.test.manage": true
+}
diff --git a/tests/dictionaries_old/70container_newnocont/makedict/before.json b/tests/dictionaries_old/70container_newnocont/makedict/before.json
new file mode 100644
index 00000000..b7f1fd9e
--- /dev/null
+++ b/tests/dictionaries_old/70container_newnocont/makedict/before.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/70container_newnocont/tiramisu/base.py b/tests/dictionaries_old/70container_newnocont/tiramisu/base.py
new file mode 100644
index 00000000..34a9ad0e
--- /dev/null
+++ b/tests/dictionaries_old/70container_newnocont/tiramisu/base.py
@@ -0,0 +1,21 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="général", children=[option_3], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_6 = BoolOption(name="activate", doc="activate", default=True)
+option_7 = BoolOption(name="manage", doc="manage", default=True)
+option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_7])
+option_4 = OptionDescription(name="services", doc="services", children=[option_5], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4])
diff --git a/tests/dictionaries_old/70container_newwithip/00-base.xml b/tests/dictionaries_old/70container_newwithip/00-base.xml
new file mode 100644
index 00000000..20d12315
--- /dev/null
+++ b/tests/dictionaries_old/70container_newwithip/00-base.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="test">
+        </service>
+  </services>
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>oui</value>
+      </variable>
+      <variable name="adresse_ip_test" type="ip" description="No change"/>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/70container_newwithip/__init__.py b/tests/dictionaries_old/70container_newwithip/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/70container_newwithip/makedict/after.json b/tests/dictionaries_old/70container_newwithip/makedict/after.json
new file mode 100644
index 00000000..cfa1cc50
--- /dev/null
+++ b/tests/dictionaries_old/70container_newwithip/makedict/after.json
@@ -0,0 +1,18 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "oui"
+    },
+    "rougail.general.adresse_ip_test": {
+        "owner": "default",
+        "value": null
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/70container_newwithip/makedict/base.json b/tests/dictionaries_old/70container_newwithip/makedict/base.json
new file mode 100644
index 00000000..b8740113
--- /dev/null
+++ b/tests/dictionaries_old/70container_newwithip/makedict/base.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": "oui",
+    "rougail.general.adresse_ip_test": null,
+    "services.test.activate": true,
+    "services.test.manage": true
+}
diff --git a/tests/dictionaries_old/70container_newwithip/makedict/before.json b/tests/dictionaries_old/70container_newwithip/makedict/before.json
new file mode 100644
index 00000000..cfa1cc50
--- /dev/null
+++ b/tests/dictionaries_old/70container_newwithip/makedict/before.json
@@ -0,0 +1,18 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "oui"
+    },
+    "rougail.general.adresse_ip_test": {
+        "owner": "default",
+        "value": null
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/70container_newwithip/tiramisu/base.py b/tests/dictionaries_old/70container_newwithip/tiramisu/base.py
new file mode 100644
index 00000000..41c1d6cf
--- /dev/null
+++ b/tests/dictionaries_old/70container_newwithip/tiramisu/base.py
@@ -0,0 +1,22 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_4 = IPOption(name="adresse_ip_test", doc="No change", allow_reserved=True, properties=frozenset({"normal"}))
+option_2 = OptionDescription(name="general", doc="général", children=[option_3, option_4], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_7 = BoolOption(name="activate", doc="activate", default=True)
+option_8 = BoolOption(name="manage", doc="manage", default=True)
+option_6 = OptionDescription(name="test", doc="test", children=[option_7, option_8])
+option_5 = OptionDescription(name="services", doc="services", children=[option_6], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_5])
diff --git a/tests/dictionaries_old/70container_save/00-base.xml b/tests/dictionaries_old/70container_save/00-base.xml
new file mode 100644
index 00000000..ffcda883
--- /dev/null
+++ b/tests/dictionaries_old/70container_save/00-base.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>oui</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/70container_save/__init__.py b/tests/dictionaries_old/70container_save/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/70container_save/makedict/after.json b/tests/dictionaries_old/70container_save/makedict/after.json
new file mode 100644
index 00000000..3a4c0953
--- /dev/null
+++ b/tests/dictionaries_old/70container_save/makedict/after.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "oui"
+    }
+}
diff --git a/tests/dictionaries_old/70container_save/makedict/base.json b/tests/dictionaries_old/70container_save/makedict/base.json
new file mode 100644
index 00000000..50112b17
--- /dev/null
+++ b/tests/dictionaries_old/70container_save/makedict/base.json
@@ -0,0 +1,3 @@
+{
+    "rougail.general.mode_conteneur_actif": "oui"
+}
diff --git a/tests/dictionaries_old/70container_save/makedict/before.json b/tests/dictionaries_old/70container_save/makedict/before.json
new file mode 100644
index 00000000..3a4c0953
--- /dev/null
+++ b/tests/dictionaries_old/70container_save/makedict/before.json
@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "oui"
+    }
+}
diff --git a/tests/dictionaries_old/70container_save/tiramisu/base.py b/tests/dictionaries_old/70container_save/tiramisu/base.py
new file mode 100644
index 00000000..96d39ae0
--- /dev/null
+++ b/tests/dictionaries_old/70container_save/tiramisu/base.py
@@ -0,0 +1,17 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="général", children=[option_3], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
diff --git a/tests/dictionaries_old/70service_base/00-base.xml b/tests/dictionaries_old/70service_base/00-base.xml
new file mode 100644
index 00000000..d82671d7
--- /dev/null
+++ b/tests/dictionaries_old/70service_base/00-base.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="testsrv">
+        </service>
+  </services>
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>oui</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/70service_base/__init__.py b/tests/dictionaries_old/70service_base/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/70service_base/makedict/after.json b/tests/dictionaries_old/70service_base/makedict/after.json
new file mode 100644
index 00000000..c8847b43
--- /dev/null
+++ b/tests/dictionaries_old/70service_base/makedict/after.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "oui"
+    },
+    "services.testsrv.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.testsrv.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/70service_base/makedict/base.json b/tests/dictionaries_old/70service_base/makedict/base.json
new file mode 100644
index 00000000..d89ef3da
--- /dev/null
+++ b/tests/dictionaries_old/70service_base/makedict/base.json
@@ -0,0 +1,5 @@
+{
+    "rougail.general.mode_conteneur_actif": "oui",
+    "services.testsrv.activate": true,
+    "services.testsrv.manage": true
+}
diff --git a/tests/dictionaries_old/70service_base/makedict/before.json b/tests/dictionaries_old/70service_base/makedict/before.json
new file mode 100644
index 00000000..c8847b43
--- /dev/null
+++ b/tests/dictionaries_old/70service_base/makedict/before.json
@@ -0,0 +1,14 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "oui"
+    },
+    "services.testsrv.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.testsrv.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/70service_base/tiramisu/base.py b/tests/dictionaries_old/70service_base/tiramisu/base.py
new file mode 100644
index 00000000..84476b71
--- /dev/null
+++ b/tests/dictionaries_old/70service_base/tiramisu/base.py
@@ -0,0 +1,21 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="général", children=[option_3], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_6 = BoolOption(name="activate", doc="activate", default=True)
+option_7 = BoolOption(name="manage", doc="manage", default=True)
+option_5 = OptionDescription(name="testsrv", doc="testsrv", children=[option_6, option_7])
+option_4 = OptionDescription(name="services", doc="services", children=[option_5], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4])
diff --git a/tests/dictionaries_old/70service_not_managed/00-base.xml b/tests/dictionaries_old/70service_not_managed/00-base.xml
new file mode 100644
index 00000000..cb3e5b5a
--- /dev/null
+++ b/tests/dictionaries_old/70service_not_managed/00-base.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="test" manage="False">
+      <file>/tmp/test</file>
+    </service>
+  </services>
+  <variables>
+    <variable name="var" type="string">
+      <value>mailname</value>
+    </variable>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/70service_not_managed/__init__.py b/tests/dictionaries_old/70service_not_managed/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/70service_not_managed/makedict/after.json b/tests/dictionaries_old/70service_not_managed/makedict/after.json
new file mode 100644
index 00000000..8b3606f3
--- /dev/null
+++ b/tests/dictionaries_old/70service_not_managed/makedict/after.json
@@ -0,0 +1,22 @@
+{
+    "rougail.var": {
+        "owner": "default",
+        "value": "mailname"
+    },
+    "services.test.files.test.name": {
+        "owner": "default",
+        "value": "/tmp/test"
+    },
+    "services.test.files.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": false
+    }
+}
diff --git a/tests/dictionaries_old/70service_not_managed/makedict/base.json b/tests/dictionaries_old/70service_not_managed/makedict/base.json
new file mode 100644
index 00000000..60918376
--- /dev/null
+++ b/tests/dictionaries_old/70service_not_managed/makedict/base.json
@@ -0,0 +1,7 @@
+{
+    "rougail.var": "mailname",
+    "services.test.files.test.name": "/tmp/test",
+    "services.test.files.test.activate": true,
+    "services.test.activate": true,
+    "services.test.manage": false
+}
diff --git a/tests/dictionaries_old/70service_not_managed/makedict/before.json b/tests/dictionaries_old/70service_not_managed/makedict/before.json
new file mode 100644
index 00000000..8b3606f3
--- /dev/null
+++ b/tests/dictionaries_old/70service_not_managed/makedict/before.json
@@ -0,0 +1,22 @@
+{
+    "rougail.var": {
+        "owner": "default",
+        "value": "mailname"
+    },
+    "services.test.files.test.name": {
+        "owner": "default",
+        "value": "/tmp/test"
+    },
+    "services.test.files.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": false
+    }
+}
diff --git a/tests/dictionaries_old/70service_not_managed/tiramisu/base.py b/tests/dictionaries_old/70service_not_managed/tiramisu/base.py
new file mode 100644
index 00000000..7d45ebc1
--- /dev/null
+++ b/tests/dictionaries_old/70service_not_managed/tiramisu/base.py
@@ -0,0 +1,25 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_2 = StrOption(name="var", doc="var", default="mailname", properties=frozenset({"mandatory", "normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_7 = FilenameOption(name="name", doc="name", default="/tmp/test")
+option_8 = BoolOption(name="activate", doc="activate", default=True)
+option_6 = OptionDescription(name="test", doc="test", children=[option_7, option_8])
+option_6.impl_set_information('source', "test")
+option_5 = OptionDescription(name="files", doc="files", children=[option_6])
+option_9 = BoolOption(name="activate", doc="activate", default=True)
+option_10 = BoolOption(name="manage", doc="manage", default=False)
+option_4 = OptionDescription(name="test", doc="test", children=[option_5, option_9, option_10])
+option_3 = OptionDescription(name="services", doc="services", children=[option_4], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_3])
diff --git a/tests/dictionaries_old/70service_servicelist/00-base.xml b/tests/dictionaries_old/70service_servicelist/00-base.xml
new file mode 100644
index 00000000..800cad3c
--- /dev/null
+++ b/tests/dictionaries_old/70service_servicelist/00-base.xml
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="test" servicelist="test">
+        </service>
+  </services>
+  <variables>
+    <variable name="condition">
+      <value>no</value>
+    </variable>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>yes</param>
+      <target type="servicelist">test</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/70service_servicelist/__init__.py b/tests/dictionaries_old/70service_servicelist/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/70service_servicelist/makedict/after.json b/tests/dictionaries_old/70service_servicelist/makedict/after.json
new file mode 100644
index 00000000..70056b4a
--- /dev/null
+++ b/tests/dictionaries_old/70service_servicelist/makedict/after.json
@@ -0,0 +1,14 @@
+{
+    "rougail.condition": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/70service_servicelist/makedict/base.json b/tests/dictionaries_old/70service_servicelist/makedict/base.json
new file mode 100644
index 00000000..939e54eb
--- /dev/null
+++ b/tests/dictionaries_old/70service_servicelist/makedict/base.json
@@ -0,0 +1,5 @@
+{
+    "rougail.condition": "no",
+    "services.test.activate": true,
+    "services.test.manage": true
+}
diff --git a/tests/dictionaries_old/70service_servicelist/makedict/before.json b/tests/dictionaries_old/70service_servicelist/makedict/before.json
new file mode 100644
index 00000000..70056b4a
--- /dev/null
+++ b/tests/dictionaries_old/70service_servicelist/makedict/before.json
@@ -0,0 +1,14 @@
+{
+    "rougail.condition": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/70service_servicelist/tiramisu/base.py b/tests/dictionaries_old/70service_servicelist/tiramisu/base.py
new file mode 100644
index 00000000..ef89c05e
--- /dev/null
+++ b/tests/dictionaries_old/70service_servicelist/tiramisu/base.py
@@ -0,0 +1,20 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_2 = StrOption(name="condition", doc="condition", default="no", properties=frozenset({"mandatory", "normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_5 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_2, notraisepropertyerror=True), 'expected_0': ParamValue("yes")})))
+option_6 = BoolOption(name="manage", doc="manage", default=True)
+option_4 = OptionDescription(name="test", doc="test", children=[option_5, option_6])
+option_3 = OptionDescription(name="services", doc="services", children=[option_4], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_3])
diff --git a/tests/dictionaries_old/70service_servicelist_disabled_if_in/00-base.xml b/tests/dictionaries_old/70service_servicelist_disabled_if_in/00-base.xml
new file mode 100644
index 00000000..8a68f585
--- /dev/null
+++ b/tests/dictionaries_old/70service_servicelist_disabled_if_in/00-base.xml
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="test" servicelist="test">
+        </service>
+  </services>
+  <variables>
+    <variable name="condition1">
+      <value>no</value>
+    </variable>
+    <variable name="condition2">
+      <value>no</value>
+    </variable>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition1">
+      <param>no</param>
+      <target>condition2</target>
+    </condition>
+    <condition name="disabled_if_in" source="condition2">
+      <param>yes</param>
+      <target type="servicelist">test</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/70service_servicelist_disabled_if_in/__init__.py b/tests/dictionaries_old/70service_servicelist_disabled_if_in/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/70service_servicelist_disabled_if_in/makedict/after.json b/tests/dictionaries_old/70service_servicelist_disabled_if_in/makedict/after.json
new file mode 100644
index 00000000..2eba5258
--- /dev/null
+++ b/tests/dictionaries_old/70service_servicelist_disabled_if_in/makedict/after.json
@@ -0,0 +1,14 @@
+{
+    "rougail.condition1": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": false
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/70service_servicelist_disabled_if_in/makedict/base.json b/tests/dictionaries_old/70service_servicelist_disabled_if_in/makedict/base.json
new file mode 100644
index 00000000..e97d9ea7
--- /dev/null
+++ b/tests/dictionaries_old/70service_servicelist_disabled_if_in/makedict/base.json
@@ -0,0 +1,5 @@
+{
+    "rougail.condition1": "no",
+    "services.test.activate": false,
+    "services.test.manage": true
+}
diff --git a/tests/dictionaries_old/70service_servicelist_disabled_if_in/makedict/before.json b/tests/dictionaries_old/70service_servicelist_disabled_if_in/makedict/before.json
new file mode 100644
index 00000000..2eba5258
--- /dev/null
+++ b/tests/dictionaries_old/70service_servicelist_disabled_if_in/makedict/before.json
@@ -0,0 +1,14 @@
+{
+    "rougail.condition1": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": false
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/70service_servicelist_disabled_if_in/tiramisu/base.py b/tests/dictionaries_old/70service_servicelist_disabled_if_in/tiramisu/base.py
new file mode 100644
index 00000000..3bbe733f
--- /dev/null
+++ b/tests/dictionaries_old/70service_servicelist_disabled_if_in/tiramisu/base.py
@@ -0,0 +1,21 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_2 = StrOption(name="condition1", doc="condition1", default="no", properties=frozenset({"mandatory", "normal"}))
+option_3 = StrOption(name="condition2", doc="condition2", default="no", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("no")}))}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_3])
+option_6 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, notraisepropertyerror=True), 'expected_0': ParamValue("yes")})))
+option_7 = BoolOption(name="manage", doc="manage", default=True)
+option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_7])
+option_4 = OptionDescription(name="services", doc="services", children=[option_5], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4])
diff --git a/tests/dictionaries_old/70service_servicelist_file/00-base.xml b/tests/dictionaries_old/70service_servicelist_file/00-base.xml
new file mode 100644
index 00000000..b74620b4
--- /dev/null
+++ b/tests/dictionaries_old/70service_servicelist_file/00-base.xml
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="test" servicelist="test">
+      <file>/etc/file</file>
+    </service>
+  </services>
+  <variables>
+    <variable name="condition">
+      <value>no</value>
+    </variable>
+    <variable name="nut_monitor_host" type="ip" mandatory="True">
+      <value>192.168.0.1</value>
+    </variable>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>no</param>
+      <target type="servicelist">test</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/70service_servicelist_file/__init__.py b/tests/dictionaries_old/70service_servicelist_file/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/70service_servicelist_file/makedict/after.json b/tests/dictionaries_old/70service_servicelist_file/makedict/after.json
new file mode 100644
index 00000000..7fc9693a
--- /dev/null
+++ b/tests/dictionaries_old/70service_servicelist_file/makedict/after.json
@@ -0,0 +1,26 @@
+{
+    "rougail.condition": {
+        "owner": "default",
+        "value": "no"
+    },
+    "rougail.nut_monitor_host": {
+        "owner": "default",
+        "value": "192.168.0.1"
+    },
+    "services.test.files.file.name": {
+        "owner": "default",
+        "value": "/etc/file"
+    },
+    "services.test.files.file.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": false
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/70service_servicelist_file/makedict/base.json b/tests/dictionaries_old/70service_servicelist_file/makedict/base.json
new file mode 100644
index 00000000..8b3252bf
--- /dev/null
+++ b/tests/dictionaries_old/70service_servicelist_file/makedict/base.json
@@ -0,0 +1,8 @@
+{
+    "rougail.condition": "no",
+    "rougail.nut_monitor_host": "192.168.0.1",
+    "services.test.files.file.name": "/etc/file",
+    "services.test.files.file.activate": true,
+    "services.test.activate": false,
+    "services.test.manage": true
+}
diff --git a/tests/dictionaries_old/70service_servicelist_file/makedict/before.json b/tests/dictionaries_old/70service_servicelist_file/makedict/before.json
new file mode 100644
index 00000000..7fc9693a
--- /dev/null
+++ b/tests/dictionaries_old/70service_servicelist_file/makedict/before.json
@@ -0,0 +1,26 @@
+{
+    "rougail.condition": {
+        "owner": "default",
+        "value": "no"
+    },
+    "rougail.nut_monitor_host": {
+        "owner": "default",
+        "value": "192.168.0.1"
+    },
+    "services.test.files.file.name": {
+        "owner": "default",
+        "value": "/etc/file"
+    },
+    "services.test.files.file.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": false
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/70service_servicelist_file/result/systemd/system/test.service b/tests/dictionaries_old/70service_servicelist_file/result/systemd/system/test.service
new file mode 120000
index 00000000..dc1dc0cd
--- /dev/null
+++ b/tests/dictionaries_old/70service_servicelist_file/result/systemd/system/test.service
@@ -0,0 +1 @@
+/dev/null
\ No newline at end of file
diff --git a/tests/dictionaries_old/70service_servicelist_file/result/tmpfiles.d/rougail.conf b/tests/dictionaries_old/70service_servicelist_file/result/tmpfiles.d/rougail.conf
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/70service_servicelist_file/tiramisu/base.py b/tests/dictionaries_old/70service_servicelist_file/tiramisu/base.py
new file mode 100644
index 00000000..17af3ad9
--- /dev/null
+++ b/tests/dictionaries_old/70service_servicelist_file/tiramisu/base.py
@@ -0,0 +1,26 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_2 = StrOption(name="condition", doc="condition", default="no", properties=frozenset({"mandatory", "normal"}))
+option_3 = IPOption(name="nut_monitor_host", doc="nut_monitor_host", default="192.168.0.1", allow_reserved=True, properties=frozenset({"mandatory", "normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_3])
+option_8 = FilenameOption(name="name", doc="name", default="/etc/file")
+option_9 = BoolOption(name="activate", doc="activate", default=True)
+option_7 = OptionDescription(name="file", doc="file", children=[option_8, option_9])
+option_7.impl_set_information('source', "file")
+option_6 = OptionDescription(name="files", doc="files", children=[option_7])
+option_10 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_2, notraisepropertyerror=True), 'expected_0': ParamValue("no")})))
+option_11 = BoolOption(name="manage", doc="manage", default=True)
+option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_10, option_11])
+option_4 = OptionDescription(name="services", doc="services", children=[option_5], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4])
diff --git a/tests/dictionaries_old/70service_servicelist_file/tmpl/file b/tests/dictionaries_old/70service_servicelist_file/tmpl/file
new file mode 100644
index 00000000..7ecb56eb
--- /dev/null
+++ b/tests/dictionaries_old/70service_servicelist_file/tmpl/file
@@ -0,0 +1 @@
+no
diff --git a/tests/dictionaries_old/70service_servicelist_ip/00-base.xml b/tests/dictionaries_old/70service_servicelist_ip/00-base.xml
new file mode 100644
index 00000000..fe7fe748
--- /dev/null
+++ b/tests/dictionaries_old/70service_servicelist_ip/00-base.xml
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="test" servicelist="test">
+      <ip>nut_monitor_host</ip>
+    </service>
+  </services>
+  <variables>
+    <variable name="condition">
+      <value>no</value>
+    </variable>
+    <variable name="nut_monitor_host" type="ip" mandatory="True">
+      <value>192.168.0.1</value>
+    </variable>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>no</param>
+      <target type="servicelist">test</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/70service_servicelist_ip/__init__.py b/tests/dictionaries_old/70service_servicelist_ip/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/70service_servicelist_ip/makedict/after.json b/tests/dictionaries_old/70service_servicelist_ip/makedict/after.json
new file mode 100644
index 00000000..73263cb6
--- /dev/null
+++ b/tests/dictionaries_old/70service_servicelist_ip/makedict/after.json
@@ -0,0 +1,26 @@
+{
+    "rougail.condition": {
+        "owner": "default",
+        "value": "no"
+    },
+    "rougail.nut_monitor_host": {
+        "owner": "default",
+        "value": "192.168.0.1"
+    },
+    "services.test.ip.nut_monitor_host.name": {
+        "owner": "default",
+        "value": "192.168.0.1"
+    },
+    "services.test.ip.nut_monitor_host.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": false
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/70service_servicelist_ip/makedict/base.json b/tests/dictionaries_old/70service_servicelist_ip/makedict/base.json
new file mode 100644
index 00000000..07338b83
--- /dev/null
+++ b/tests/dictionaries_old/70service_servicelist_ip/makedict/base.json
@@ -0,0 +1,8 @@
+{
+    "rougail.condition": "no",
+    "rougail.nut_monitor_host": "192.168.0.1",
+    "services.test.ip.nut_monitor_host.name": "192.168.0.1",
+    "services.test.ip.nut_monitor_host.activate": true,
+    "services.test.activate": false,
+    "services.test.manage": true
+}
diff --git a/tests/dictionaries_old/70service_servicelist_ip/makedict/before.json b/tests/dictionaries_old/70service_servicelist_ip/makedict/before.json
new file mode 100644
index 00000000..73263cb6
--- /dev/null
+++ b/tests/dictionaries_old/70service_servicelist_ip/makedict/before.json
@@ -0,0 +1,26 @@
+{
+    "rougail.condition": {
+        "owner": "default",
+        "value": "no"
+    },
+    "rougail.nut_monitor_host": {
+        "owner": "default",
+        "value": "192.168.0.1"
+    },
+    "services.test.ip.nut_monitor_host.name": {
+        "owner": "default",
+        "value": "192.168.0.1"
+    },
+    "services.test.ip.nut_monitor_host.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": false
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/70service_servicelist_ip/result/systemd/system/test.service b/tests/dictionaries_old/70service_servicelist_ip/result/systemd/system/test.service
new file mode 120000
index 00000000..dc1dc0cd
--- /dev/null
+++ b/tests/dictionaries_old/70service_servicelist_ip/result/systemd/system/test.service
@@ -0,0 +1 @@
+/dev/null
\ No newline at end of file
diff --git a/tests/dictionaries_old/70service_servicelist_ip/result/tmpfiles.d/rougail.conf b/tests/dictionaries_old/70service_servicelist_ip/result/tmpfiles.d/rougail.conf
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/70service_servicelist_ip/tiramisu/base.py b/tests/dictionaries_old/70service_servicelist_ip/tiramisu/base.py
new file mode 100644
index 00000000..c0e08ca4
--- /dev/null
+++ b/tests/dictionaries_old/70service_servicelist_ip/tiramisu/base.py
@@ -0,0 +1,25 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_2 = StrOption(name="condition", doc="condition", default="no", properties=frozenset({"mandatory", "normal"}))
+option_3 = IPOption(name="nut_monitor_host", doc="nut_monitor_host", default="192.168.0.1", allow_reserved=True, properties=frozenset({"mandatory", "normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_3])
+option_8 = SymLinkOption(name="name", opt=option_3)
+option_9 = BoolOption(name="activate", doc="activate", default=True)
+option_7 = OptionDescription(name="nut_monitor_host", doc="nut_monitor_host", children=[option_8, option_9])
+option_6 = OptionDescription(name="ip", doc="ip", children=[option_7])
+option_10 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_2, notraisepropertyerror=True), 'expected_0': ParamValue("no")})))
+option_11 = BoolOption(name="manage", doc="manage", default=True)
+option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_10, option_11])
+option_4 = OptionDescription(name="services", doc="services", children=[option_5], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4])
diff --git a/tests/dictionaries_old/70service_servicelist_not_managed/00-base.xml b/tests/dictionaries_old/70service_servicelist_not_managed/00-base.xml
new file mode 100644
index 00000000..88e0e411
--- /dev/null
+++ b/tests/dictionaries_old/70service_servicelist_not_managed/00-base.xml
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="test" servicelist="test" manage="False">
+        </service>
+  </services>
+  <variables>
+    <variable name="condition">
+      <value>no</value>
+    </variable>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>yes</param>
+      <target type="servicelist">test</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/70service_servicelist_not_managed/__init__.py b/tests/dictionaries_old/70service_servicelist_not_managed/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/70service_servicelist_not_managed/makedict/after.json b/tests/dictionaries_old/70service_servicelist_not_managed/makedict/after.json
new file mode 100644
index 00000000..983c1185
--- /dev/null
+++ b/tests/dictionaries_old/70service_servicelist_not_managed/makedict/after.json
@@ -0,0 +1,14 @@
+{
+    "rougail.condition": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": false
+    }
+}
diff --git a/tests/dictionaries_old/70service_servicelist_not_managed/makedict/base.json b/tests/dictionaries_old/70service_servicelist_not_managed/makedict/base.json
new file mode 100644
index 00000000..14db4b00
--- /dev/null
+++ b/tests/dictionaries_old/70service_servicelist_not_managed/makedict/base.json
@@ -0,0 +1,5 @@
+{
+    "rougail.condition": "no",
+    "services.test.activate": true,
+    "services.test.manage": false
+}
diff --git a/tests/dictionaries_old/70service_servicelist_not_managed/makedict/before.json b/tests/dictionaries_old/70service_servicelist_not_managed/makedict/before.json
new file mode 100644
index 00000000..983c1185
--- /dev/null
+++ b/tests/dictionaries_old/70service_servicelist_not_managed/makedict/before.json
@@ -0,0 +1,14 @@
+{
+    "rougail.condition": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": false
+    }
+}
diff --git a/tests/dictionaries_old/70service_servicelist_not_managed/tiramisu/base.py b/tests/dictionaries_old/70service_servicelist_not_managed/tiramisu/base.py
new file mode 100644
index 00000000..86622e84
--- /dev/null
+++ b/tests/dictionaries_old/70service_servicelist_not_managed/tiramisu/base.py
@@ -0,0 +1,20 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_2 = StrOption(name="condition", doc="condition", default="no", properties=frozenset({"mandatory", "normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_5 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_2, notraisepropertyerror=True), 'expected_0': ParamValue("yes")})))
+option_6 = BoolOption(name="manage", doc="manage", default=False)
+option_4 = OptionDescription(name="test", doc="test", children=[option_5, option_6])
+option_3 = OptionDescription(name="services", doc="services", children=[option_4], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_3])
diff --git a/tests/dictionaries_old/70services_ip/00-base.xml b/tests/dictionaries_old/70services_ip/00-base.xml
new file mode 100644
index 00000000..69c6c09f
--- /dev/null
+++ b/tests/dictionaries_old/70services_ip/00-base.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="nut">
+      <ip>nut_monitor_host</ip>
+    </service>
+  </services>
+  <variables>
+    <variable name="nut_monitor_host" type="ip" mandatory="True">
+      <value>192.168.0.1</value>
+    </variable>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/70services_ip/__init__.py b/tests/dictionaries_old/70services_ip/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/70services_ip/makedict/after.json b/tests/dictionaries_old/70services_ip/makedict/after.json
new file mode 100644
index 00000000..7090ae97
--- /dev/null
+++ b/tests/dictionaries_old/70services_ip/makedict/after.json
@@ -0,0 +1,22 @@
+{
+    "rougail.nut_monitor_host": {
+        "owner": "default",
+        "value": "192.168.0.1"
+    },
+    "services.nut.ip.nut_monitor_host.name": {
+        "owner": "default",
+        "value": "192.168.0.1"
+    },
+    "services.nut.ip.nut_monitor_host.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.nut.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.nut.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/70services_ip/makedict/base.json b/tests/dictionaries_old/70services_ip/makedict/base.json
new file mode 100644
index 00000000..d333bde1
--- /dev/null
+++ b/tests/dictionaries_old/70services_ip/makedict/base.json
@@ -0,0 +1,7 @@
+{
+    "rougail.nut_monitor_host": "192.168.0.1",
+    "services.nut.ip.nut_monitor_host.name": "192.168.0.1",
+    "services.nut.ip.nut_monitor_host.activate": true,
+    "services.nut.activate": true,
+    "services.nut.manage": true
+}
diff --git a/tests/dictionaries_old/70services_ip/makedict/before.json b/tests/dictionaries_old/70services_ip/makedict/before.json
new file mode 100644
index 00000000..7090ae97
--- /dev/null
+++ b/tests/dictionaries_old/70services_ip/makedict/before.json
@@ -0,0 +1,22 @@
+{
+    "rougail.nut_monitor_host": {
+        "owner": "default",
+        "value": "192.168.0.1"
+    },
+    "services.nut.ip.nut_monitor_host.name": {
+        "owner": "default",
+        "value": "192.168.0.1"
+    },
+    "services.nut.ip.nut_monitor_host.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.nut.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.nut.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/70services_ip/result/systemd/system/nut.service.d/rougail_ip.conf b/tests/dictionaries_old/70services_ip/result/systemd/system/nut.service.d/rougail_ip.conf
new file mode 100644
index 00000000..e4f6d8f0
--- /dev/null
+++ b/tests/dictionaries_old/70services_ip/result/systemd/system/nut.service.d/rougail_ip.conf
@@ -0,0 +1,3 @@
+[Service]
+IPAddressAllow=192.168.0.1
+IPAddressDeny=any
diff --git a/tests/dictionaries_old/70services_ip/result/tmpfiles.d/rougail.conf b/tests/dictionaries_old/70services_ip/result/tmpfiles.d/rougail.conf
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/70services_ip/tiramisu/base.py b/tests/dictionaries_old/70services_ip/tiramisu/base.py
new file mode 100644
index 00000000..33b61ad6
--- /dev/null
+++ b/tests/dictionaries_old/70services_ip/tiramisu/base.py
@@ -0,0 +1,24 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_2 = IPOption(name="nut_monitor_host", doc="nut_monitor_host", default="192.168.0.1", allow_reserved=True, properties=frozenset({"mandatory", "normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_7 = SymLinkOption(name="name", opt=option_2)
+option_8 = BoolOption(name="activate", doc="activate", default=True)
+option_6 = OptionDescription(name="nut_monitor_host", doc="nut_monitor_host", children=[option_7, option_8])
+option_5 = OptionDescription(name="ip", doc="ip", children=[option_6])
+option_9 = BoolOption(name="activate", doc="activate", default=True)
+option_10 = BoolOption(name="manage", doc="manage", default=True)
+option_4 = OptionDescription(name="nut", doc="nut", children=[option_5, option_9, option_10])
+option_3 = OptionDescription(name="services", doc="services", children=[option_4], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_3])
diff --git a/tests/dictionaries_old/70services_ip_cidr/00-base.xml b/tests/dictionaries_old/70services_ip_cidr/00-base.xml
new file mode 100644
index 00000000..05fe7012
--- /dev/null
+++ b/tests/dictionaries_old/70services_ip_cidr/00-base.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="nut">
+      <ip>nut_monitor_host</ip>
+    </service>
+  </services>
+  <variables>
+    <variable name="nut_monitor_host" type="network_cidr" mandatory="True">
+      <value>192.168.0.0/24</value>
+    </variable>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/70services_ip_cidr/__init__.py b/tests/dictionaries_old/70services_ip_cidr/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/70services_ip_cidr/makedict/after.json b/tests/dictionaries_old/70services_ip_cidr/makedict/after.json
new file mode 100644
index 00000000..f9eedc89
--- /dev/null
+++ b/tests/dictionaries_old/70services_ip_cidr/makedict/after.json
@@ -0,0 +1,22 @@
+{
+    "rougail.nut_monitor_host": {
+        "owner": "default",
+        "value": "192.168.0.0/24"
+    },
+    "services.nut.ip.nut_monitor_host.name": {
+        "owner": "default",
+        "value": "192.168.0.0/24"
+    },
+    "services.nut.ip.nut_monitor_host.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.nut.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.nut.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/70services_ip_cidr/makedict/base.json b/tests/dictionaries_old/70services_ip_cidr/makedict/base.json
new file mode 100644
index 00000000..9097e24c
--- /dev/null
+++ b/tests/dictionaries_old/70services_ip_cidr/makedict/base.json
@@ -0,0 +1,7 @@
+{
+    "rougail.nut_monitor_host": "192.168.0.0/24",
+    "services.nut.ip.nut_monitor_host.name": "192.168.0.0/24",
+    "services.nut.ip.nut_monitor_host.activate": true,
+    "services.nut.activate": true,
+    "services.nut.manage": true
+}
diff --git a/tests/dictionaries_old/70services_ip_cidr/makedict/before.json b/tests/dictionaries_old/70services_ip_cidr/makedict/before.json
new file mode 100644
index 00000000..f9eedc89
--- /dev/null
+++ b/tests/dictionaries_old/70services_ip_cidr/makedict/before.json
@@ -0,0 +1,22 @@
+{
+    "rougail.nut_monitor_host": {
+        "owner": "default",
+        "value": "192.168.0.0/24"
+    },
+    "services.nut.ip.nut_monitor_host.name": {
+        "owner": "default",
+        "value": "192.168.0.0/24"
+    },
+    "services.nut.ip.nut_monitor_host.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.nut.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.nut.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/70services_ip_cidr/result/systemd/system/nut.service.d/rougail_ip.conf b/tests/dictionaries_old/70services_ip_cidr/result/systemd/system/nut.service.d/rougail_ip.conf
new file mode 100644
index 00000000..e1cb437d
--- /dev/null
+++ b/tests/dictionaries_old/70services_ip_cidr/result/systemd/system/nut.service.d/rougail_ip.conf
@@ -0,0 +1,3 @@
+[Service]
+IPAddressAllow=192.168.0.0/24
+IPAddressDeny=any
diff --git a/tests/dictionaries_old/70services_ip_cidr/result/tmpfiles.d/rougail.conf b/tests/dictionaries_old/70services_ip_cidr/result/tmpfiles.d/rougail.conf
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/70services_ip_cidr/tiramisu/base.py b/tests/dictionaries_old/70services_ip_cidr/tiramisu/base.py
new file mode 100644
index 00000000..1f5ca44d
--- /dev/null
+++ b/tests/dictionaries_old/70services_ip_cidr/tiramisu/base.py
@@ -0,0 +1,24 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_2 = NetworkOption(name="nut_monitor_host", doc="nut_monitor_host", default="192.168.0.0/24", cidr=True, properties=frozenset({"mandatory", "normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_7 = SymLinkOption(name="name", opt=option_2)
+option_8 = BoolOption(name="activate", doc="activate", default=True)
+option_6 = OptionDescription(name="nut_monitor_host", doc="nut_monitor_host", children=[option_7, option_8])
+option_5 = OptionDescription(name="ip", doc="ip", children=[option_6])
+option_9 = BoolOption(name="activate", doc="activate", default=True)
+option_10 = BoolOption(name="manage", doc="manage", default=True)
+option_4 = OptionDescription(name="nut", doc="nut", children=[option_5, option_9, option_10])
+option_3 = OptionDescription(name="services", doc="services", children=[option_4], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_3])
diff --git a/tests/dictionaries_old/70services_ip_disabled/00-base.xml b/tests/dictionaries_old/70services_ip_disabled/00-base.xml
new file mode 100644
index 00000000..5e39f5f0
--- /dev/null
+++ b/tests/dictionaries_old/70services_ip_disabled/00-base.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="nut">
+      <ip>nut_monitor_host</ip>
+    </service>
+  </services>
+  <variables>
+    <variable name="nut_monitor_host" type="ip" mandatory="True" disabled="True">
+      <value>192.168.0.1</value>
+    </variable>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/70services_ip_disabled/__init__.py b/tests/dictionaries_old/70services_ip_disabled/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/70services_ip_disabled/makedict/after.json b/tests/dictionaries_old/70services_ip_disabled/makedict/after.json
new file mode 100644
index 00000000..f74a308d
--- /dev/null
+++ b/tests/dictionaries_old/70services_ip_disabled/makedict/after.json
@@ -0,0 +1,14 @@
+{
+    "services.nut.ip.nut_monitor_host.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.nut.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.nut.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/70services_ip_disabled/makedict/base.json b/tests/dictionaries_old/70services_ip_disabled/makedict/base.json
new file mode 100644
index 00000000..552126f5
--- /dev/null
+++ b/tests/dictionaries_old/70services_ip_disabled/makedict/base.json
@@ -0,0 +1,5 @@
+{
+    "services.nut.ip.nut_monitor_host.activate": true,
+    "services.nut.activate": true,
+    "services.nut.manage": true
+}
diff --git a/tests/dictionaries_old/70services_ip_disabled/makedict/before.json b/tests/dictionaries_old/70services_ip_disabled/makedict/before.json
new file mode 100644
index 00000000..f74a308d
--- /dev/null
+++ b/tests/dictionaries_old/70services_ip_disabled/makedict/before.json
@@ -0,0 +1,14 @@
+{
+    "services.nut.ip.nut_monitor_host.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.nut.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.nut.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/70services_ip_disabled/result/systemd/system/nut.service.d/rougail_ip.conf b/tests/dictionaries_old/70services_ip_disabled/result/systemd/system/nut.service.d/rougail_ip.conf
new file mode 100644
index 00000000..9c0580a9
--- /dev/null
+++ b/tests/dictionaries_old/70services_ip_disabled/result/systemd/system/nut.service.d/rougail_ip.conf
@@ -0,0 +1,2 @@
+[Service]
+IPAddressDeny=any
diff --git a/tests/dictionaries_old/70services_ip_disabled/result/tmpfiles.d/rougail.conf b/tests/dictionaries_old/70services_ip_disabled/result/tmpfiles.d/rougail.conf
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/70services_ip_disabled/tiramisu/base.py b/tests/dictionaries_old/70services_ip_disabled/tiramisu/base.py
new file mode 100644
index 00000000..fafb6505
--- /dev/null
+++ b/tests/dictionaries_old/70services_ip_disabled/tiramisu/base.py
@@ -0,0 +1,24 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_2 = IPOption(name="nut_monitor_host", doc="nut_monitor_host", default="192.168.0.1", allow_reserved=True, properties=frozenset({"disabled", "mandatory", "normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_7 = SymLinkOption(name="name", opt=option_2)
+option_8 = BoolOption(name="activate", doc="activate", default=True)
+option_6 = OptionDescription(name="nut_monitor_host", doc="nut_monitor_host", children=[option_7, option_8])
+option_5 = OptionDescription(name="ip", doc="ip", children=[option_6])
+option_9 = BoolOption(name="activate", doc="activate", default=True)
+option_10 = BoolOption(name="manage", doc="manage", default=True)
+option_4 = OptionDescription(name="nut", doc="nut", children=[option_5, option_9, option_10])
+option_3 = OptionDescription(name="services", doc="services", children=[option_4], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_3])
diff --git a/tests/dictionaries_old/70services_ip_iplist/00-base.xml b/tests/dictionaries_old/70services_ip_iplist/00-base.xml
new file mode 100644
index 00000000..d3c5f4bc
--- /dev/null
+++ b/tests/dictionaries_old/70services_ip_iplist/00-base.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="nut">
+      <ip iplist="example">nut_monitor_host</ip>
+    </service>
+  </services>
+  <variables>
+    <variable name="condition">
+      <value>no</value>
+    </variable>
+    <variable name="nut_monitor_host" type="network_cidr" mandatory="True">
+      <value>192.168.0.0/24</value>
+    </variable>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>yes</param>
+      <target type="iplist">example</target>
+      <target>nut_monitor_host</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/70services_ip_iplist/__init__.py b/tests/dictionaries_old/70services_ip_iplist/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/70services_ip_iplist/makedict/after.json b/tests/dictionaries_old/70services_ip_iplist/makedict/after.json
new file mode 100644
index 00000000..e182cf46
--- /dev/null
+++ b/tests/dictionaries_old/70services_ip_iplist/makedict/after.json
@@ -0,0 +1,26 @@
+{
+    "rougail.condition": {
+        "owner": "default",
+        "value": "no"
+    },
+    "rougail.nut_monitor_host": {
+        "owner": "default",
+        "value": "192.168.0.0/24"
+    },
+    "services.nut.ip.nut_monitor_host.name": {
+        "owner": "default",
+        "value": "192.168.0.0/24"
+    },
+    "services.nut.ip.nut_monitor_host.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.nut.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.nut.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/70services_ip_iplist/makedict/base.json b/tests/dictionaries_old/70services_ip_iplist/makedict/base.json
new file mode 100644
index 00000000..8c62d10b
--- /dev/null
+++ b/tests/dictionaries_old/70services_ip_iplist/makedict/base.json
@@ -0,0 +1,8 @@
+{
+    "rougail.condition": "no",
+    "rougail.nut_monitor_host": "192.168.0.0/24",
+    "services.nut.ip.nut_monitor_host.name": "192.168.0.0/24",
+    "services.nut.ip.nut_monitor_host.activate": true,
+    "services.nut.activate": true,
+    "services.nut.manage": true
+}
diff --git a/tests/dictionaries_old/70services_ip_iplist/makedict/before.json b/tests/dictionaries_old/70services_ip_iplist/makedict/before.json
new file mode 100644
index 00000000..e182cf46
--- /dev/null
+++ b/tests/dictionaries_old/70services_ip_iplist/makedict/before.json
@@ -0,0 +1,26 @@
+{
+    "rougail.condition": {
+        "owner": "default",
+        "value": "no"
+    },
+    "rougail.nut_monitor_host": {
+        "owner": "default",
+        "value": "192.168.0.0/24"
+    },
+    "services.nut.ip.nut_monitor_host.name": {
+        "owner": "default",
+        "value": "192.168.0.0/24"
+    },
+    "services.nut.ip.nut_monitor_host.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.nut.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.nut.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/70services_ip_iplist/result/systemd/system/nut.service.d/rougail_ip.conf b/tests/dictionaries_old/70services_ip_iplist/result/systemd/system/nut.service.d/rougail_ip.conf
new file mode 100644
index 00000000..e1cb437d
--- /dev/null
+++ b/tests/dictionaries_old/70services_ip_iplist/result/systemd/system/nut.service.d/rougail_ip.conf
@@ -0,0 +1,3 @@
+[Service]
+IPAddressAllow=192.168.0.0/24
+IPAddressDeny=any
diff --git a/tests/dictionaries_old/70services_ip_iplist/result/tmpfiles.d/rougail.conf b/tests/dictionaries_old/70services_ip_iplist/result/tmpfiles.d/rougail.conf
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/70services_ip_iplist/tiramisu/base.py b/tests/dictionaries_old/70services_ip_iplist/tiramisu/base.py
new file mode 100644
index 00000000..d2f61d0e
--- /dev/null
+++ b/tests/dictionaries_old/70services_ip_iplist/tiramisu/base.py
@@ -0,0 +1,25 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_2 = StrOption(name="condition", doc="condition", default="no", properties=frozenset({"mandatory", "normal"}))
+option_3 = NetworkOption(name="nut_monitor_host", doc="nut_monitor_host", default="192.168.0.0/24", cidr=True, properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("yes")}))}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_3])
+option_8 = SymLinkOption(name="name", opt=option_3)
+option_9 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_2, notraisepropertyerror=True), 'expected_0': ParamValue("yes")})))
+option_7 = OptionDescription(name="nut_monitor_host", doc="nut_monitor_host", children=[option_8, option_9])
+option_6 = OptionDescription(name="ip", doc="ip", children=[option_7])
+option_10 = BoolOption(name="activate", doc="activate", default=True)
+option_11 = BoolOption(name="manage", doc="manage", default=True)
+option_5 = OptionDescription(name="nut", doc="nut", children=[option_6, option_10, option_11])
+option_4 = OptionDescription(name="services", doc="services", children=[option_5], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4])
diff --git a/tests/dictionaries_old/70services_ip_iplist2/00-base.xml b/tests/dictionaries_old/70services_ip_iplist2/00-base.xml
new file mode 100644
index 00000000..b98a7836
--- /dev/null
+++ b/tests/dictionaries_old/70services_ip_iplist2/00-base.xml
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="nut">
+      <ip iplist="example">nut_monitor_host</ip>
+    </service>
+  </services>
+  <variables>
+    <variable name="condition">
+      <value>yes</value>
+    </variable>
+    <variable name="nut_monitor_host" type="network_cidr" mandatory="True">
+      <value>192.168.0.0/24</value>
+    </variable>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>yes</param>
+      <target type="iplist">example</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/70services_ip_iplist2/__init__.py b/tests/dictionaries_old/70services_ip_iplist2/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/70services_ip_iplist2/makedict/after.json b/tests/dictionaries_old/70services_ip_iplist2/makedict/after.json
new file mode 100644
index 00000000..75059141
--- /dev/null
+++ b/tests/dictionaries_old/70services_ip_iplist2/makedict/after.json
@@ -0,0 +1,26 @@
+{
+    "rougail.condition": {
+        "owner": "default",
+        "value": "yes"
+    },
+    "rougail.nut_monitor_host": {
+        "owner": "default",
+        "value": "192.168.0.0/24"
+    },
+    "services.nut.ip.nut_monitor_host.name": {
+        "owner": "default",
+        "value": "192.168.0.0/24"
+    },
+    "services.nut.ip.nut_monitor_host.activate": {
+        "owner": "default",
+        "value": false
+    },
+    "services.nut.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.nut.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/70services_ip_iplist2/makedict/base.json b/tests/dictionaries_old/70services_ip_iplist2/makedict/base.json
new file mode 100644
index 00000000..8c1cc4a7
--- /dev/null
+++ b/tests/dictionaries_old/70services_ip_iplist2/makedict/base.json
@@ -0,0 +1,8 @@
+{
+    "rougail.condition": "yes",
+    "rougail.nut_monitor_host": "192.168.0.0/24",
+    "services.nut.ip.nut_monitor_host.name": "192.168.0.0/24",
+    "services.nut.ip.nut_monitor_host.activate": false,
+    "services.nut.activate": true,
+    "services.nut.manage": true
+}
diff --git a/tests/dictionaries_old/70services_ip_iplist2/makedict/before.json b/tests/dictionaries_old/70services_ip_iplist2/makedict/before.json
new file mode 100644
index 00000000..75059141
--- /dev/null
+++ b/tests/dictionaries_old/70services_ip_iplist2/makedict/before.json
@@ -0,0 +1,26 @@
+{
+    "rougail.condition": {
+        "owner": "default",
+        "value": "yes"
+    },
+    "rougail.nut_monitor_host": {
+        "owner": "default",
+        "value": "192.168.0.0/24"
+    },
+    "services.nut.ip.nut_monitor_host.name": {
+        "owner": "default",
+        "value": "192.168.0.0/24"
+    },
+    "services.nut.ip.nut_monitor_host.activate": {
+        "owner": "default",
+        "value": false
+    },
+    "services.nut.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.nut.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/70services_ip_iplist2/result/tmpfiles.d/rougail.conf b/tests/dictionaries_old/70services_ip_iplist2/result/tmpfiles.d/rougail.conf
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/70services_ip_iplist2/tiramisu/base.py b/tests/dictionaries_old/70services_ip_iplist2/tiramisu/base.py
new file mode 100644
index 00000000..2473f86a
--- /dev/null
+++ b/tests/dictionaries_old/70services_ip_iplist2/tiramisu/base.py
@@ -0,0 +1,25 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_2 = StrOption(name="condition", doc="condition", default="yes", properties=frozenset({"mandatory", "normal"}))
+option_3 = NetworkOption(name="nut_monitor_host", doc="nut_monitor_host", default="192.168.0.0/24", cidr=True, properties=frozenset({"mandatory", "normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_3])
+option_8 = SymLinkOption(name="name", opt=option_3)
+option_9 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_2, notraisepropertyerror=True), 'expected_0': ParamValue("yes")})))
+option_7 = OptionDescription(name="nut_monitor_host", doc="nut_monitor_host", children=[option_8, option_9])
+option_6 = OptionDescription(name="ip", doc="ip", children=[option_7])
+option_10 = BoolOption(name="activate", doc="activate", default=True)
+option_11 = BoolOption(name="manage", doc="manage", default=True)
+option_5 = OptionDescription(name="nut", doc="nut", children=[option_6, option_10, option_11])
+option_4 = OptionDescription(name="services", doc="services", children=[option_5], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4])
diff --git a/tests/dictionaries_old/70services_ip_leadership/00-base.xml b/tests/dictionaries_old/70services_ip_leadership/00-base.xml
new file mode 100644
index 00000000..3e45a5a3
--- /dev/null
+++ b/tests/dictionaries_old/70services_ip_leadership/00-base.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="ntp">
+      <ip netmask="nut_monitor_netmask">nut_monitor_host</ip>
+    </service>
+  </services>
+  <variables>
+    <family name="general" description="général">
+      <variable name="nut_monitor_netmask" type="netmask" mandatory="True" multi="True">
+        <value>255.255.255.0</value>
+      </variable>
+      <variable name="nut_monitor_host" type="network" mandatory="True">
+        <value>192.168.1.0</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <group leader="nut_monitor_netmask">
+      <follower>nut_monitor_host</follower>
+    </group>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/70services_ip_leadership/__init__.py b/tests/dictionaries_old/70services_ip_leadership/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/70services_ip_leadership/makedict/after.json b/tests/dictionaries_old/70services_ip_leadership/makedict/after.json
new file mode 100644
index 00000000..5a0141a7
--- /dev/null
+++ b/tests/dictionaries_old/70services_ip_leadership/makedict/after.json
@@ -0,0 +1,42 @@
+{
+    "rougail.general.nut_monitor_netmask.nut_monitor_netmask": {
+        "owner": "default",
+        "value": [
+            "255.255.255.0"
+        ]
+    },
+    "rougail.general.nut_monitor_netmask.nut_monitor_host": {
+        "owner": [
+            "default"
+        ],
+        "value": [
+            "192.168.1.0"
+        ]
+    },
+    "services.ntp.ip.nut_monitor_host.name": {
+        "owner": [
+            "default"
+        ],
+        "value": [
+            "192.168.1.0"
+        ]
+    },
+    "services.ntp.ip.nut_monitor_host.netmask": {
+        "owner": "default",
+        "value": [
+            "255.255.255.0"
+        ]
+    },
+    "services.ntp.ip.nut_monitor_host.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.ntp.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.ntp.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/70services_ip_leadership/makedict/base.json b/tests/dictionaries_old/70services_ip_leadership/makedict/base.json
new file mode 100644
index 00000000..af10e88a
--- /dev/null
+++ b/tests/dictionaries_old/70services_ip_leadership/makedict/base.json
@@ -0,0 +1,17 @@
+{
+    "rougail.general.nut_monitor_netmask.nut_monitor_netmask": [
+        {
+            "rougail.general.nut_monitor_netmask.nut_monitor_netmask": "255.255.255.0",
+            "rougail.general.nut_monitor_netmask.nut_monitor_host": "192.168.1.0"
+        }
+    ],
+    "services.ntp.ip.nut_monitor_host.name": [
+        "192.168.1.0"
+    ],
+    "services.ntp.ip.nut_monitor_host.netmask": [
+        "255.255.255.0"
+    ],
+    "services.ntp.ip.nut_monitor_host.activate": true,
+    "services.ntp.activate": true,
+    "services.ntp.manage": true
+}
diff --git a/tests/dictionaries_old/70services_ip_leadership/makedict/before.json b/tests/dictionaries_old/70services_ip_leadership/makedict/before.json
new file mode 100644
index 00000000..5a0141a7
--- /dev/null
+++ b/tests/dictionaries_old/70services_ip_leadership/makedict/before.json
@@ -0,0 +1,42 @@
+{
+    "rougail.general.nut_monitor_netmask.nut_monitor_netmask": {
+        "owner": "default",
+        "value": [
+            "255.255.255.0"
+        ]
+    },
+    "rougail.general.nut_monitor_netmask.nut_monitor_host": {
+        "owner": [
+            "default"
+        ],
+        "value": [
+            "192.168.1.0"
+        ]
+    },
+    "services.ntp.ip.nut_monitor_host.name": {
+        "owner": [
+            "default"
+        ],
+        "value": [
+            "192.168.1.0"
+        ]
+    },
+    "services.ntp.ip.nut_monitor_host.netmask": {
+        "owner": "default",
+        "value": [
+            "255.255.255.0"
+        ]
+    },
+    "services.ntp.ip.nut_monitor_host.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.ntp.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.ntp.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/70services_ip_leadership/result/systemd/system/ntp.service.d/rougail_ip.conf b/tests/dictionaries_old/70services_ip_leadership/result/systemd/system/ntp.service.d/rougail_ip.conf
new file mode 100644
index 00000000..d330de8d
--- /dev/null
+++ b/tests/dictionaries_old/70services_ip_leadership/result/systemd/system/ntp.service.d/rougail_ip.conf
@@ -0,0 +1,3 @@
+[Service]
+IPAddressAllow=192.168.1.0/24
+IPAddressDeny=any
diff --git a/tests/dictionaries_old/70services_ip_leadership/result/tmpfiles.d/rougail.conf b/tests/dictionaries_old/70services_ip_leadership/result/tmpfiles.d/rougail.conf
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/70services_ip_leadership/tiramisu/base.py b/tests/dictionaries_old/70services_ip_leadership/tiramisu/base.py
new file mode 100644
index 00000000..94ae54e7
--- /dev/null
+++ b/tests/dictionaries_old/70services_ip_leadership/tiramisu/base.py
@@ -0,0 +1,28 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_4 = NetmaskOption(name="nut_monitor_netmask", doc="nut_monitor_netmask", multi=True, default=['255.255.255.0'], properties=frozenset({"mandatory"}))
+option_5 = NetworkOption(name="nut_monitor_host", doc="nut_monitor_host", multi=True, default_multi="192.168.1.0", properties=frozenset({"mandatory", "normal"}))
+option_3 = Leadership(name="nut_monitor_netmask", doc="nut_monitor_netmask", children=[option_4, option_5], properties=frozenset({"normal"}))
+option_2 = OptionDescription(name="general", doc="général", children=[option_3], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_10 = SymLinkOption(name="name", opt=option_5)
+option_11 = SymLinkOption(name="netmask", opt=option_4)
+option_12 = BoolOption(name="activate", doc="activate", default=True)
+option_9 = OptionDescription(name="nut_monitor_host", doc="nut_monitor_host", children=[option_10, option_11, option_12])
+option_8 = OptionDescription(name="ip", doc="ip", children=[option_9])
+option_13 = BoolOption(name="activate", doc="activate", default=True)
+option_14 = BoolOption(name="manage", doc="manage", default=True)
+option_7 = OptionDescription(name="ntp", doc="ntp", children=[option_8, option_13, option_14])
+option_6 = OptionDescription(name="services", doc="services", children=[option_7], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_6])
diff --git a/tests/dictionaries_old/70services_ip_multi/00-base.xml b/tests/dictionaries_old/70services_ip_multi/00-base.xml
new file mode 100644
index 00000000..0861344e
--- /dev/null
+++ b/tests/dictionaries_old/70services_ip_multi/00-base.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="nut">
+      <ip>nut_monitor_host</ip>
+    </service>
+  </services>
+  <variables>
+    <variable name="nut_monitor_host" type="ip" mandatory="True" multi="True">
+      <value>192.168.0.1</value>
+      <value>192.168.0.2</value>
+    </variable>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/70services_ip_multi/__init__.py b/tests/dictionaries_old/70services_ip_multi/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/70services_ip_multi/makedict/after.json b/tests/dictionaries_old/70services_ip_multi/makedict/after.json
new file mode 100644
index 00000000..c8561374
--- /dev/null
+++ b/tests/dictionaries_old/70services_ip_multi/makedict/after.json
@@ -0,0 +1,28 @@
+{
+    "rougail.nut_monitor_host": {
+        "owner": "default",
+        "value": [
+            "192.168.0.1",
+            "192.168.0.2"
+        ]
+    },
+    "services.nut.ip.nut_monitor_host.name": {
+        "owner": "default",
+        "value": [
+            "192.168.0.1",
+            "192.168.0.2"
+        ]
+    },
+    "services.nut.ip.nut_monitor_host.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.nut.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.nut.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/70services_ip_multi/makedict/base.json b/tests/dictionaries_old/70services_ip_multi/makedict/base.json
new file mode 100644
index 00000000..9e7241f3
--- /dev/null
+++ b/tests/dictionaries_old/70services_ip_multi/makedict/base.json
@@ -0,0 +1,13 @@
+{
+    "rougail.nut_monitor_host": [
+        "192.168.0.1",
+        "192.168.0.2"
+    ],
+    "services.nut.ip.nut_monitor_host.name": [
+        "192.168.0.1",
+        "192.168.0.2"
+    ],
+    "services.nut.ip.nut_monitor_host.activate": true,
+    "services.nut.activate": true,
+    "services.nut.manage": true
+}
diff --git a/tests/dictionaries_old/70services_ip_multi/makedict/before.json b/tests/dictionaries_old/70services_ip_multi/makedict/before.json
new file mode 100644
index 00000000..c8561374
--- /dev/null
+++ b/tests/dictionaries_old/70services_ip_multi/makedict/before.json
@@ -0,0 +1,28 @@
+{
+    "rougail.nut_monitor_host": {
+        "owner": "default",
+        "value": [
+            "192.168.0.1",
+            "192.168.0.2"
+        ]
+    },
+    "services.nut.ip.nut_monitor_host.name": {
+        "owner": "default",
+        "value": [
+            "192.168.0.1",
+            "192.168.0.2"
+        ]
+    },
+    "services.nut.ip.nut_monitor_host.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.nut.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.nut.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/70services_ip_multi/result/systemd/system/nut.service.d/rougail_ip.conf b/tests/dictionaries_old/70services_ip_multi/result/systemd/system/nut.service.d/rougail_ip.conf
new file mode 100644
index 00000000..c1dc1968
--- /dev/null
+++ b/tests/dictionaries_old/70services_ip_multi/result/systemd/system/nut.service.d/rougail_ip.conf
@@ -0,0 +1,4 @@
+[Service]
+IPAddressAllow=192.168.0.1
+IPAddressAllow=192.168.0.2
+IPAddressDeny=any
diff --git a/tests/dictionaries_old/70services_ip_multi/result/tmpfiles.d/rougail.conf b/tests/dictionaries_old/70services_ip_multi/result/tmpfiles.d/rougail.conf
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/70services_ip_multi/tiramisu/base.py b/tests/dictionaries_old/70services_ip_multi/tiramisu/base.py
new file mode 100644
index 00000000..e4c17c0c
--- /dev/null
+++ b/tests/dictionaries_old/70services_ip_multi/tiramisu/base.py
@@ -0,0 +1,24 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_2 = IPOption(name="nut_monitor_host", doc="nut_monitor_host", multi=True, default=['192.168.0.1', '192.168.0.2'], default_multi="192.168.0.1", allow_reserved=True, properties=frozenset({"mandatory", "normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_7 = SymLinkOption(name="name", opt=option_2)
+option_8 = BoolOption(name="activate", doc="activate", default=True)
+option_6 = OptionDescription(name="nut_monitor_host", doc="nut_monitor_host", children=[option_7, option_8])
+option_5 = OptionDescription(name="ip", doc="ip", children=[option_6])
+option_9 = BoolOption(name="activate", doc="activate", default=True)
+option_10 = BoolOption(name="manage", doc="manage", default=True)
+option_4 = OptionDescription(name="nut", doc="nut", children=[option_5, option_9, option_10])
+option_3 = OptionDescription(name="services", doc="services", children=[option_4], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_3])
diff --git a/tests/dictionaries_old/70services_ip_network/00-base.xml b/tests/dictionaries_old/70services_ip_network/00-base.xml
new file mode 100644
index 00000000..b0c23c63
--- /dev/null
+++ b/tests/dictionaries_old/70services_ip_network/00-base.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="nut">
+      <ip netmask="nut_monitor_netmask">nut_monitor_host</ip>
+    </service>
+  </services>
+  <variables>
+    <variable name="nut_monitor_netmask" type="netmask" mandatory="True">
+      <value>255.255.255.0</value>
+    </variable>
+    <variable name="nut_monitor_host" type="network" mandatory="True">
+      <value>192.168.0.0</value>
+    </variable>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/70services_ip_network/__init__.py b/tests/dictionaries_old/70services_ip_network/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/70services_ip_network/makedict/after.json b/tests/dictionaries_old/70services_ip_network/makedict/after.json
new file mode 100644
index 00000000..64270526
--- /dev/null
+++ b/tests/dictionaries_old/70services_ip_network/makedict/after.json
@@ -0,0 +1,30 @@
+{
+    "rougail.nut_monitor_netmask": {
+        "owner": "default",
+        "value": "255.255.255.0"
+    },
+    "rougail.nut_monitor_host": {
+        "owner": "default",
+        "value": "192.168.0.0"
+    },
+    "services.nut.ip.nut_monitor_host.name": {
+        "owner": "default",
+        "value": "192.168.0.0"
+    },
+    "services.nut.ip.nut_monitor_host.netmask": {
+        "owner": "default",
+        "value": "255.255.255.0"
+    },
+    "services.nut.ip.nut_monitor_host.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.nut.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.nut.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/70services_ip_network/makedict/base.json b/tests/dictionaries_old/70services_ip_network/makedict/base.json
new file mode 100644
index 00000000..dc76fb00
--- /dev/null
+++ b/tests/dictionaries_old/70services_ip_network/makedict/base.json
@@ -0,0 +1,9 @@
+{
+    "rougail.nut_monitor_netmask": "255.255.255.0",
+    "rougail.nut_monitor_host": "192.168.0.0",
+    "services.nut.ip.nut_monitor_host.name": "192.168.0.0",
+    "services.nut.ip.nut_monitor_host.netmask": "255.255.255.0",
+    "services.nut.ip.nut_monitor_host.activate": true,
+    "services.nut.activate": true,
+    "services.nut.manage": true
+}
diff --git a/tests/dictionaries_old/70services_ip_network/makedict/before.json b/tests/dictionaries_old/70services_ip_network/makedict/before.json
new file mode 100644
index 00000000..64270526
--- /dev/null
+++ b/tests/dictionaries_old/70services_ip_network/makedict/before.json
@@ -0,0 +1,30 @@
+{
+    "rougail.nut_monitor_netmask": {
+        "owner": "default",
+        "value": "255.255.255.0"
+    },
+    "rougail.nut_monitor_host": {
+        "owner": "default",
+        "value": "192.168.0.0"
+    },
+    "services.nut.ip.nut_monitor_host.name": {
+        "owner": "default",
+        "value": "192.168.0.0"
+    },
+    "services.nut.ip.nut_monitor_host.netmask": {
+        "owner": "default",
+        "value": "255.255.255.0"
+    },
+    "services.nut.ip.nut_monitor_host.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.nut.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.nut.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/70services_ip_network/result/systemd/system/nut.service.d/rougail_ip.conf b/tests/dictionaries_old/70services_ip_network/result/systemd/system/nut.service.d/rougail_ip.conf
new file mode 100644
index 00000000..e1cb437d
--- /dev/null
+++ b/tests/dictionaries_old/70services_ip_network/result/systemd/system/nut.service.d/rougail_ip.conf
@@ -0,0 +1,3 @@
+[Service]
+IPAddressAllow=192.168.0.0/24
+IPAddressDeny=any
diff --git a/tests/dictionaries_old/70services_ip_network/result/tmpfiles.d/rougail.conf b/tests/dictionaries_old/70services_ip_network/result/tmpfiles.d/rougail.conf
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/70services_ip_network/tiramisu/base.py b/tests/dictionaries_old/70services_ip_network/tiramisu/base.py
new file mode 100644
index 00000000..992b4c29
--- /dev/null
+++ b/tests/dictionaries_old/70services_ip_network/tiramisu/base.py
@@ -0,0 +1,26 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_2 = NetmaskOption(name="nut_monitor_netmask", doc="nut_monitor_netmask", default="255.255.255.0", properties=frozenset({"mandatory", "normal"}))
+option_3 = NetworkOption(name="nut_monitor_host", doc="nut_monitor_host", default="192.168.0.0", properties=frozenset({"mandatory", "normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_3])
+option_8 = SymLinkOption(name="name", opt=option_3)
+option_9 = SymLinkOption(name="netmask", opt=option_2)
+option_10 = BoolOption(name="activate", doc="activate", default=True)
+option_7 = OptionDescription(name="nut_monitor_host", doc="nut_monitor_host", children=[option_8, option_9, option_10])
+option_6 = OptionDescription(name="ip", doc="ip", children=[option_7])
+option_11 = BoolOption(name="activate", doc="activate", default=True)
+option_12 = BoolOption(name="manage", doc="manage", default=True)
+option_5 = OptionDescription(name="nut", doc="nut", children=[option_6, option_11, option_12])
+option_4 = OptionDescription(name="services", doc="services", children=[option_5], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4])
diff --git a/tests/dictionaries_old/70services_ip_not_mandatory/00-base.xml b/tests/dictionaries_old/70services_ip_not_mandatory/00-base.xml
new file mode 100644
index 00000000..1fc47a1f
--- /dev/null
+++ b/tests/dictionaries_old/70services_ip_not_mandatory/00-base.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="nut">
+      <ip>nut_monitor_host</ip>
+    </service>
+  </services>
+  <variables>
+    <variable name="nut_monitor_host" type="ip"/>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/70services_ip_not_mandatory/__init__.py b/tests/dictionaries_old/70services_ip_not_mandatory/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/70services_ip_not_mandatory/makedict/after.json b/tests/dictionaries_old/70services_ip_not_mandatory/makedict/after.json
new file mode 100644
index 00000000..048ea242
--- /dev/null
+++ b/tests/dictionaries_old/70services_ip_not_mandatory/makedict/after.json
@@ -0,0 +1,22 @@
+{
+    "rougail.nut_monitor_host": {
+        "owner": "default",
+        "value": null
+    },
+    "services.nut.ip.nut_monitor_host.name": {
+        "owner": "default",
+        "value": null
+    },
+    "services.nut.ip.nut_monitor_host.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.nut.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.nut.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/70services_ip_not_mandatory/makedict/base.json b/tests/dictionaries_old/70services_ip_not_mandatory/makedict/base.json
new file mode 100644
index 00000000..d3ad5532
--- /dev/null
+++ b/tests/dictionaries_old/70services_ip_not_mandatory/makedict/base.json
@@ -0,0 +1,7 @@
+{
+    "rougail.nut_monitor_host": null,
+    "services.nut.ip.nut_monitor_host.name": null,
+    "services.nut.ip.nut_monitor_host.activate": true,
+    "services.nut.activate": true,
+    "services.nut.manage": true
+}
diff --git a/tests/dictionaries_old/70services_ip_not_mandatory/makedict/before.json b/tests/dictionaries_old/70services_ip_not_mandatory/makedict/before.json
new file mode 100644
index 00000000..048ea242
--- /dev/null
+++ b/tests/dictionaries_old/70services_ip_not_mandatory/makedict/before.json
@@ -0,0 +1,22 @@
+{
+    "rougail.nut_monitor_host": {
+        "owner": "default",
+        "value": null
+    },
+    "services.nut.ip.nut_monitor_host.name": {
+        "owner": "default",
+        "value": null
+    },
+    "services.nut.ip.nut_monitor_host.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.nut.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.nut.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/70services_ip_not_mandatory/result/systemd/system/nut.service.d/rougail_ip.conf b/tests/dictionaries_old/70services_ip_not_mandatory/result/systemd/system/nut.service.d/rougail_ip.conf
new file mode 100644
index 00000000..9c0580a9
--- /dev/null
+++ b/tests/dictionaries_old/70services_ip_not_mandatory/result/systemd/system/nut.service.d/rougail_ip.conf
@@ -0,0 +1,2 @@
+[Service]
+IPAddressDeny=any
diff --git a/tests/dictionaries_old/70services_ip_not_mandatory/result/tmpfiles.d/rougail.conf b/tests/dictionaries_old/70services_ip_not_mandatory/result/tmpfiles.d/rougail.conf
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/70services_ip_not_mandatory/tiramisu/base.py b/tests/dictionaries_old/70services_ip_not_mandatory/tiramisu/base.py
new file mode 100644
index 00000000..e71c0c20
--- /dev/null
+++ b/tests/dictionaries_old/70services_ip_not_mandatory/tiramisu/base.py
@@ -0,0 +1,24 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_2 = IPOption(name="nut_monitor_host", doc="nut_monitor_host", allow_reserved=True, properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_7 = SymLinkOption(name="name", opt=option_2)
+option_8 = BoolOption(name="activate", doc="activate", default=True)
+option_6 = OptionDescription(name="nut_monitor_host", doc="nut_monitor_host", children=[option_7, option_8])
+option_5 = OptionDescription(name="ip", doc="ip", children=[option_6])
+option_9 = BoolOption(name="activate", doc="activate", default=True)
+option_10 = BoolOption(name="manage", doc="manage", default=True)
+option_4 = OptionDescription(name="nut", doc="nut", children=[option_5, option_9, option_10])
+option_3 = OptionDescription(name="services", doc="services", children=[option_4], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_3])
diff --git a/tests/dictionaries_old/70services_ip_twice/00-base.xml b/tests/dictionaries_old/70services_ip_twice/00-base.xml
new file mode 100644
index 00000000..94685e2f
--- /dev/null
+++ b/tests/dictionaries_old/70services_ip_twice/00-base.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="nut">
+      <ip>nut_monitor_host</ip>
+      <ip>nut_monitor_host2</ip>
+    </service>
+  </services>
+  <variables>
+    <variable name="nut_monitor_host" type="ip" mandatory="True">
+      <value>192.168.0.1</value>
+    </variable>
+    <variable name="nut_monitor_host2" type="ip" mandatory="True">
+      <value>192.168.0.2</value>
+    </variable>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/70services_ip_twice/__init__.py b/tests/dictionaries_old/70services_ip_twice/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/70services_ip_twice/makedict/after.json b/tests/dictionaries_old/70services_ip_twice/makedict/after.json
new file mode 100644
index 00000000..484c66ab
--- /dev/null
+++ b/tests/dictionaries_old/70services_ip_twice/makedict/after.json
@@ -0,0 +1,34 @@
+{
+    "rougail.nut_monitor_host": {
+        "owner": "default",
+        "value": "192.168.0.1"
+    },
+    "rougail.nut_monitor_host2": {
+        "owner": "default",
+        "value": "192.168.0.2"
+    },
+    "services.nut.ip.nut_monitor_host.name": {
+        "owner": "default",
+        "value": "192.168.0.1"
+    },
+    "services.nut.ip.nut_monitor_host.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.nut.ip.nut_monitor_host2.name": {
+        "owner": "default",
+        "value": "192.168.0.2"
+    },
+    "services.nut.ip.nut_monitor_host2.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.nut.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.nut.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/70services_ip_twice/makedict/base.json b/tests/dictionaries_old/70services_ip_twice/makedict/base.json
new file mode 100644
index 00000000..3b6d2551
--- /dev/null
+++ b/tests/dictionaries_old/70services_ip_twice/makedict/base.json
@@ -0,0 +1,10 @@
+{
+    "rougail.nut_monitor_host": "192.168.0.1",
+    "rougail.nut_monitor_host2": "192.168.0.2",
+    "services.nut.ip.nut_monitor_host.name": "192.168.0.1",
+    "services.nut.ip.nut_monitor_host.activate": true,
+    "services.nut.ip.nut_monitor_host2.name": "192.168.0.2",
+    "services.nut.ip.nut_monitor_host2.activate": true,
+    "services.nut.activate": true,
+    "services.nut.manage": true
+}
diff --git a/tests/dictionaries_old/70services_ip_twice/makedict/before.json b/tests/dictionaries_old/70services_ip_twice/makedict/before.json
new file mode 100644
index 00000000..484c66ab
--- /dev/null
+++ b/tests/dictionaries_old/70services_ip_twice/makedict/before.json
@@ -0,0 +1,34 @@
+{
+    "rougail.nut_monitor_host": {
+        "owner": "default",
+        "value": "192.168.0.1"
+    },
+    "rougail.nut_monitor_host2": {
+        "owner": "default",
+        "value": "192.168.0.2"
+    },
+    "services.nut.ip.nut_monitor_host.name": {
+        "owner": "default",
+        "value": "192.168.0.1"
+    },
+    "services.nut.ip.nut_monitor_host.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.nut.ip.nut_monitor_host2.name": {
+        "owner": "default",
+        "value": "192.168.0.2"
+    },
+    "services.nut.ip.nut_monitor_host2.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.nut.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.nut.manage": {
+        "owner": "default",
+        "value": true
+    }
+}
diff --git a/tests/dictionaries_old/70services_ip_twice/result/systemd/system/nut.service.d/rougail_ip.conf b/tests/dictionaries_old/70services_ip_twice/result/systemd/system/nut.service.d/rougail_ip.conf
new file mode 100644
index 00000000..c1dc1968
--- /dev/null
+++ b/tests/dictionaries_old/70services_ip_twice/result/systemd/system/nut.service.d/rougail_ip.conf
@@ -0,0 +1,4 @@
+[Service]
+IPAddressAllow=192.168.0.1
+IPAddressAllow=192.168.0.2
+IPAddressDeny=any
diff --git a/tests/dictionaries_old/70services_ip_twice/result/tmpfiles.d/rougail.conf b/tests/dictionaries_old/70services_ip_twice/result/tmpfiles.d/rougail.conf
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/70services_ip_twice/tiramisu/base.py b/tests/dictionaries_old/70services_ip_twice/tiramisu/base.py
new file mode 100644
index 00000000..32e80cc6
--- /dev/null
+++ b/tests/dictionaries_old/70services_ip_twice/tiramisu/base.py
@@ -0,0 +1,28 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_2 = IPOption(name="nut_monitor_host", doc="nut_monitor_host", default="192.168.0.1", allow_reserved=True, properties=frozenset({"mandatory", "normal"}))
+option_3 = IPOption(name="nut_monitor_host2", doc="nut_monitor_host2", default="192.168.0.2", allow_reserved=True, properties=frozenset({"mandatory", "normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_3])
+option_8 = SymLinkOption(name="name", opt=option_2)
+option_9 = BoolOption(name="activate", doc="activate", default=True)
+option_7 = OptionDescription(name="nut_monitor_host", doc="nut_monitor_host", children=[option_8, option_9])
+option_11 = SymLinkOption(name="name", opt=option_3)
+option_12 = BoolOption(name="activate", doc="activate", default=True)
+option_10 = OptionDescription(name="nut_monitor_host2", doc="nut_monitor_host2", children=[option_11, option_12])
+option_6 = OptionDescription(name="ip", doc="ip", children=[option_7, option_10])
+option_13 = BoolOption(name="activate", doc="activate", default=True)
+option_14 = BoolOption(name="manage", doc="manage", default=True)
+option_5 = OptionDescription(name="nut", doc="nut", children=[option_6, option_13, option_14])
+option_4 = OptionDescription(name="services", doc="services", children=[option_5], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4])
diff --git a/tests/dictionaries_old/80auto_family/00-base.xml b/tests/dictionaries_old/80auto_family/00-base.xml
new file mode 100644
index 00000000..d0783207
--- /dev/null
+++ b/tests/dictionaries_old/80auto_family/00-base.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="variable" type="string" description="No change">
+        <value>no</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param>oui</param>
+      <target type="family">general</target>
+    </fill>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/80auto_family/__init__.py b/tests/dictionaries_old/80auto_family/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80auto_family/errno_8 b/tests/dictionaries_old/80auto_family/errno_8
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80check_unknown/00-base.xml b/tests/dictionaries_old/80check_unknown/00-base.xml
new file mode 100644
index 00000000..6dec73cf
--- /dev/null
+++ b/tests/dictionaries_old/80check_unknown/00-base.xml
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>b</value>
+      </variable>
+      <variable name="int" type="number" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="unknown">
+      <param name="mini">0</param>
+      <param name="maxi">100</param>
+      <target>int</target>
+    </check>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/80check_unknown/__init__.py b/tests/dictionaries_old/80check_unknown/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80check_unknown/errno_1 b/tests/dictionaries_old/80check_unknown/errno_1
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80check_unknown_var/00-base.xml b/tests/dictionaries_old/80check_unknown_var/00-base.xml
new file mode 100644
index 00000000..3f55a489
--- /dev/null
+++ b/tests/dictionaries_old/80check_unknown_var/00-base.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>b</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_differ">
+      <param type="variable">int3</param>
+      <target>mode_conteneur_actif</target>
+    </check>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/80check_unknown_var/__init__.py b/tests/dictionaries_old/80check_unknown_var/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80check_unknown_var/errno_42 b/tests/dictionaries_old/80check_unknown_var/errno_42
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80check_without_target/00-base.xml b/tests/dictionaries_old/80check_without_target/00-base.xml
new file mode 100644
index 00000000..26737bf7
--- /dev/null
+++ b/tests/dictionaries_old/80check_without_target/00-base.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>b</value>
+      </variable>
+      <variable name="int" type="number" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_entier">
+      <param name="mini">0</param>
+      <param name="maxi">100</param>
+    </check>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/80check_without_target/__init__.py b/tests/dictionaries_old/80check_without_target/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80check_without_target/errno_9 b/tests/dictionaries_old/80check_without_target/errno_9
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80condition_itself/00-base.xml b/tests/dictionaries_old/80condition_itself/00-base.xml
new file mode 100644
index 00000000..63ca1d57
--- /dev/null
+++ b/tests/dictionaries_old/80condition_itself/00-base.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="test">
+      <variable name="replicationtype" description="replicationType"/>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="replicationtype">
+      <param>leader-leader</param>
+      <target type="variable">replicationType</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/80condition_itself/__init__.py b/tests/dictionaries_old/80condition_itself/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80condition_itself/errno_11 b/tests/dictionaries_old/80condition_itself/errno_11
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80condition_not_exists_error/00-base.xml b/tests/dictionaries_old/80condition_not_exists_error/00-base.xml
new file mode 100644
index 00000000..16c72b8c
--- /dev/null
+++ b/tests/dictionaries_old/80condition_not_exists_error/00-base.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="hidden_if_in" source="condition">
+      <param>oui</param>
+      <target type="family">notexists</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/80condition_not_exists_error/__init__.py b/tests/dictionaries_old/80condition_not_exists_error/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80condition_not_exists_error/errno_12 b/tests/dictionaries_old/80condition_not_exists_error/errno_12
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80condition_not_exists_error_var/00-base.xml b/tests/dictionaries_old/80condition_not_exists_error_var/00-base.xml
new file mode 100644
index 00000000..1062bfdd
--- /dev/null
+++ b/tests/dictionaries_old/80condition_not_exists_error_var/00-base.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="hidden_if_in" source="condition">
+      <param>oui</param>
+      <target>notexists</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/80condition_not_exists_error_var/__init__.py b/tests/dictionaries_old/80condition_not_exists_error_var/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80condition_not_exists_error_var/errno_12 b/tests/dictionaries_old/80condition_not_exists_error_var/errno_12
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80condition_without_target/00-base.xml b/tests/dictionaries_old/80condition_without_target/00-base.xml
new file mode 100644
index 00000000..e8f86ab8
--- /dev/null
+++ b/tests/dictionaries_old/80condition_without_target/00-base.xml
@@ -0,0 +1,24 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition optional="True" name="disabled_if_in" source="condition">
+      <param>oui</param>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/80condition_without_target/__init__.py b/tests/dictionaries_old/80condition_without_target/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80condition_without_target/errno_9 b/tests/dictionaries_old/80condition_without_target/errno_9
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80container_files_symlink_without_source/00-base.xml b/tests/dictionaries_old/80container_files_symlink_without_source/00-base.xml
new file mode 100644
index 00000000..bffa2f11
--- /dev/null
+++ b/tests/dictionaries_old/80container_files_symlink_without_source/00-base.xml
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="test">
+      <file file_type="variable">file_name</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>oui</value>
+      </variable>
+      <variable name="file_name" type="string">
+        <value>/etc/mailname</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/80container_files_symlink_without_source/__init__.py b/tests/dictionaries_old/80container_files_symlink_without_source/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80container_files_symlink_without_source/errno_34 b/tests/dictionaries_old/80container_files_symlink_without_source/errno_34
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80container_filesredefine_error/00-base.xml b/tests/dictionaries_old/80container_filesredefine_error/00-base.xml
new file mode 100644
index 00000000..7a9c4c73
--- /dev/null
+++ b/tests/dictionaries_old/80container_filesredefine_error/00-base.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="test">
+      <file>/etc/mailname</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>oui</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/80container_filesredefine_error/01-base.xml b/tests/dictionaries_old/80container_filesredefine_error/01-base.xml
new file mode 100644
index 00000000..439c8509
--- /dev/null
+++ b/tests/dictionaries_old/80container_filesredefine_error/01-base.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="test">
+      <file source="mailname.new">/etc/mailname</file>
+    </service>
+  </services>
+</rougail>
diff --git a/tests/dictionaries_old/80container_filesredefine_error/__init__.py b/tests/dictionaries_old/80container_filesredefine_error/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80container_filesredefine_error/errno_45 b/tests/dictionaries_old/80container_filesredefine_error/errno_45
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80empty_param_number/00_base.xml b/tests/dictionaries_old/80empty_param_number/00_base.xml
new file mode 100644
index 00000000..94e1bed4
--- /dev/null
+++ b/tests/dictionaries_old/80empty_param_number/00_base.xml
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="toto1" type="port" description="Port d'écoute du proxy" mode="expert">
+            </variable>
+      <variable name="toto2" type="port" description="Port d'écoute du proxy NTLM" mode="expert">
+        <value>3127</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_multi_condition">
+      <param name="value" type="number"/>
+      <target>toto1</target>
+    </fill>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/80empty_param_number/__init__.py b/tests/dictionaries_old/80empty_param_number/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80empty_param_number/errno_27 b/tests/dictionaries_old/80empty_param_number/errno_27
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80empty_typeeole_eole/00_base.xml b/tests/dictionaries_old/80empty_typeeole_eole/00_base.xml
new file mode 100644
index 00000000..af5b8f67
--- /dev/null
+++ b/tests/dictionaries_old/80empty_typeeole_eole/00_base.xml
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services/>
+  <variables>
+    <family name="general">
+      <variable name="toto1" type="port" description="Port d'écoute du proxy" mode="expert">
+            </variable>
+      <variable name="toto2" type="port" description="Port d'écoute du proxy NTLM" mode="expert">
+        <value>3127</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_multi_condition">
+      <param>non</param>
+      <param type="variable" name="condition_1" propertyerror="True"/>
+      <param name="match">3128</param>
+      <param name="mismatch" type="variable" propertyerror="True">toto2</param>
+      <target>toto1</target>
+    </fill>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/80empty_typeeole_eole/__init__.py b/tests/dictionaries_old/80empty_typeeole_eole/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80empty_typeeole_eole/errno_27 b/tests/dictionaries_old/80empty_typeeole_eole/errno_27
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80empty_typeeole_number/00_base.xml b/tests/dictionaries_old/80empty_typeeole_number/00_base.xml
new file mode 100644
index 00000000..66f4a224
--- /dev/null
+++ b/tests/dictionaries_old/80empty_typeeole_number/00_base.xml
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <variable name="toto1" type="port" description="Port d'écoute du proxy" mode="expert">
+        </variable>
+    <variable name="toto2" type="port" description="Port d'écoute du proxy NTLM" mode="expert">
+      <value>3127</value>
+    </variable>
+  </variables>
+  <constraints>
+    <fill name="calc_multi_condition">
+      <param>non</param>
+      <param type="number" name="condition_2" propertyerror="True"/>
+      <param name="match">3128</param>
+      <param name="mismatch" type="variable" propertyerror="True">toto2</param>
+      <target>toto1</target>
+    </fill>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/80empty_typeeole_number/__init__.py b/tests/dictionaries_old/80empty_typeeole_number/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80empty_typeeole_number/errno_27 b/tests/dictionaries_old/80empty_typeeole_number/errno_27
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80extra_externalspaceauto/00-base.xml b/tests/dictionaries_old/80extra_externalspaceauto/00-base.xml
new file mode 100644
index 00000000..172b7463
--- /dev/null
+++ b/tests/dictionaries_old/80extra_externalspaceauto/00-base.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general" description="général">
+      <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/80extra_externalspaceauto/__init__.py b/tests/dictionaries_old/80extra_externalspaceauto/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80extra_externalspaceauto/errno_41 b/tests/dictionaries_old/80extra_externalspaceauto/errno_41
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80extra_externalspaceauto/extra_dirs/extra/00-base.xml b/tests/dictionaries_old/80extra_externalspaceauto/extra_dirs/extra/00-base.xml
new file mode 100644
index 00000000..e5eb20f0
--- /dev/null
+++ b/tests/dictionaries_old/80extra_externalspaceauto/extra_dirs/extra/00-base.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="ejabberd">
+      <variable name="description" type="string">
+        <value>Exportation de la base de ejabberd</value>
+      </variable>
+      <variable name="day" type="schedule"/>
+      <variable name="mode" type="schedulemod">
+        <value>pre</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/80extra_externalspaceauto/extra_dirs/extra1/00-base.xml b/tests/dictionaries_old/80extra_externalspaceauto/extra_dirs/extra1/00-base.xml
new file mode 100644
index 00000000..3fe35d76
--- /dev/null
+++ b/tests/dictionaries_old/80extra_externalspaceauto/extra_dirs/extra1/00-base.xml
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="external">
+      <variable name="description" type="string">
+        <value>test</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_multi_condition">
+      <param>non</param>
+      <param type="variable" name="condition_1">extra.ejabberd.day</param>
+      <param name="match">none</param>
+      <param name="mismatch">daily</param>
+      <target>extra1.external.description</target>
+    </fill>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/80extra_externalspacecondition2/00-base.xml b/tests/dictionaries_old/80extra_externalspacecondition2/00-base.xml
new file mode 100644
index 00000000..172b7463
--- /dev/null
+++ b/tests/dictionaries_old/80extra_externalspacecondition2/00-base.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general" description="général">
+      <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/80extra_externalspacecondition2/__init__.py b/tests/dictionaries_old/80extra_externalspacecondition2/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80extra_externalspacecondition2/errno_38 b/tests/dictionaries_old/80extra_externalspacecondition2/errno_38
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80extra_externalspacecondition2/extra_dirs/extra/00-base.xml b/tests/dictionaries_old/80extra_externalspacecondition2/extra_dirs/extra/00-base.xml
new file mode 100644
index 00000000..e5eb20f0
--- /dev/null
+++ b/tests/dictionaries_old/80extra_externalspacecondition2/extra_dirs/extra/00-base.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="ejabberd">
+      <variable name="description" type="string">
+        <value>Exportation de la base de ejabberd</value>
+      </variable>
+      <variable name="day" type="schedule"/>
+      <variable name="mode" type="schedulemod">
+        <value>pre</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/80extra_externalspacecondition2/extra_dirs/extra1/00-base.xml b/tests/dictionaries_old/80extra_externalspacecondition2/extra_dirs/extra1/00-base.xml
new file mode 100644
index 00000000..e51651d3
--- /dev/null
+++ b/tests/dictionaries_old/80extra_externalspacecondition2/extra_dirs/extra1/00-base.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="external">
+      <variable name="description" type="string">
+        <value>test</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="extra1.external.description">
+      <param>non</param>
+      <target type="family">extra.ejabberd</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/80extra_externalspacecondition3/00-base.xml b/tests/dictionaries_old/80extra_externalspacecondition3/00-base.xml
new file mode 100644
index 00000000..172b7463
--- /dev/null
+++ b/tests/dictionaries_old/80extra_externalspacecondition3/00-base.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general" description="général">
+      <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/80extra_externalspacecondition3/__init__.py b/tests/dictionaries_old/80extra_externalspacecondition3/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80extra_externalspacecondition3/errno_38 b/tests/dictionaries_old/80extra_externalspacecondition3/errno_38
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80extra_externalspacecondition3/extra_dirs/extra/00-base.xml b/tests/dictionaries_old/80extra_externalspacecondition3/extra_dirs/extra/00-base.xml
new file mode 100644
index 00000000..a8fe29c8
--- /dev/null
+++ b/tests/dictionaries_old/80extra_externalspacecondition3/extra_dirs/extra/00-base.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="external">
+      <variable name="description" type="string">
+        <value>test</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="extra1.external.description">
+      <param>non</param>
+      <target type="family">general</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/80extra_rougail/00-base.xml b/tests/dictionaries_old/80extra_rougail/00-base.xml
new file mode 100644
index 00000000..88bab8ca
--- /dev/null
+++ b/tests/dictionaries_old/80extra_rougail/00-base.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/80extra_rougail/__init__.py b/tests/dictionaries_old/80extra_rougail/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80extra_rougail/errno_21 b/tests/dictionaries_old/80extra_rougail/errno_21
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80extra_rougail/extra_dirs/rougail/00-base.xml b/tests/dictionaries_old/80extra_rougail/extra_dirs/rougail/00-base.xml
new file mode 100644
index 00000000..c9397191
--- /dev/null
+++ b/tests/dictionaries_old/80extra_rougail/extra_dirs/rougail/00-base.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="ejabberd">
+      <variable name="description" type="string">
+        <value>Exportation de la base de ejabberd</value>
+      </variable>
+      <variable name="day" type="schedule"/>
+      <variable name="mode" type="schedulemod">
+        <value>pre</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_multi_condition">
+      <param>non</param>
+      <param type="variable" name="condition_1" propertyerror="True">activer_ejabberd</param>
+      <param name="match">none</param>
+      <param name="mismatch">daily</param>
+      <target>extra.ejabberd.day</target>
+    </fill>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/80extra_services/00-base.xml b/tests/dictionaries_old/80extra_services/00-base.xml
new file mode 100644
index 00000000..88bab8ca
--- /dev/null
+++ b/tests/dictionaries_old/80extra_services/00-base.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/80extra_services/__init__.py b/tests/dictionaries_old/80extra_services/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80extra_services/errno_21 b/tests/dictionaries_old/80extra_services/errno_21
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80extra_services/extra_dirs/services/00-base.xml b/tests/dictionaries_old/80extra_services/extra_dirs/services/00-base.xml
new file mode 100644
index 00000000..a11e423b
--- /dev/null
+++ b/tests/dictionaries_old/80extra_services/extra_dirs/services/00-base.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="ejabberd">
+      <variable name="description" type="string">
+        <value>Exportation de la base de ejabberd</value>
+      </variable>
+      <variable name="day" type="schedule"/>
+      <variable name="mode" type="schedulemod">
+        <value>pre</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_multi_condition">
+      <param>non</param>
+      <param type="variable" name="condition_1" propertyerror="False">activer_ejabberd</param>
+      <param name="match">none</param>
+      <param name="mismatch">daily</param>
+      <target>extra.ejabberd.day</target>
+    </fill>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/80family_appendaccent/00-base.xml b/tests/dictionaries_old/80family_appendaccent/00-base.xml
new file mode 100644
index 00000000..4d4f6bda
--- /dev/null
+++ b/tests/dictionaries_old/80family_appendaccent/00-base.xml
@@ -0,0 +1,21 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="Général">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="Other">
+      <variable name="mode_conteneur_actif3" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="mode_conteneur_actif3">
+      <param>non</param>
+      <target type="variable">mode_conteneur_actif</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/80family_appendaccent/01-base.xml b/tests/dictionaries_old/80family_appendaccent/01-base.xml
new file mode 100644
index 00000000..470481fb
--- /dev/null
+++ b/tests/dictionaries_old/80family_appendaccent/01-base.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="Général">
+      <variable name="mode_conteneur_actif1" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/80family_appendaccent/02-base.xml b/tests/dictionaries_old/80family_appendaccent/02-base.xml
new file mode 100644
index 00000000..a5fa78a9
--- /dev/null
+++ b/tests/dictionaries_old/80family_appendaccent/02-base.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/80family_appendaccent/__init__.py b/tests/dictionaries_old/80family_appendaccent/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80family_appendaccent/errno_76 b/tests/dictionaries_old/80family_appendaccent/errno_76
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80family_change/00-base.xml b/tests/dictionaries_old/80family_change/00-base.xml
new file mode 100644
index 00000000..b9812764
--- /dev/null
+++ b/tests/dictionaries_old/80family_change/00-base.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/80family_change/01-base.xml b/tests/dictionaries_old/80family_change/01-base.xml
new file mode 100644
index 00000000..362cc6b4
--- /dev/null
+++ b/tests/dictionaries_old/80family_change/01-base.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="other">
+      <variable name="mode_conteneur_actif1" redefine="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/80family_change/__init__.py b/tests/dictionaries_old/80family_change/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80family_change/errno_47 b/tests/dictionaries_old/80family_change/errno_47
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80family_dynamic_calc_invalid_suffix/00-base.xml b/tests/dictionaries_old/80family_dynamic_calc_invalid_suffix/00-base.xml
new file mode 100644
index 00000000..776efdf4
--- /dev/null
+++ b/tests/dictionaries_old/80family_dynamic_calc_invalid_suffix/00-base.xml
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="varname" type="string" description="No change" multi="True">
+        <value>val1</value>
+        <value>val2</value>
+      </variable>
+    </family>
+    <family name="dyn" dynamic="varname">
+      <variable name="vardyn" type="string" description="No change">
+        <value>val</value>
+      </variable>
+    </family>
+    <family name="new">
+      <variable name="newvar" type="string" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="suffix">unknown</param>
+      <target>vardyn</target>
+    </fill>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/80family_dynamic_calc_invalid_suffix/__init__.py b/tests/dictionaries_old/80family_dynamic_calc_invalid_suffix/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80family_dynamic_calc_invalid_suffix/errno_28 b/tests/dictionaries_old/80family_dynamic_calc_invalid_suffix/errno_28
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80family_dynamic_check/00-base.xml b/tests/dictionaries_old/80family_dynamic_check/00-base.xml
new file mode 100644
index 00000000..d27806e9
--- /dev/null
+++ b/tests/dictionaries_old/80family_dynamic_check/00-base.xml
@@ -0,0 +1,21 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="varname" type="string" description="No change" multi="True">
+        <value>val1</value>
+        <value>val2</value>
+      </variable>
+    </family>
+    <family name="dyn" dynamic="varname">
+      <variable name="vardyn" type="number" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_entier">
+      <param name="mini" type="number">0</param>
+      <param name="maxi" type="number">100</param>
+      <target>vardynval1</target>
+    </check>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/80family_dynamic_check/__init__.py b/tests/dictionaries_old/80family_dynamic_check/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80family_dynamic_check/errno_35 b/tests/dictionaries_old/80family_dynamic_check/errno_35
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80family_dynamic_not_multi/00-base.xml b/tests/dictionaries_old/80family_dynamic_not_multi/00-base.xml
new file mode 100644
index 00000000..2c2f7f2e
--- /dev/null
+++ b/tests/dictionaries_old/80family_dynamic_not_multi/00-base.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="varname" type="string" description="No change">
+        <value>val1</value>
+      </variable>
+    </family>
+    <family name="dyn" dynamic="varname">
+      <variable name="vardyn" type="string" description="No change"/>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/80family_dynamic_not_multi/__init__.py b/tests/dictionaries_old/80family_dynamic_not_multi/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80family_dynamic_not_multi/errno_16 b/tests/dictionaries_old/80family_dynamic_not_multi/errno_16
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80family_dynamic_with_family/00-base.xml b/tests/dictionaries_old/80family_dynamic_with_family/00-base.xml
new file mode 100644
index 00000000..bd2842d6
--- /dev/null
+++ b/tests/dictionaries_old/80family_dynamic_with_family/00-base.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="varname" type="string" description="No change" multi="True">
+        <value>val1</value>
+        <value>val2</value>
+      </variable>
+    </family>
+    <family name="dyn" dynamic="varname">
+      <variable name="vardyn" type="string" description="No change"/>
+      <family name="my_family"/>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/80family_dynamic_with_family/__init__.py b/tests/dictionaries_old/80family_dynamic_with_family/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80family_dynamic_with_family/errno_22 b/tests/dictionaries_old/80family_dynamic_with_family/errno_22
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80family_not_dynamic_calc_suffix/00-base.xml b/tests/dictionaries_old/80family_not_dynamic_calc_suffix/00-base.xml
new file mode 100644
index 00000000..25cc4f33
--- /dev/null
+++ b/tests/dictionaries_old/80family_not_dynamic_calc_suffix/00-base.xml
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="varname" type="string" description="No change" multi="True">
+        <value>val1</value>
+        <value>val2</value>
+      </variable>
+    </family>
+    <family name="dyn" dynamic="varname">
+      <variable name="vardyn" type="string" description="No change">
+        <value>val</value>
+      </variable>
+    </family>
+    <family name="new">
+      <variable name="newvar" type="string" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="suffix"/>
+      <target>newvar</target>
+    </fill>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/80family_not_dynamic_calc_suffix/__init__.py b/tests/dictionaries_old/80family_not_dynamic_calc_suffix/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80family_not_dynamic_calc_suffix/errno_53 b/tests/dictionaries_old/80family_not_dynamic_calc_suffix/errno_53
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80family_only_on_suffix/00-base.xml b/tests/dictionaries_old/80family_only_on_suffix/00-base.xml
new file mode 100644
index 00000000..7c16afab
--- /dev/null
+++ b/tests/dictionaries_old/80family_only_on_suffix/00-base.xml
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="varname" type="string" description="No change" multi="True">
+        <value>val1</value>
+        <value>val2</value>
+      </variable>
+    </family>
+    <family name="dyn" dynamic="varname">
+      <variable name="vardyn" type="string" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param>value</param>
+      <target>vardynval1</target>
+    </fill>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/80family_only_on_suffix/__init__.py b/tests/dictionaries_old/80family_only_on_suffix/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80family_only_on_suffix/errno_35 b/tests/dictionaries_old/80family_only_on_suffix/errno_35
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80family_several/00-base.xml b/tests/dictionaries_old/80family_several/00-base.xml
new file mode 100644
index 00000000..f2d390cd
--- /dev/null
+++ b/tests/dictionaries_old/80family_several/00-base.xml
@@ -0,0 +1,29 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="general">
+      <variable name="leader" type="string" description="leader" multi="True"/>
+      <variable name="follower1" type="string" description="follower1" multi="True"/>
+      <variable name="follower2" type="string" description="follower2" multi="True"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valfill</param>
+      <target>follower1</target>
+    </fill>
+    <fill name="calc_val">
+      <param type="variable">follower1</param>
+      <target>follower2</target>
+    </fill>
+    <group leader="leader">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+    </group>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/80family_several/__init__.py b/tests/dictionaries_old/80family_several/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80family_several/errno_44 b/tests/dictionaries_old/80family_several/errno_44
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80family_unique/00-base.xml b/tests/dictionaries_old/80family_unique/00-base.xml
new file mode 100644
index 00000000..6c84ee8b
--- /dev/null
+++ b/tests/dictionaries_old/80family_unique/00-base.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <family name="general">
+        <variable name="my_variable"/>
+      </family>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/80family_unique/__init__.py b/tests/dictionaries_old/80family_unique/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80family_unique/errno_55 b/tests/dictionaries_old/80family_unique/errno_55
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80family_variable_not_same_name/00-base.xml b/tests/dictionaries_old/80family_variable_not_same_name/00-base.xml
new file mode 100644
index 00000000..1e3b5135
--- /dev/null
+++ b/tests/dictionaries_old/80family_variable_not_same_name/00-base.xml
@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="my_variable2"/>
+    </family>
+    <variable name="general"/>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/80family_variable_not_same_name/__init__.py b/tests/dictionaries_old/80family_variable_not_same_name/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80family_variable_not_same_name/errno_57 b/tests/dictionaries_old/80family_variable_not_same_name/errno_57
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80familyaction_accent/00-base.xml b/tests/dictionaries_old/80familyaction_accent/00-base.xml
new file mode 100644
index 00000000..af8b3e8b
--- /dev/null
+++ b/tests/dictionaries_old/80familyaction_accent/00-base.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/80familyaction_accent/__init__.py b/tests/dictionaries_old/80familyaction_accent/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80familyaction_accent/errno_76 b/tests/dictionaries_old/80familyaction_accent/errno_76
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80familyaction_accent/extra_dirs/extra/00-base.xml b/tests/dictionaries_old/80familyaction_accent/extra_dirs/extra/00-base.xml
new file mode 100644
index 00000000..9fcc6478
--- /dev/null
+++ b/tests/dictionaries_old/80familyaction_accent/extra_dirs/extra/00-base.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="test">
+      <variable name="delay" type="number" description="délai en minutes avant lancement">
+        <value>0</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/80file_wrong_type/00-base.xml b/tests/dictionaries_old/80file_wrong_type/00-base.xml
new file mode 100644
index 00000000..951c7b55
--- /dev/null
+++ b/tests/dictionaries_old/80file_wrong_type/00-base.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="test">
+      <file file_type="variable" source="mailname">file_name</file>
+    </service>
+  </services>
+  <variables>
+    <variable name="file_name" type="string">
+      <value>/etc/mailname</value>
+    </variable>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/80file_wrong_type/__init__.py b/tests/dictionaries_old/80file_wrong_type/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80file_wrong_type/errno_58 b/tests/dictionaries_old/80file_wrong_type/errno_58
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80fill_baseaccent/00-base.xml b/tests/dictionaries_old/80fill_baseaccent/00-base.xml
new file mode 100644
index 00000000..c7e307fb
--- /dev/null
+++ b/tests/dictionaries_old/80fill_baseaccent/00-base.xml
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="Général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="variable">mode_conteneur_actif1</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/80fill_baseaccent/__init__.py b/tests/dictionaries_old/80fill_baseaccent/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80fill_baseaccent/errno_76 b/tests/dictionaries_old/80fill_baseaccent/errno_76
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80fill_error/00-base.xml b/tests/dictionaries_old/80fill_error/00-base.xml
new file mode 100644
index 00000000..211dd395
--- /dev/null
+++ b/tests/dictionaries_old/80fill_error/00-base.xml
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valeur</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+    <fill name="calc_val">
+      <param name="valeur">valeur2</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/80fill_error/__init__.py b/tests/dictionaries_old/80fill_error/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80fill_error/errno_24 b/tests/dictionaries_old/80fill_error/errno_24
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80fill_multi/00-base.xml b/tests/dictionaries_old/80fill_multi/00-base.xml
new file mode 100644
index 00000000..64dc527a
--- /dev/null
+++ b/tests/dictionaries_old/80fill_multi/00-base.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param>value</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+    <fill name="calc_val">
+      <param name="variable">mode_conteneur_actif1</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/80fill_multi/__init__.py b/tests/dictionaries_old/80fill_multi/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80fill_multi/errno_24 b/tests/dictionaries_old/80fill_multi/errno_24
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80fill_not_exists/00-base.xml b/tests/dictionaries_old/80fill_not_exists/00-base.xml
new file mode 100644
index 00000000..fdbb6938
--- /dev/null
+++ b/tests/dictionaries_old/80fill_not_exists/00-base.xml
@@ -0,0 +1,21 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="variable">mode_conteneur_actif4</param>
+      <param type="variable">mode_conteneur_actif1</param>
+      <param type="variable" optional="True">mode_conteneur_actif3</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/80fill_not_exists/__init__.py b/tests/dictionaries_old/80fill_not_exists/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80fill_not_exists/errno_42 b/tests/dictionaries_old/80fill_not_exists/errno_42
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80fill_unknown_function/00-base.xml b/tests/dictionaries_old/80fill_unknown_function/00-base.xml
new file mode 100644
index 00000000..be0452e3
--- /dev/null
+++ b/tests/dictionaries_old/80fill_unknown_function/00-base.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change"/>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="unknown_function">
+      <param type="variable">mode_conteneur_actif1</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/80fill_unknown_function/__init__.py b/tests/dictionaries_old/80fill_unknown_function/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80fill_unknown_function/errno_25 b/tests/dictionaries_old/80fill_unknown_function/errno_25
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80frozenifin_unknown/00-base.xml b/tests/dictionaries_old/80frozenifin_unknown/00-base.xml
new file mode 100644
index 00000000..c0ffcee9
--- /dev/null
+++ b/tests/dictionaries_old/80frozenifin_unknown/00-base.xml
@@ -0,0 +1,26 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="enumfam" mode="expert">
+      <variable name="enumvar" type="number" description="enumvar" help="bla bla bla"/>
+      <variable name="test_variable" type="number" description="test variable"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>1</param>
+      <param>2</param>
+      <param>3</param>
+      <target>enumvar</target>
+    </check>
+    <condition name="hidden_if_in" source="condition">
+      <param>4</param>
+      <target type="variable">test_variable</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/80frozenifin_unknown/__init__.py b/tests/dictionaries_old/80frozenifin_unknown/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80frozenifin_unknown/errno_23 b/tests/dictionaries_old/80frozenifin_unknown/errno_23
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80hidden_if_in_dynamic/00-base.xml b/tests/dictionaries_old/80hidden_if_in_dynamic/00-base.xml
new file mode 100644
index 00000000..dd21c18b
--- /dev/null
+++ b/tests/dictionaries_old/80hidden_if_in_dynamic/00-base.xml
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="varname" type="string" description="No change" multi="True">
+        <value>val1</value>
+        <value>val2</value>
+      </variable>
+    </family>
+    <family name="dyn" dynamic="varname">
+      <variable name="vardyn" type="string" description="No change">
+        <value>val</value>
+      </variable>
+    </family>
+    <family name="new">
+      <variable name="newvar" type="string" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="hidden_if_in" source="vardynval1">
+      <param>non</param>
+      <target type="family">new</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/80hidden_if_in_dynamic/__init__.py b/tests/dictionaries_old/80hidden_if_in_dynamic/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80hidden_if_in_dynamic/errno_20 b/tests/dictionaries_old/80hidden_if_in_dynamic/errno_20
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80hidden_if_in_filelist/00-base.xml b/tests/dictionaries_old/80hidden_if_in_filelist/00-base.xml
new file mode 100644
index 00000000..c7bd8f78
--- /dev/null
+++ b/tests/dictionaries_old/80hidden_if_in_filelist/00-base.xml
@@ -0,0 +1,24 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="test">
+      <file filelist="afilllist">/tmp/file1</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="hidden_if_in" source="activer_clam" optional="True">
+      <param>non</param>
+      <target type="filelist">afilllist</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/80hidden_if_in_filelist/__init__.py b/tests/dictionaries_old/80hidden_if_in_filelist/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80hidden_if_in_filelist/errno_10 b/tests/dictionaries_old/80hidden_if_in_filelist/errno_10
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80invalid_dtd/00_base.xml b/tests/dictionaries_old/80invalid_dtd/00_base.xml
new file mode 100644
index 00000000..9ffb9dee
--- /dev/null
+++ b/tests/dictionaries_old/80invalid_dtd/00_base.xml
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <unknown>
+        </unknown>
+  </services>
+</rougail>
diff --git a/tests/dictionaries_old/80invalid_dtd/__init__.py b/tests/dictionaries_old/80invalid_dtd/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80invalid_dtd/errno_43 b/tests/dictionaries_old/80invalid_dtd/errno_43
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80invalid_xml/00_base.xml b/tests/dictionaries_old/80invalid_xml/00_base.xml
new file mode 100644
index 00000000..129e01fa
--- /dev/null
+++ b/tests/dictionaries_old/80invalid_xml/00_base.xml
@@ -0,0 +1,5 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+    <services/>
+    </services>
+</rougail>
diff --git a/tests/dictionaries_old/80invalid_xml/__init__.py b/tests/dictionaries_old/80invalid_xml/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80invalid_xml/errno_52 b/tests/dictionaries_old/80invalid_xml/errno_52
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80leadership_accent/00-base.xml b/tests/dictionaries_old/80leadership_accent/00-base.xml
new file mode 100644
index 00000000..c529e7c0
--- /dev/null
+++ b/tests/dictionaries_old/80leadership_accent/00-base.xml
@@ -0,0 +1,29 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="general1">
+      <variable name="leader" type="string" multi="True"/>
+      <variable name="Followér1" type="string"/>
+      <variable name="Followér2" type="string"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valfill</param>
+      <target>follower1</target>
+    </fill>
+    <fill name="calc_val">
+      <param type="variable">Followér1</param>
+      <target>follower2</target>
+    </fill>
+    <group leader="leader">
+      <follower>Followér1</follower>
+      <follower>Followér2</follower>
+    </group>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/80leadership_accent/__init__.py b/tests/dictionaries_old/80leadership_accent/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80leadership_accent/errno_76 b/tests/dictionaries_old/80leadership_accent/errno_76
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80leadership_accent_leader/00-base.xml b/tests/dictionaries_old/80leadership_accent_leader/00-base.xml
new file mode 100644
index 00000000..6f2d7f4c
--- /dev/null
+++ b/tests/dictionaries_old/80leadership_accent_leader/00-base.xml
@@ -0,0 +1,29 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="general1">
+      <variable name="Léader" type="string" multi="True"/>
+      <variable name="follower1" type="string"/>
+      <variable name="follower2" type="string"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valfill</param>
+      <target>follower1</target>
+    </fill>
+    <fill name="calc_val">
+      <param type="variable">follower1</param>
+      <target>follower2</target>
+    </fill>
+    <group leader="Léader">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+    </group>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/80leadership_accent_leader/__init__.py b/tests/dictionaries_old/80leadership_accent_leader/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80leadership_accent_leader/errno_76 b/tests/dictionaries_old/80leadership_accent_leader/errno_76
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80leadership_auto_save/00-base.xml b/tests/dictionaries_old/80leadership_auto_save/00-base.xml
new file mode 100644
index 00000000..ac6ebb0b
--- /dev/null
+++ b/tests/dictionaries_old/80leadership_auto_save/00-base.xml
@@ -0,0 +1,28 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <variable name="server_deployed" type="boolean"/>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="leader" type="string" description="leader" multi="True"/>
+      <variable name="follower1" type="string" description="follower1"/>
+      <variable name="follower2" type="string" description="follower2" auto_save="True"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valfill</param>
+      <target>follower1</target>
+    </fill>
+    <fill name="calc_val">
+      <param type="variable">follower1</param>
+      <target>follower2</target>
+    </fill>
+    <group leader="leader">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+    </group>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/80leadership_auto_save/__init__.py b/tests/dictionaries_old/80leadership_auto_save/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80leadership_auto_save/errno_29 b/tests/dictionaries_old/80leadership_auto_save/errno_29
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80leadership_autofreeze/00-base.xml b/tests/dictionaries_old/80leadership_autofreeze/00-base.xml
new file mode 100644
index 00000000..c56dc7ad
--- /dev/null
+++ b/tests/dictionaries_old/80leadership_autofreeze/00-base.xml
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="server_deployed" type="boolean"/>
+      <variable name="leader" description="leader" auto_freeze="True" multi="True"/>
+      <variable name="follower1" multi="True"/>
+      <variable name="follower2" multi="True"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valfill</param>
+      <target>follower1</target>
+    </fill>
+    <fill name="calc_val">
+      <param type="variable">follower1</param>
+      <target>follower2</target>
+    </fill>
+    <group leader="leader">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+    </group>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/80leadership_autofreeze/__init__.py b/tests/dictionaries_old/80leadership_autofreeze/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80leadership_autofreeze/errno_30 b/tests/dictionaries_old/80leadership_autofreeze/errno_30
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80leadership_familyaccent/00-base.xml b/tests/dictionaries_old/80leadership_familyaccent/00-base.xml
new file mode 100644
index 00000000..59563c88
--- /dev/null
+++ b/tests/dictionaries_old/80leadership_familyaccent/00-base.xml
@@ -0,0 +1,27 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="Général">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="leader" type="string" description="leader" multi="True"/>
+      <variable name="follower1" type="string" description="follower1"/>
+      <variable name="follower2" type="string" description="follower2"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valfill</param>
+      <target>follower1</target>
+    </fill>
+    <fill name="calc_val">
+      <param type="variable">follower1</param>
+      <target>follower2</target>
+    </fill>
+    <group leader="leader">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+    </group>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/80leadership_familyaccent/__init__.py b/tests/dictionaries_old/80leadership_familyaccent/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80leadership_familyaccent/errno_76 b/tests/dictionaries_old/80leadership_familyaccent/errno_76
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80leadership_leader_not_multi/00-base.xml b/tests/dictionaries_old/80leadership_leader_not_multi/00-base.xml
new file mode 100644
index 00000000..c666b05d
--- /dev/null
+++ b/tests/dictionaries_old/80leadership_leader_not_multi/00-base.xml
@@ -0,0 +1,21 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="general1">
+      <variable name="leader" type="string" description="leader"/>
+      <variable name="follower1" type="string" description="follower1"/>
+      <variable name="follower2" type="string" description="follower2"/>
+    </family>
+  </variables>
+  <constraints>
+    <group leader="leader">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+    </group>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/80leadership_leader_not_multi/__init__.py b/tests/dictionaries_old/80leadership_leader_not_multi/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80leadership_leader_not_multi/errno_32 b/tests/dictionaries_old/80leadership_leader_not_multi/errno_32
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80load_disabled_if_inaccent_family/00-base.xml b/tests/dictionaries_old/80load_disabled_if_inaccent_family/00-base.xml
new file mode 100644
index 00000000..80b22b7d
--- /dev/null
+++ b/tests/dictionaries_old/80load_disabled_if_inaccent_family/00-base.xml
@@ -0,0 +1,29 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="Général">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="Général2">
+      <variable name="mode_conteneur_actif3" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+      <target type="family">Général2</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/80load_disabled_if_inaccent_family/__init__.py b/tests/dictionaries_old/80load_disabled_if_inaccent_family/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80load_disabled_if_inaccent_family/errno_76 b/tests/dictionaries_old/80load_disabled_if_inaccent_family/errno_76
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80load_leadership_normalize_family/00-base.xml b/tests/dictionaries_old/80load_leadership_normalize_family/00-base.xml
new file mode 100644
index 00000000..bfd56a01
--- /dev/null
+++ b/tests/dictionaries_old/80load_leadership_normalize_family/00-base.xml
@@ -0,0 +1,21 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="general-1">
+      <variable name="leader" type="string" description="leader" multi="True"/>
+      <variable name="follower1" type="string" description="follower1"/>
+      <variable name="follower2" type="string" description="follower2"/>
+    </family>
+  </variables>
+  <constraints>
+    <group leader="leader">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+    </group>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/80load_leadership_normalize_family/01-base.xml b/tests/dictionaries_old/80load_leadership_normalize_family/01-base.xml
new file mode 100644
index 00000000..568a8bc3
--- /dev/null
+++ b/tests/dictionaries_old/80load_leadership_normalize_family/01-base.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general-1">
+      <variable name="leader" redefine="True" mandatory="True"/>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/80load_leadership_normalize_family/__init__.py b/tests/dictionaries_old/80load_leadership_normalize_family/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80load_leadership_normalize_family/errno_76 b/tests/dictionaries_old/80load_leadership_normalize_family/errno_76
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80load_mandatoryifin_family/00-base.xml b/tests/dictionaries_old/80load_mandatoryifin_family/00-base.xml
new file mode 100644
index 00000000..f0098ec1
--- /dev/null
+++ b/tests/dictionaries_old/80load_mandatoryifin_family/00-base.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="condition" type="boolean"/>
+    </family>
+    <family name="general2">
+      <variable name="my_variable"/>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="mandatory_if_in" source="condition">
+      <param>oui</param>
+      <target type="family">general2</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/80load_mandatoryifin_family/__init__.py b/tests/dictionaries_old/80load_mandatoryifin_family/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80load_mandatoryifin_family/errno_51 b/tests/dictionaries_old/80load_mandatoryifin_family/errno_51
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80mode_conflict/00-base.xml b/tests/dictionaries_old/80mode_conflict/00-base.xml
new file mode 100644
index 00000000..be7c99e0
--- /dev/null
+++ b/tests/dictionaries_old/80mode_conflict/00-base.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <variable name="server_deployed" type="boolean"/>
+    <family name="general" mode="normal">
+      <variable name="mode_conteneur_actif" type="string" description="No change" mode="expert">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/80mode_conflict/__init__.py b/tests/dictionaries_old/80mode_conflict/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80mode_conflict/errno_62 b/tests/dictionaries_old/80mode_conflict/errno_62
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80mode_leadership_conflict/00-base.xml b/tests/dictionaries_old/80mode_leadership_conflict/00-base.xml
new file mode 100644
index 00000000..cc72e7b4
--- /dev/null
+++ b/tests/dictionaries_old/80mode_leadership_conflict/00-base.xml
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="leadermode">
+      <variable name="leader" type="string" description="leader" multi="True" mode="expert"/>
+      <variable name="follower1" type="string" description="follower1" mode="normal"/>
+      <variable name="follower2" type="string" description="follower2"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_list">
+      <param name="valeur">valfill</param>
+      <target>leader</target>
+    </fill>
+    <group leader="leader">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+    </group>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/80mode_leadership_conflict/__init__.py b/tests/dictionaries_old/80mode_leadership_conflict/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80mode_leadership_conflict/errno_63 b/tests/dictionaries_old/80mode_leadership_conflict/errno_63
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80multi_family_mode_conflict/00-base.xml b/tests/dictionaries_old/80multi_family_mode_conflict/00-base.xml
new file mode 100644
index 00000000..1ef22d25
--- /dev/null
+++ b/tests/dictionaries_old/80multi_family_mode_conflict/00-base.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="base" mode="expert">
+      <family name="subfamily">
+        <variable name="variable" mode="basic"/>
+      </family>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/80multi_family_mode_conflict/__init__.py b/tests/dictionaries_old/80multi_family_mode_conflict/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80multi_family_mode_conflict/errno_61 b/tests/dictionaries_old/80multi_family_mode_conflict/errno_61
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80nil_with_value/00-base.xml b/tests/dictionaries_old/80nil_with_value/00-base.xml
new file mode 100644
index 00000000..0d361343
--- /dev/null
+++ b/tests/dictionaries_old/80nil_with_value/00-base.xml
@@ -0,0 +1,24 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param type="nil">value</param>
+      <target type="variable">mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+      <target type="filelist">afilllist</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/80nil_with_value/__init__.py b/tests/dictionaries_old/80nil_with_value/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80nil_with_value/errno_40 b/tests/dictionaries_old/80nil_with_value/errno_40
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80no_leadership_index/00-base.xml b/tests/dictionaries_old/80no_leadership_index/00-base.xml
new file mode 100644
index 00000000..3f0131b1
--- /dev/null
+++ b/tests/dictionaries_old/80no_leadership_index/00-base.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <variable name="my_variable"/>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="index"/>
+      <target>my_variable</target>
+    </fill>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/80no_leadership_index/__init__.py b/tests/dictionaries_old/80no_leadership_index/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80no_leadership_index/errno_60 b/tests/dictionaries_old/80no_leadership_index/errno_60
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80override_twice/00-base.xml b/tests/dictionaries_old/80override_twice/00-base.xml
new file mode 100644
index 00000000..5114fca2
--- /dev/null
+++ b/tests/dictionaries_old/80override_twice/00-base.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="test">
+      <override/>
+      <override/>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/80override_twice/__init__.py b/tests/dictionaries_old/80override_twice/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80override_twice/errno_69 b/tests/dictionaries_old/80override_twice/errno_69
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80redefine_double_error/00-base.xml b/tests/dictionaries_old/80redefine_double_error/00-base.xml
new file mode 100644
index 00000000..8c9d801f
--- /dev/null
+++ b/tests/dictionaries_old/80redefine_double_error/00-base.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/80redefine_double_error/01-base.xml b/tests/dictionaries_old/80redefine_double_error/01-base.xml
new file mode 100644
index 00000000..9488593c
--- /dev/null
+++ b/tests/dictionaries_old/80redefine_double_error/01-base.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" redefine="True"/>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/80redefine_double_error/02-base.xml b/tests/dictionaries_old/80redefine_double_error/02-base.xml
new file mode 100644
index 00000000..5f50358e
--- /dev/null
+++ b/tests/dictionaries_old/80redefine_double_error/02-base.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" redefine="True" type="string"/>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/80redefine_double_error/__init__.py b/tests/dictionaries_old/80redefine_double_error/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80redefine_double_error/errno_48 b/tests/dictionaries_old/80redefine_double_error/errno_48
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80redefine_error/00-base.xml b/tests/dictionaries_old/80redefine_error/00-base.xml
new file mode 100644
index 00000000..8c9d801f
--- /dev/null
+++ b/tests/dictionaries_old/80redefine_error/00-base.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/80redefine_error/01-redefine.xml b/tests/dictionaries_old/80redefine_error/01-redefine.xml
new file mode 100644
index 00000000..8c9d801f
--- /dev/null
+++ b/tests/dictionaries_old/80redefine_error/01-redefine.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/80redefine_error/__init__.py b/tests/dictionaries_old/80redefine_error/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80redefine_error/errno_45 b/tests/dictionaries_old/80redefine_error/errno_45
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80redefine_fillerror/00-base.xml b/tests/dictionaries_old/80redefine_fillerror/00-base.xml
new file mode 100644
index 00000000..474e7756
--- /dev/null
+++ b/tests/dictionaries_old/80redefine_fillerror/00-base.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valeur</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/80redefine_fillerror/01-base.xml b/tests/dictionaries_old/80redefine_fillerror/01-base.xml
new file mode 100644
index 00000000..bc69cd75
--- /dev/null
+++ b/tests/dictionaries_old/80redefine_fillerror/01-base.xml
@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <constraints>
+    <fill name="concat">
+      <param name="valeur">valeur</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/80redefine_fillerror/__init__.py b/tests/dictionaries_old/80redefine_fillerror/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80redefine_fillerror/errno_24 b/tests/dictionaries_old/80redefine_fillerror/errno_24
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80redefine_notexists/00-base.xml b/tests/dictionaries_old/80redefine_notexists/00-base.xml
new file mode 100644
index 00000000..8c9d801f
--- /dev/null
+++ b/tests/dictionaries_old/80redefine_notexists/00-base.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/80redefine_notexists/01-redefine.xml b/tests/dictionaries_old/80redefine_notexists/01-redefine.xml
new file mode 100644
index 00000000..88750884
--- /dev/null
+++ b/tests/dictionaries_old/80redefine_notexists/01-redefine.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif1" redefine="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/80redefine_notexists/__init__.py b/tests/dictionaries_old/80redefine_notexists/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80redefine_notexists/errno_46 b/tests/dictionaries_old/80redefine_notexists/errno_46
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80service_not_managed_overrides/00-base.xml b/tests/dictionaries_old/80service_not_managed_overrides/00-base.xml
new file mode 100644
index 00000000..4ab31bf6
--- /dev/null
+++ b/tests/dictionaries_old/80service_not_managed_overrides/00-base.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="test" manage="False">
+      <override/>
+    </service>
+  </services>
+  <variables>
+    <variable name="var" type="string">
+      <value>mailname</value>
+    </variable>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/80service_not_managed_overrides/__init__.py b/tests/dictionaries_old/80service_not_managed_overrides/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80service_not_managed_overrides/errno_66 b/tests/dictionaries_old/80service_not_managed_overrides/errno_66
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80services_ip_cidr_netmask/00-base.xml b/tests/dictionaries_old/80services_ip_cidr_netmask/00-base.xml
new file mode 100644
index 00000000..7bb0cce0
--- /dev/null
+++ b/tests/dictionaries_old/80services_ip_cidr_netmask/00-base.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="nut">
+      <ip ip_type="variable" netmask="nut_monitor_netmask">nut_monitor_host</ip>
+    </service>
+  </services>
+  <variables>
+    <variable name="nut_monitor_host" type="network_cidr" mandatory="True"/>
+    <variable name="nut_monitor_netmask" type="netmask" mandatory="True"/>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/80services_ip_cidr_netmask/__init__.py b/tests/dictionaries_old/80services_ip_cidr_netmask/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80services_ip_cidr_netmask/errno_59 b/tests/dictionaries_old/80services_ip_cidr_netmask/errno_59
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80services_ip_netmask/00-base.xml b/tests/dictionaries_old/80services_ip_netmask/00-base.xml
new file mode 100644
index 00000000..cc58453f
--- /dev/null
+++ b/tests/dictionaries_old/80services_ip_netmask/00-base.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="nut">
+      <ip netmask="nut_monitor_netmask">nut_monitor_host</ip>
+    </service>
+  </services>
+  <variables>
+    <variable name="nut_monitor_host" type="ip" mandatory="True"/>
+    <variable name="nut_monitor_netmask" type="netmask" mandatory="True"/>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/80services_ip_netmask/__init__.py b/tests/dictionaries_old/80services_ip_netmask/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80services_ip_netmask/errno_59 b/tests/dictionaries_old/80services_ip_netmask/errno_59
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80services_ip_network_no_netmask/00-base.xml b/tests/dictionaries_old/80services_ip_network_no_netmask/00-base.xml
new file mode 100644
index 00000000..4d7db961
--- /dev/null
+++ b/tests/dictionaries_old/80services_ip_network_no_netmask/00-base.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="nut">
+      <ip>nut_monitor_host</ip>
+    </service>
+  </services>
+  <variables>
+    <variable name="nut_monitor_host" type="network" mandatory="True"/>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/80services_ip_network_no_netmask/__init__.py b/tests/dictionaries_old/80services_ip_network_no_netmask/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80services_ip_network_no_netmask/errno_64 b/tests/dictionaries_old/80services_ip_network_no_netmask/errno_64
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80services_ip_not_netmask/00-base.xml b/tests/dictionaries_old/80services_ip_not_netmask/00-base.xml
new file mode 100644
index 00000000..fb6c6dda
--- /dev/null
+++ b/tests/dictionaries_old/80services_ip_not_netmask/00-base.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="nut">
+      <ip netmask="nut_monitor_netmask">nut_monitor_host</ip>
+    </service>
+  </services>
+  <variables>
+    <variable name="nut_monitor_host" type="network" mandatory="True"/>
+    <variable name="nut_monitor_netmask" type="ip" mandatory="True"/>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/80services_ip_not_netmask/__init__.py b/tests/dictionaries_old/80services_ip_not_netmask/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80services_ip_not_netmask/errno_65 b/tests/dictionaries_old/80services_ip_not_netmask/errno_65
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80services_ip_wrong_type/00-base.xml b/tests/dictionaries_old/80services_ip_wrong_type/00-base.xml
new file mode 100644
index 00000000..4a32f9bd
--- /dev/null
+++ b/tests/dictionaries_old/80services_ip_wrong_type/00-base.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <services>
+    <service name="nut">
+      <ip>nut_monitor_host</ip>
+    </service>
+  </services>
+  <variables>
+    <variable name="nut_monitor_host" type="string" mandatory="True">
+      <value>192.168.0.1</value>
+    </variable>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/80services_ip_wrong_type/__init__.py b/tests/dictionaries_old/80services_ip_wrong_type/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80services_ip_wrong_type/errno_70 b/tests/dictionaries_old/80services_ip_wrong_type/errno_70
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80target_list_unknown/00-base.xml b/tests/dictionaries_old/80target_list_unknown/00-base.xml
new file mode 100644
index 00000000..16a3d95a
--- /dev/null
+++ b/tests/dictionaries_old/80target_list_unknown/00-base.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <variable name="condition" type="boolean"/>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>True</param>
+      <target type="filelist">unknown</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/80target_list_unknown/__init__.py b/tests/dictionaries_old/80target_list_unknown/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80target_list_unknown/errno_2 b/tests/dictionaries_old/80target_list_unknown/errno_2
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80unknown_type/00-base.xml b/tests/dictionaries_old/80unknown_type/00-base.xml
new file mode 100644
index 00000000..cb8d20a5
--- /dev/null
+++ b/tests/dictionaries_old/80unknown_type/00-base.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="unknown" description="Description"/>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/80unknown_type/__init__.py b/tests/dictionaries_old/80unknown_type/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80unknown_type/errno_43 b/tests/dictionaries_old/80unknown_type/errno_43
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80valid_entier_invalid_param/00-base.xml b/tests/dictionaries_old/80valid_entier_invalid_param/00-base.xml
new file mode 100644
index 00000000..7a308656
--- /dev/null
+++ b/tests/dictionaries_old/80valid_entier_invalid_param/00-base.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>b</value>
+      </variable>
+      <variable name="int" type="number" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_entier">
+      <param name="unknown" type="number">0</param>
+      <target>int</target>
+    </check>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/80valid_entier_invalid_param/__init__.py b/tests/dictionaries_old/80valid_entier_invalid_param/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80valid_entier_invalid_param/errno_19 b/tests/dictionaries_old/80valid_entier_invalid_param/errno_19
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80valid_entier_not_number/00-base.xml b/tests/dictionaries_old/80valid_entier_not_number/00-base.xml
new file mode 100644
index 00000000..90129a8e
--- /dev/null
+++ b/tests/dictionaries_old/80valid_entier_not_number/00-base.xml
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>b</value>
+      </variable>
+      <variable name="int" type="number" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_entier">
+      <param name="mini">0</param>
+      <param name="maxi" type="number">100</param>
+      <target>int</target>
+    </check>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/80valid_entier_not_number/__init__.py b/tests/dictionaries_old/80valid_entier_not_number/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80valid_entier_not_number/errno_18 b/tests/dictionaries_old/80valid_entier_not_number/errno_18
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80valid_entier_without_param/00-base.xml b/tests/dictionaries_old/80valid_entier_without_param/00-base.xml
new file mode 100644
index 00000000..c059b410
--- /dev/null
+++ b/tests/dictionaries_old/80valid_entier_without_param/00-base.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>b</value>
+      </variable>
+      <variable name="int" type="number" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_entier">
+      <target>int</target>
+    </check>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/80valid_entier_without_param/__init__.py b/tests/dictionaries_old/80valid_entier_without_param/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80valid_entier_without_param/errno_17 b/tests/dictionaries_old/80valid_entier_without_param/errno_17
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80valid_enum_base_redefine/00-base.xml b/tests/dictionaries_old/80valid_enum_base_redefine/00-base.xml
new file mode 100644
index 00000000..2f2b57b9
--- /dev/null
+++ b/tests/dictionaries_old/80valid_enum_base_redefine/00-base.xml
@@ -0,0 +1,32 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="enumfam" mode="expert">
+      <variable name="enumvar2" type="string" description="multi">
+        <value>c</value>
+      </variable>
+      <variable name="enumvar" type="string" description="multi" help="bla bla bla">
+        <value>c</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>a</param>
+      <param>b</param>
+      <param>c</param>
+      <target>enumvar</target>
+    </check>
+    <check name="valid_enum">
+      <param>a</param>
+      <param>b</param>
+      <param>c</param>
+      <target>enumvar</target>
+    </check>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/80valid_enum_base_redefine/01-base.xml b/tests/dictionaries_old/80valid_enum_base_redefine/01-base.xml
new file mode 100644
index 00000000..64ff8015
--- /dev/null
+++ b/tests/dictionaries_old/80valid_enum_base_redefine/01-base.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="enumfam" mode="expert">
+      <variable name="enumvar" redefine="True">
+        <value>c</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>a</param>
+      <param>c</param>
+      <target>enumvar</target>
+    </check>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/80valid_enum_base_redefine/__init__.py b/tests/dictionaries_old/80valid_enum_base_redefine/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80valid_enum_base_redefine/errno_3 b/tests/dictionaries_old/80valid_enum_base_redefine/errno_3
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80valid_enum_multi_param/00-base.xml b/tests/dictionaries_old/80valid_enum_multi_param/00-base.xml
new file mode 100644
index 00000000..c427f211
--- /dev/null
+++ b/tests/dictionaries_old/80valid_enum_multi_param/00-base.xml
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>a</value>
+      </variable>
+      <variable name="var" type="string" description="New variable" multi="True">
+        <value>a</value>
+        <value>b</value>
+        <value>c</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param type="variable">var</param>
+      <param>d</param>
+      <target>mode_conteneur_actif</target>
+    </check>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/80valid_enum_multi_param/__init__.py b/tests/dictionaries_old/80valid_enum_multi_param/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80valid_enum_multi_param/errno_5 b/tests/dictionaries_old/80valid_enum_multi_param/errno_5
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80valid_enum_multi_variable/00-base.xml b/tests/dictionaries_old/80valid_enum_multi_variable/00-base.xml
new file mode 100644
index 00000000..292c6026
--- /dev/null
+++ b/tests/dictionaries_old/80valid_enum_multi_variable/00-base.xml
@@ -0,0 +1,27 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>a</value>
+      </variable>
+      <variable name="var" type="string" description="New variable" multi="True">
+        <value>a</value>
+        <value>b</value>
+        <value>c</value>
+      </variable>
+      <variable name="var2" type="string" description="New variable" multi="True">
+        <value>a</value>
+        <value>b</value>
+        <value>c</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param type="variable">var</param>
+      <param type="variable">var2</param>
+      <target>mode_conteneur_actif</target>
+    </check>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/80valid_enum_multi_variable/__init__.py b/tests/dictionaries_old/80valid_enum_multi_variable/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80valid_enum_multi_variable/errno_5 b/tests/dictionaries_old/80valid_enum_multi_variable/errno_5
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80valid_enum_no_param/00-base.xml b/tests/dictionaries_old/80valid_enum_no_param/00-base.xml
new file mode 100644
index 00000000..6a067d77
--- /dev/null
+++ b/tests/dictionaries_old/80valid_enum_no_param/00-base.xml
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="enumfam" mode="expert">
+      <variable name="enumvar" type="string" description="multi" help="bla bla bla">
+        <value>c</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <target>enumvar</target>
+    </check>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/80valid_enum_no_param/__init__.py b/tests/dictionaries_old/80valid_enum_no_param/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80valid_enum_no_param/errno_4 b/tests/dictionaries_old/80valid_enum_no_param/errno_4
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80valid_enum_none_multi_variable/00-base.xml b/tests/dictionaries_old/80valid_enum_none_multi_variable/00-base.xml
new file mode 100644
index 00000000..76c6a85e
--- /dev/null
+++ b/tests/dictionaries_old/80valid_enum_none_multi_variable/00-base.xml
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>a</value>
+      </variable>
+      <variable name="var" type="string" description="New variable">
+        <value>a</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param type="variable">var</param>
+      <target>mode_conteneur_actif</target>
+    </check>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/80valid_enum_none_multi_variable/__init__.py b/tests/dictionaries_old/80valid_enum_none_multi_variable/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80valid_enum_none_multi_variable/errno_6 b/tests/dictionaries_old/80valid_enum_none_multi_variable/errno_6
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80valid_enum_number_without_value/00-base.xml b/tests/dictionaries_old/80valid_enum_number_without_value/00-base.xml
new file mode 100644
index 00000000..d0ed36d9
--- /dev/null
+++ b/tests/dictionaries_old/80valid_enum_number_without_value/00-base.xml
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="enumfam" mode="expert">
+      <variable name="enumvar" type="number" description="enumvar" help="bla bla bla"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param type="number"/>
+      <target>enumvar</target>
+    </check>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/80valid_enum_number_without_value/__init__.py b/tests/dictionaries_old/80valid_enum_number_without_value/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80valid_enum_number_without_value/errno_27 b/tests/dictionaries_old/80valid_enum_number_without_value/errno_27
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80value_not_multi/00-base.xml b/tests/dictionaries_old/80value_not_multi/00-base.xml
new file mode 100644
index 00000000..2e3d57be
--- /dev/null
+++ b/tests/dictionaries_old/80value_not_multi/00-base.xml
@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <variable name="nut_monitor_host" type="ip" mandatory="True">
+      <value>192.168.0.1</value>
+      <value>192.168.0.2</value>
+    </variable>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/80value_not_multi/__init__.py b/tests/dictionaries_old/80value_not_multi/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80value_not_multi/errno_68 b/tests/dictionaries_old/80value_not_multi/errno_68
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80variable_accent/00-base.xml b/tests/dictionaries_old/80variable_accent/00-base.xml
new file mode 100644
index 00000000..91c184e7
--- /dev/null
+++ b/tests/dictionaries_old/80variable_accent/00-base.xml
@@ -0,0 +1,21 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="variableAccenté" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="Other">
+      <variable name="mode_conteneur_actif3" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="mode_conteneur_actif3">
+      <param>non</param>
+      <target type="variable">mode_conteneur_actif</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/80variable_accent/01-base.xml b/tests/dictionaries_old/80variable_accent/01-base.xml
new file mode 100644
index 00000000..470481fb
--- /dev/null
+++ b/tests/dictionaries_old/80variable_accent/01-base.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="Général">
+      <variable name="mode_conteneur_actif1" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/80variable_accent/02-base.xml b/tests/dictionaries_old/80variable_accent/02-base.xml
new file mode 100644
index 00000000..a5fa78a9
--- /dev/null
+++ b/tests/dictionaries_old/80variable_accent/02-base.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/80variable_accent/__init__.py b/tests/dictionaries_old/80variable_accent/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80variable_accent/errno_76 b/tests/dictionaries_old/80variable_accent/errno_76
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80variable_extra/00-base.xml b/tests/dictionaries_old/80variable_extra/00-base.xml
new file mode 100644
index 00000000..1b43cfb7
--- /dev/null
+++ b/tests/dictionaries_old/80variable_extra/00-base.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <variable name="extra"/>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/80variable_extra/__init__.py b/tests/dictionaries_old/80variable_extra/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80variable_extra/errno_54 b/tests/dictionaries_old/80variable_extra/errno_54
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80variable_extra/extra_dirs/extra/00-base.xml b/tests/dictionaries_old/80variable_extra/extra_dirs/extra/00-base.xml
new file mode 100644
index 00000000..01bb0521
--- /dev/null
+++ b/tests/dictionaries_old/80variable_extra/extra_dirs/extra/00-base.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <variable name="day"/>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/80variable_family_not_same_name/00-base.xml b/tests/dictionaries_old/80variable_family_not_same_name/00-base.xml
new file mode 100644
index 00000000..699d2292
--- /dev/null
+++ b/tests/dictionaries_old/80variable_family_not_same_name/00-base.xml
@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <variable name="general"/>
+    <family name="general">
+      <variable name="my_variable2"/>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/80variable_family_not_same_name/__init__.py b/tests/dictionaries_old/80variable_family_not_same_name/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80variable_family_not_same_name/errno_56 b/tests/dictionaries_old/80variable_family_not_same_name/errno_56
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80variable_rougail/00-base.xml b/tests/dictionaries_old/80variable_rougail/00-base.xml
new file mode 100644
index 00000000..821d6eec
--- /dev/null
+++ b/tests/dictionaries_old/80variable_rougail/00-base.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <variable name="rougail"/>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/80variable_rougail/__init__.py b/tests/dictionaries_old/80variable_rougail/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80variable_rougail/errno_54 b/tests/dictionaries_old/80variable_rougail/errno_54
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80variable_up/00-base.xml b/tests/dictionaries_old/80variable_up/00-base.xml
new file mode 100644
index 00000000..6a17ac95
--- /dev/null
+++ b/tests/dictionaries_old/80variable_up/00-base.xml
@@ -0,0 +1,21 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="variableAccent" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="Other">
+      <variable name="mode_conteneur_actif3" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="mode_conteneur_actif3">
+      <param>non</param>
+      <target type="variable">mode_conteneur_actif</target>
+    </condition>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/80variable_up/__init__.py b/tests/dictionaries_old/80variable_up/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/80variable_up/errno_76 b/tests/dictionaries_old/80variable_up/errno_76
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/81extra_externalspace/00-base.xml b/tests/dictionaries_old/81extra_externalspace/00-base.xml
new file mode 100644
index 00000000..0747d4f4
--- /dev/null
+++ b/tests/dictionaries_old/81extra_externalspace/00-base.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>
diff --git a/tests/dictionaries_old/81extra_externalspace/__init__.py b/tests/dictionaries_old/81extra_externalspace/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/81extra_externalspace/errno_41 b/tests/dictionaries_old/81extra_externalspace/errno_41
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/81extra_externalspace/extra_dirs/extra/00-base.xml b/tests/dictionaries_old/81extra_externalspace/extra_dirs/extra/00-base.xml
new file mode 100644
index 00000000..e5eb20f0
--- /dev/null
+++ b/tests/dictionaries_old/81extra_externalspace/extra_dirs/extra/00-base.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="ejabberd">
+      <variable name="description" type="string">
+        <value>Exportation de la base de ejabberd</value>
+      </variable>
+      <variable name="day" type="schedule"/>
+      <variable name="mode" type="schedulemod">
+        <value>pre</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/81extra_externalspace/extra_dirs/extra1/00-base.xml b/tests/dictionaries_old/81extra_externalspace/extra_dirs/extra1/00-base.xml
new file mode 100644
index 00000000..50b1055a
--- /dev/null
+++ b/tests/dictionaries_old/81extra_externalspace/extra_dirs/extra1/00-base.xml
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="external">
+      <variable name="description" type="string">
+        <value>test</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_multi_condition">
+      <param>non</param>
+      <param type="variable" name="condition_1">activer_ejabberd</param>
+      <param name="match">none</param>
+      <param name="mismatch">daily</param>
+      <target>extra.ejabberd.day</target>
+    </fill>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/88valid_enum_not_number/00-base.xml b/tests/dictionaries_old/88valid_enum_not_number/00-base.xml
new file mode 100644
index 00000000..7e12737a
--- /dev/null
+++ b/tests/dictionaries_old/88valid_enum_not_number/00-base.xml
@@ -0,0 +1,21 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="enumfam" mode="expert">
+      <variable name="enumvar" type="number" description="enumvar"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>a</param>
+      <param>b</param>
+      <param>c</param>
+      <target>enumvar</target>
+    </check>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/88valid_enum_not_number/__init__.py b/tests/dictionaries_old/88valid_enum_not_number/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/88valid_enum_not_number/errno_13 b/tests/dictionaries_old/88valid_enum_not_number/errno_13
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/88valid_enum_not_number2/00-base.xml b/tests/dictionaries_old/88valid_enum_not_number2/00-base.xml
new file mode 100644
index 00000000..48645ca0
--- /dev/null
+++ b/tests/dictionaries_old/88valid_enum_not_number2/00-base.xml
@@ -0,0 +1,21 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="enumfam" mode="expert">
+      <variable name="enumvar" type="string" description="enumvar">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param type="number">1</param>
+      <target>enumvar</target>
+    </check>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/88valid_enum_not_number2/__init__.py b/tests/dictionaries_old/88valid_enum_not_number2/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/88valid_enum_not_number2/errno_7 b/tests/dictionaries_old/88valid_enum_not_number2/errno_7
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/88valid_enum_not_number_variable/00-base.xml b/tests/dictionaries_old/88valid_enum_not_number_variable/00-base.xml
new file mode 100644
index 00000000..b5bd5401
--- /dev/null
+++ b/tests/dictionaries_old/88valid_enum_not_number_variable/00-base.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="enumfam" mode="expert">
+      <variable name="str" multi="True"/>
+      <variable name="enumvar" type="number"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param type="variable">str</param>
+      <target>enumvar</target>
+    </check>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/88valid_enum_not_number_variable/__init__.py b/tests/dictionaries_old/88valid_enum_not_number_variable/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/88valid_enum_not_number_variable/errno_26 b/tests/dictionaries_old/88valid_enum_not_number_variable/errno_26
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/88valid_enum_numberdefaultstring/00-base.xml b/tests/dictionaries_old/88valid_enum_numberdefaultstring/00-base.xml
new file mode 100644
index 00000000..b8921bb4
--- /dev/null
+++ b/tests/dictionaries_old/88valid_enum_numberdefaultstring/00-base.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="enumfam" mode="expert">
+      <variable name="enumvar" type="string" description="enumvar">
+        <value>a</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>1</param>
+      <param>2</param>
+      <param>3</param>
+      <target>enumvar</target>
+    </check>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/88valid_enum_numberdefaultstring/__init__.py b/tests/dictionaries_old/88valid_enum_numberdefaultstring/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/88valid_enum_numberdefaultstring/errno_15 b/tests/dictionaries_old/88valid_enum_numberdefaultstring/errno_15
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/88valid_enum_variable_optional/00-base.xml b/tests/dictionaries_old/88valid_enum_variable_optional/00-base.xml
new file mode 100644
index 00000000..456c870f
--- /dev/null
+++ b/tests/dictionaries_old/88valid_enum_variable_optional/00-base.xml
@@ -0,0 +1,21 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.9">
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>a</value>
+      </variable>
+      <variable name="var" type="string" description="New variable" multi="True">
+        <value>a</value>
+        <value>b</value>
+        <value>c</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param type="variable" optional="True">var</param>
+      <target>mode_conteneur_actif</target>
+    </check>
+  </constraints>
+</rougail>
diff --git a/tests/dictionaries_old/88valid_enum_variable_optional/__init__.py b/tests/dictionaries_old/88valid_enum_variable_optional/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/88valid_enum_variable_optional/errno_14 b/tests/dictionaries_old/88valid_enum_variable_optional/errno_14
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/dictionaries_old/__init__.py b/tests/dictionaries_old/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/personalize_mode/dictionary/00-base.xml b/tests/personalize_mode/dictionary/00-base.xml
index 0e165549..3904cb81 100644
--- a/tests/personalize_mode/dictionary/00-base.xml
+++ b/tests/personalize_mode/dictionary/00-base.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
+<rougail version="0.10">
     <variables>
         <family name="general" mode="level1">
             <variable name="my_variable" mode="level2"/>
diff --git a/tests/test_upgrade.py b/tests/test_upgrade.py
new file mode 100644
index 00000000..629261bc
--- /dev/null
+++ b/tests/test_upgrade.py
@@ -0,0 +1,87 @@
+from shutil import rmtree, copyfile, copytree
+from os import getcwd, makedirs
+from os.path import isfile, join, isdir
+from pytest import fixture, raises
+from os import listdir
+from json import load
+
+from rougail import RougailUpgrade, RougailConfig
+from rougail.error import DictConsistencyError
+
+
+
+dico_dirs = 'tests/dictionaries_old'
+dest_dir = 'tests/tmp'
+
+
+test_ok = set()
+
+for test in listdir(dico_dirs):
+    if isdir(join(dico_dirs, test)):
+        test_ok.add(test)
+
+excludes = set([])
+#excludes = set(['01base_file_utfchar'])
+test_ok -= excludes
+#test_ok = ['00load_autofreeze']
+#test_ok = []
+
+ORI_DIR = getcwd()
+
+debug = False
+#debug = True
+
+test_ok = list(test_ok)
+test_ok.sort()
+if isdir(dest_dir):
+    rmtree(dest_dir)
+makedirs(dest_dir)
+copyfile(join(dico_dirs, '__init__.py'), join(dest_dir, '__init__.py'))
+#RougailConfig['variable_namespace'] = 'configuration'
+
+
+@fixture(scope="module", params=test_ok)
+def test_dir(request):
+    return request.param
+
+
+def launch_test(test_dir):
+    new_dest_dir = join(dest_dir, test_dir.rsplit('/', 1)[1])
+    makedirs(new_dest_dir)
+    upgrade = RougailUpgrade()
+    try:
+        upgrade.load_xml_from_folders(test_dir, new_dest_dir, RougailConfig['variable_namespace'], display=False)
+    except Exception as err:
+        # import traceback
+        # traceback.print_exc()
+        print(f'cannot convert {test_dir}: {err}')
+        rmtree(new_dest_dir)
+        copytree(test_dir, new_dest_dir)
+        return
+    subfolder = join(test_dir, 'subfolder')
+    if isdir(subfolder):
+        makedirs(join(new_dest_dir, 'subfolder'))
+        upgrade.load_xml_from_folders(subfolder, join(new_dest_dir, 'subfolder'), RougailConfig['variable_namespace'], display=False)
+    if isdir(join(test_dir, 'extra_dirs')):
+        extras = listdir(join(test_dir, 'extra_dirs'))
+        extras.sort()
+        for extra in extras:
+            subfolder = join(test_dir, 'extra_dirs', extra)
+            if isdir(subfolder):
+                makedirs(join(new_dest_dir, 'extra_dirs', extra))
+                upgrade.load_xml_from_folders(subfolder, join(new_dest_dir, 'extra_dirs', extra), extra, display=False)
+    # copy others files
+    for filename in listdir(test_dir):
+        src_filename = join(test_dir, filename)
+        dst_filename = join(new_dest_dir, filename)
+        if filename.startswith('errno_') or filename in ['__init__.py']:
+            copyfile(src_filename, dst_filename)
+        elif filename in ['tmpl', 'makedict', 'tiramisu', 'result', 'patches']:
+            copytree(src_filename, dst_filename, symlinks=True)
+
+
+def test_dictionary(test_dir):
+    assert getcwd() == ORI_DIR
+    test_dir = join(dico_dirs, test_dir)
+    launch_test(test_dir)
+    assert getcwd() == ORI_DIR