diff --git a/src/rougail/update.py b/src/rougail/update/update.py
similarity index 82%
rename from src/rougail/update.py
rename to src/rougail/update/update.py
index 4fccc6590..46b2f6a75 100644
--- a/src/rougail/update.py
+++ b/src/rougail/update/update.py
@@ -1,4 +1,4 @@
-"""Update Rougail XML file to new version
+"""Update Rougail structure file to new version
 
 Cadoles (http://www.cadoles.com)
 Copyright (C) 2021
@@ -23,7 +23,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """
 
-from os import listdir, makedirs
+from os import listdir
 from os.path import basename, isdir, isfile, join
 from typing import Any, List, Optional, Tuple
 
@@ -38,11 +38,11 @@ from json import dumps
 from ruamel.yaml import YAML
 from pathlib import Path
 
-from .config import RougailConfig
-from .error import UpgradeError
-from .i18n import _
-from .object_model import CONVERT_OPTION
-from .utils import normalize_family
+from ..config import RougailConfig
+from ..error import UpgradeError
+from ..i18n import _
+from ..object_model import CONVERT_OPTION
+from ..utils import normalize_family
 
 VERSIONS = ["0.10", "1.0", "1.1"]
 
@@ -63,7 +63,7 @@ class upgrade_010_to_10:
         xmlsrc: str,
     ) -> None:
         self.xmlsrc = xmlsrc
-        self.paths = {"family": {}, "variable": {}}
+        self.paths = {"family": {}, "variable": {}, 'dynamic': {}}
         self.lists = {
             "service": {},
             "ip": {},
@@ -71,7 +71,7 @@ class upgrade_010_to_10:
             "file": {},
         }
         self.flatten_paths = {"family": {}, "variable": {}}
-        self.variables = self.parse_variables(dico, namespace)
+        self.variables = self.parse_variables(dico, namespace, namespace, root=True)
         self.parse_variables_with_path()
         self.parse_services(dico)
         self.parse_constraints(dico)
@@ -80,13 +80,20 @@ class upgrade_010_to_10:
         self,
         family: dict,
         sub_path: str,
+        true_sub_path: str,
+        *,
+        root: bool=False,
+        is_dynamic: bool=False,
     ) -> dict:
         new_families = {}
+        if root:
+            new_families['version'] = None
         if "variables" in family:
             for subelt in family["variables"]:
                 for typ, obj in subelt.items():
                     for subobj in obj:
-                        getattr(self, f"convert_{typ}")(subobj, new_families, sub_path)
+                        local_is_dynamic = is_dynamic or subobj.get('dynamic') is not None
+                        getattr(self, f"convert_{typ}")(subobj, new_families, sub_path, true_sub_path, local_is_dynamic)
             family.pop("variables")
         return new_families
 
@@ -95,9 +102,17 @@ class upgrade_010_to_10:
         family: dict,
         new_families: dict,
         sub_path: str,
+        true_sub_path: str,
+        is_dynamic: bool,
     ) -> None:
         # name is the key, do not let it in values
         name = family.pop("name")
+        if true_sub_path:
+            true_sub_path = true_sub_path + "." + name
+        else:
+            true_sub_path = name
+        if is_dynamic:
+            name += '{{ suffix }}'
         if sub_path:
             sub_path = sub_path + "." + name
         else:
@@ -111,7 +126,7 @@ class upgrade_010_to_10:
                 if typ == "dynamic":
                     family["variable"] = self.get_variable_path(value)
         # add sub families and sub variables
-        sub_families = self.parse_variables(family, sub_path)
+        sub_families = self.parse_variables(family, sub_path, true_sub_path, is_dynamic=is_dynamic)
         for sub_name, sub_family in sub_families.copy().items():
             if sub_name not in family:
                 continue
@@ -127,12 +142,23 @@ class upgrade_010_to_10:
         variable: dict,
         new_families: dict,
         sub_path: str,
+        true_sub_path: str,
+        is_dynamic: bool,
     ) -> dict:
         name = variable.pop("name")
+        if is_dynamic:
+            if true_sub_path:
+                true_sub_path = true_sub_path + "." + name
+            else:
+                true_sub_path = name
+            self.flatten_paths["variable"][name] = true_sub_path
+            name += '{{ suffix }}'
         if sub_path:
             sub_path = sub_path + "." + name
         else:
             sub_path = name
+        if is_dynamic:
+            self.paths['dynamic'][true_sub_path] = sub_path
         new_families[name] = variable
         self.flatten_paths["variable"][name] = sub_path
         self.paths["variable"][sub_path] = variable
@@ -172,24 +198,32 @@ class upgrade_010_to_10:
                         )(test)
                     )
             variable["test"] = tests
+        if variable.get('mandatory', False):
+            del variable["mandatory"]
+        CONVERT_TYPE = {'filename': 'unix_filename',
+                        'password': 'secret',
+                        }
+        if variable.get('type') in CONVERT_TYPE:
+            variable['type'] = CONVERT_TYPE[variable['type']]
 
     def parse_variables_with_path(self):
         for variable in self.paths["variable"].values():
+            multi = variable.get('multi', False)
             if "value" in variable:
                 default = variable.pop("value")
                 if default is not None:
-                    if not variable.get("multi", False) and len(default) == 1:
-                        variable["default"] = self.get_value(default[0])
+                    if not multi and len(default) == 1:
+                        variable["default"] = self.get_value(default[0], multi)
                     else:
                         variable["default"] = [
-                            self.get_value(value) for value in default
+                            self.get_value(value, multi) for value in default
                         ]
             if "choice" in variable:
                 if not variable["choice"]:
                     variable["choices"] = variable.pop("choice")
                 else:
                     variable["choices"] = [
-                        self.get_value(choice) for choice in variable.pop("choice")
+                        self.get_value(choice, multi) for choice in variable.pop("choice")
                     ]
 
     def parse_services(
@@ -305,15 +339,32 @@ class upgrade_010_to_10:
             apply_on_fallback = False
         source = self.get_variable_path(condition["source"])
         if not source:
-            source = f'__{condition["source"]}'
+            source = condition["source"]
         name = condition.pop("name")
         prop = name.split("_", 1)[0]
+        multi = False
+        for target in condition["target"]:
+            typ = target.get("type", "variable")
+            if typ == "variable":
+                variable_path = self.get_variable_path(target["text"])
+                if variable_path is None:
+                    continue
+                variable = self.paths["variable"][variable_path]
+                if variable.get('multi', False):
+                    multi = True
         if apply_on_fallback:
             condition_value = True
         else:
+            if "{{ suffix }}" in source:
+                force_param = {'__var': source}
+                source = '__var'
+            else:
+                force_param = None
             condition_value = self.params_condition_to_jinja(
-                prop, source, condition["param"], name.endswith("if_in")
+                prop, source, condition["param"], name.endswith("if_in"), multi
             )
+            if force_param:
+                condition_value.setdefault('params', {}).update(force_param)
         for target in condition["target"]:
             typ = target.get("type", "variable")
             if typ == "variable":
@@ -366,7 +417,7 @@ class upgrade_010_to_10:
                 check["param"] = [
                     {"text": variable_path, "type": "variable"}
                 ] + check.get("param", [])
-                check_value = self.convert_param_function(check)
+                check_value = self.convert_param_function(check, variable.get('multi', False))
             variable.setdefault("validators", []).append(check_value)
 
     def parse_fill(
@@ -376,17 +427,22 @@ class upgrade_010_to_10:
         for target in fill.pop("target"):
             params = []
             variable_path = self.get_variable_path(target["text"])
-            if variable_path is None:
-                continue
-            variable = self.paths["variable"][variable_path]
-            if fill.get("type") == "jinja":
-                fill_value = {
-                    "type": "jinja",
-                    "jinja": fill["name"],
-                }
+            if variable_path in self.paths["dynamic"]:
+                variable_path = self.paths["dynamic"][variable_path]
+            if variable_path in self.paths["variable"]:
+                variable = self.paths["variable"][variable_path]
+                if fill.get("type") == "jinja":
+                    fill_value = {
+                        "type": "jinja",
+                        "jinja": fill["name"],
+                    }
+                else:
+                    fill_value = self.convert_param_function(fill, variable.get('multi', False))
+                variable["default"] = fill_value
+                if variable.get('mandatory') is False:
+                    del variable['mandatory']
             else:
-                fill_value = self.convert_param_function(fill)
-            variable["default"] = fill_value
+                raise Exception(f'cannot set fill to unknown variable "{variable_path}"')
 
     def params_condition_to_jinja(
         self,
@@ -394,6 +450,7 @@ class upgrade_010_to_10:
         path: str,
         params: List[dict],
         if_in: bool,
+        multi: bool,
     ) -> str:
         new_params = {}
         jinja = "{% if "
@@ -401,7 +458,7 @@ class upgrade_010_to_10:
             if idx:
                 jinja += " or "
 
-            new_param, value = self.get_jinja_param_and_value(param)
+            new_param, value = self.get_jinja_param_and_value(param, multi)
             if value:
                 jinja += path + " == " + value
             if new_param:
@@ -421,10 +478,11 @@ class upgrade_010_to_10:
     def get_value(
         self,
         param: dict,
+        multi: bool,
     ) -> Any:
         typ = param.get("type", "string")
         if typ == "string":
-            value = param["text"]
+            value = param.get("text")
         elif typ == "number":
             value = int(param["text"])
         elif typ == "nil":
@@ -446,7 +504,7 @@ class upgrade_010_to_10:
             if "propertyerror" in param:
                 value["propertyerror"] = param["propertyerror"]
         elif typ == "function":
-            value = self.convert_param_function(param)
+            value = self.convert_param_function(param, multi)
         elif typ == "information":
             value = {
                 "type": "information",
@@ -464,10 +522,11 @@ class upgrade_010_to_10:
     def get_jinja_param_and_value(
         self,
         param,
+        multi: bool,
     ) -> Tuple[list, Any]:
         new_param = None
         typ = param.get("type", "string")
-        value = self.get_value(param)
+        value = self.get_value(param, multi)
         if isinstance(value, dict):
             if typ == "information":
                 key = normalize_family(value["information"])
@@ -475,17 +534,25 @@ class upgrade_010_to_10:
                     attr_name = f'{value["variable"]}.{key}'
                 else:
                     attr_name = key
-                attr_name = f"__information.{attr_name}"
+                attr_name = f"__information_{attr_name}"
                 new_param = {attr_name: value}
                 value = attr_name
             elif typ in ["index", "suffix"]:
-                attr_name = f"__{typ}"
-                new_param = {attr_name: value}
+                if 'name' in value:
+                    attr_name = value['name']
+                else:
+                    attr_name = f"__{typ}"
+                new_param = {attr_name: {"type": typ}}
                 value = attr_name
             elif "propertyerror" in param or "optional" in param:
                 attr_name = value["variable"]
                 new_param = {attr_name: value}
                 value = value[typ]
+            elif "{{ suffix }}" in value[typ]:
+                path = value[typ]
+                attr_name = path.split('.')[-1][:-12]  # remove {{ suffix }}
+                new_param = {attr_name: value}
+                value = attr_name
             else:
                 value = value[typ]
             if not value:
@@ -497,22 +564,35 @@ class upgrade_010_to_10:
     def convert_param_function(
         self,
         param: dict,
+        multi: bool,
     ) -> str:
         text = param["name"]
         params = {}
+#        multi = False
         if "param" in param and param["param"]:
+            if text == 'calc_value' and len(param["param"]) == 1 and isinstance(param["param"][0], dict) and param["param"][0].get('type') == 'variable' and param["param"][0].get("text"):
+                value = param["param"][0]["text"]
+                path = self.get_variable_path(value)
+                if not path:
+                    path = value
+                ret = {"type": "variable", "variable": path}
+                if 'optional' in param["param"][0]:
+                    ret['optional'] = param["param"][0]["optional"]
+                return ret
             first, *others = param["param"]
-            new_param, first = self.get_jinja_param_and_value(first)
+            new_param, first = self.get_jinja_param_and_value(first, multi)
             text = f"{first} | {text}"
             if new_param:
                 params |= new_param
             if others:
                 values = []
                 for param in others:
-                    new_param, value = self.get_jinja_param_and_value(param)
+                    new_param, value = self.get_jinja_param_and_value(param, multi)
                     if new_param:
                         params |= new_param
                     if "name" in param:
+                        if param["name"] == "multi" and value == "true":
+                            multi = True
                         values.append(f'{param["name"]}={value}')
                     else:
                         values.append(value)
@@ -521,7 +601,12 @@ class upgrade_010_to_10:
                 text += ")"
         else:
             text += "()"
-        text = "{{ " + text + " }}"
+        if not multi:
+            text = "{{ " + text + " }}"
+        else:
+            text = """{% for __variable in """ + text + """ %}
+{{ __variable }}
+{% endfor %}"""
         ret = {"type": "jinja", "jinja": text}
         if params:
             ret["params"] = params
@@ -536,8 +621,10 @@ class upgrade_010_to_10:
             and path in self.flatten_paths["variable"]
         ):
             path = self.flatten_paths["variable"][path]
+        if path in self.paths["dynamic"]:
+            path = self.paths["dynamic"][path]
         if path not in self.paths["variable"]:
-            return
+            return path
         return path
 
     def get_family_path(
@@ -569,43 +656,38 @@ class RougailUpgrade:
             rougailconfig = RougailConfig
         self.rougailconfig = rougailconfig
 
-    def load_dictionaries(
+    def run(
         self,
-        dstfolder: str,
-        services_dstfolder: Optional[str] = None,
-        extra_dstfolder: Optional[str] = None,
     ):
-        if extra_dstfolder is None:
-            extra_dstfolder = dstfolder
-        dict_dirs = self.rougailconfig["main_dictionaries"]
-        if not isinstance(dict_dirs, list):
-            dict_dirs = [dict_dirs]
-        for dict_dir in dict_dirs:
+        for dict_dir, dest_dir in zip(self.rougailconfig["main_dictionaries"], self.rougailconfig["upgrade_options.main_dictionaries"]):
             self._load_dictionaries(
                 dict_dir,
-                dstfolder,
-                services_dstfolder,
+                dest_dir,
                 normalize_family(self.rougailconfig["main_namespace"]),
             )
-        for namespace, extra_dirs in self.rougailconfig["extra_dictionaries"].items():
-            extra_dstsubfolder = join(extra_dstfolder, namespace)
-            if not isdir(extra_dstsubfolder):
-                makedirs(extra_dstsubfolder)
-            for extra_dir in extra_dirs:
-                self._load_dictionaries(
-                    extra_dir,
-                    extra_dstsubfolder,
-                    None,
-                    normalize_family(namespace),
-                )
+        if self.rougailconfig['main_namespace']:
+            if self.rougailconfig["extra_dictionaries"]:
+                dst_extra_dir = self.rougailconfig["upgrade_options.extra_dictionary"]
+                for namespace, extra_dirs in self.rougailconfig["extra_dictionaries"].items():
+                    extra_dstsubfolder = Path(dst_extra_dir) / namespace
+                    if not extra_dstsubfolder.is_dir():
+                        extra_dstsubfolder.mkdir()
+                    for extra_dir in extra_dirs:
+                        self._load_dictionaries(
+                            str(extra_dir),
+                            str(extra_dstsubfolder),
+                            normalize_family(namespace),
+                    )
 
     def _load_dictionaries(
         self,
         srcfolder: str,
-        dstfolder: str,
-        services_dstfolder: Optional[str],
+        dstfolder: Optional[str],
         namespace: str,
     ) -> None:
+        if dstfolder is None:
+            dstfolder = srcfolder
+        Path(dstfolder).mkdir(parents=True, exist_ok=True)
         filenames = [
             filename
             for filename in listdir(srcfolder)
@@ -614,18 +696,8 @@ class RougailUpgrade:
         filenames.sort()
         for filename in filenames:
             xmlsrc = Path(srcfolder) / Path(filename)
-            ymlfile = filename[:-3] + "yml"
-            xmldst = Path(dstfolder) / Path(ymlfile)
-            if xmldst.is_file():
-                raise Exception(
-                    f'cannot update "{xmlsrc}" destination file "{xmldst}" already exists'
-                )
-            if services_dstfolder:
-                ymldst_services = Path(services_dstfolder) / ymlfile
-                if ymldst_services.is_file():
-                    raise Exception(
-                        f'cannot update "{xmlsrc}" destination file "{ymldst_services}" already exists'
-                    )
+
+            ymldst = Path(dstfolder) / (Path(filename).stem + '.yml')
             if filename.endswith(".xml"):
                 if parse is None:
                     raise Exception("XML module is not installed")
@@ -640,7 +712,7 @@ class RougailUpgrade:
                 )
                 ext = "xml"
             else:
-                with xmlsrc.open() as xml_fh:
+                with xmlsrc.open() as file_fh:
                     root = YAML(typ="safe").load(file_fh)
                 search_function_name = get_function_name(str(root["version"]))
                 ext = "yml"
@@ -660,24 +732,23 @@ class RougailUpgrade:
                         root_services = root_services_
                 if function_version == search_function_name:
                     function_found = True
-            if root:
-                root["version"] = version
-                xmldst.parent.mkdir(parents=True, exist_ok=True)
-                with xmldst.open("w") as ymlfh:
+            if root != {'version': None}:
+                root["version"] = float(version)
+                with ymldst.open("w") as ymlfh:
                     yaml = YAML()
                     yaml.dump(
                         root,
-                        xmldst,
-                    )
-            if root_services and services_dstfolder:
-                root_services["version"] = version
-                ymldst_services.parent.mkdir(parents=True, exist_ok=True)
-                with ymldst_services.open("w") as ymlfh:
-                    yaml = YAML()
-                    yaml.dump(
-                        root_services,
                         ymlfh,
                     )
+            # if root_services and services_dstfolder:
+            #     root_services["version"] = version
+            #     ymldst_services.parent.mkdir(parents=True, exist_ok=True)
+            #     with ymldst_services.open("w") as ymlfh:
+            #         yaml = YAML()
+            #         yaml.dump(
+            #             root_services,
+            #             ymlfh,
+            #         )
 
     def _attribut_to_bool(self, variable):
         for prop in [
@@ -833,23 +904,47 @@ class RougailUpgrade:
         return dico
 
     def _update_1_1(self, root):
-        if not isinstance(root, dict):
-            return
-        # migrate dynamic family
-        if (
-            ("variable" in root and isinstance(root["variable"], str))
-            or ("_variable" in root and isinstance(root["_variable"], str))
-        ) and (
-            ("_type" in root and root["_type"] == "dynamic")
-            or ("type" in root and root["type"] == "dynamic")
-        ):
-            root["dynamic"] = {
-                "type": "variable",
-                "variable": root.pop("variable"),
-                "propertyerror": False,
-            }
+        new_root = {}
+        update_root = False
         for key, value in root.items():
+            new_root[key] = value
+            if not isinstance(value, dict):
+                continue
+            # migrate dynamic family
+            if (
+                ("variable" in value and isinstance(value["variable"], str))
+                or ("_variable" in value and isinstance(value["_variable"], str))
+            ) and (
+                ("_type" in value and value["_type"] == "dynamic")
+                or ("type" in value and value["type"] == "dynamic")
+            ):
+                value["dynamic"] = {
+                    "type": "variable",
+                    "variable": value.pop("variable"),
+                    "propertyerror": False,
+                }
+                if '{{ suffix }}' not in key:
+                    new_root[key + '{{ suffix }}'] = new_root.pop(key)
+                    update_root = True
             self._update_1_1(value)
+            for typ, obj in {'boolean': bool,
+                             'number': int,
+                             'string': str,
+                             'float': float,
+                             }.items():
+                if value.get('type') == typ:
+                    default = value.get('default')
+                    if default is None or default == []:
+                        continue
+                    if isinstance(default, obj):
+                        del value['type']
+                    elif isinstance(default, list) and isinstance(default[0], obj):
+                        del value['type']
+            if value.get('multi') and isinstance(value.get('default'), list):
+                del value['multi']
+        if update_root:
+            root.clear()
+            root.update(new_root)
 
     def update_1_1(
         self,
@@ -877,7 +972,7 @@ class RougailUpgrade:
                 objects = root.find(typ)
                 if objects is None:
                     objects = []
-                new_objects = self._xml_to_yaml(objects, typ, variables, "")
+                new_objects = self._xml_to_yaml(objects, typ, variables, namespace)
                 if new_objects[typ]:
                     new_root.update(new_objects)
         else:
@@ -927,7 +1022,6 @@ class RougailUpgrade:
                 if not has_value:
                     value = SubElement(variable, "value")
                     value.text = choices[0]
-                variable.attrib["mandatory"] = "True"
 
         # convert group to leadership
         groups = []
diff --git a/tests/dictionaries/60_5family_dynamic_variable_outside_jinja/dictionaries/rougail/00-base.yml b/tests/dictionaries/60_5family_dynamic_variable_outside_jinja/dictionaries/rougail/00-base.yml
new file mode 100644
index 000000000..b00682460
--- /dev/null
+++ b/tests/dictionaries/60_5family_dynamic_variable_outside_jinja/dictionaries/rougail/00-base.yml
@@ -0,0 +1,25 @@
+---
+version: '1.1'
+var:  # a suffix variable
+  - val1
+  - val2
+"my_dyn_family_{{ suffix }}":
+  description: a dynamic family
+  dynamic:
+    variable: _.var
+  var:
+    description: a variable inside a dynamic family
+    default:
+      type: suffix
+    mandatory: false
+var2:
+  description: a variable
+  multi: true
+  default:
+    jinja: |-
+      {%- for v in var %}
+      {{ v }}
+      {%- endfor -%}
+    params:
+      var:
+        variable: rougail.my_dyn_family_{{ suffix }}.var
diff --git a/tests/dictionaries_old/01fill_target_optional/__init__.py b/tests/dictionaries/60_5family_dynamic_variable_outside_jinja/force_namespace
similarity index 100%
rename from tests/dictionaries_old/01fill_target_optional/__init__.py
rename to tests/dictionaries/60_5family_dynamic_variable_outside_jinja/force_namespace
diff --git a/tests/dictionaries/60_5family_dynamic_variable_outside_jinja/makedict/after.json b/tests/dictionaries/60_5family_dynamic_variable_outside_jinja/makedict/after.json
new file mode 100644
index 000000000..d3125ba01
--- /dev/null
+++ b/tests/dictionaries/60_5family_dynamic_variable_outside_jinja/makedict/after.json
@@ -0,0 +1,24 @@
+{
+    "rougail.var": {
+        "owner": "default",
+        "value": [
+            "val1",
+            "val2"
+        ]
+    },
+    "rougail.my_dyn_family_val1.var": {
+        "owner": "default",
+        "value": "val1"
+    },
+    "rougail.my_dyn_family_val2.var": {
+        "owner": "default",
+        "value": "val2"
+    },
+    "rougail.var2": {
+        "owner": "default",
+        "value": [
+            "val1",
+            "val2"
+        ]
+    }
+}
diff --git a/tests/dictionaries/60_5family_dynamic_variable_outside_jinja/makedict/base.json b/tests/dictionaries/60_5family_dynamic_variable_outside_jinja/makedict/base.json
new file mode 100644
index 000000000..8bde92058
--- /dev/null
+++ b/tests/dictionaries/60_5family_dynamic_variable_outside_jinja/makedict/base.json
@@ -0,0 +1,12 @@
+{
+    "rougail.var": [
+        "val1",
+        "val2"
+    ],
+    "rougail.my_dyn_family_val1.var": "val1",
+    "rougail.my_dyn_family_val2.var": "val2",
+    "rougail.var2": [
+        "val1",
+        "val2"
+    ]
+}
diff --git a/tests/dictionaries/60_5family_dynamic_variable_outside_jinja/makedict/before.json b/tests/dictionaries/60_5family_dynamic_variable_outside_jinja/makedict/before.json
new file mode 100644
index 000000000..d3125ba01
--- /dev/null
+++ b/tests/dictionaries/60_5family_dynamic_variable_outside_jinja/makedict/before.json
@@ -0,0 +1,24 @@
+{
+    "rougail.var": {
+        "owner": "default",
+        "value": [
+            "val1",
+            "val2"
+        ]
+    },
+    "rougail.my_dyn_family_val1.var": {
+        "owner": "default",
+        "value": "val1"
+    },
+    "rougail.my_dyn_family_val2.var": {
+        "owner": "default",
+        "value": "val2"
+    },
+    "rougail.var2": {
+        "owner": "default",
+        "value": [
+            "val1",
+            "val2"
+        ]
+    }
+}
diff --git a/tests/dictionaries/60_5family_dynamic_variable_outside_jinja/makedict/mandatory.json b/tests/dictionaries/60_5family_dynamic_variable_outside_jinja/makedict/mandatory.json
new file mode 100644
index 000000000..0637a088a
--- /dev/null
+++ b/tests/dictionaries/60_5family_dynamic_variable_outside_jinja/makedict/mandatory.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/tests/dictionaries/60_5family_dynamic_variable_outside_jinja/tiramisu/base.py b/tests/dictionaries/60_5family_dynamic_variable_outside_jinja/tiramisu/base.py
new file mode 100644
index 000000000..4f2011614
--- /dev/null
+++ b/tests/dictionaries/60_5family_dynamic_variable_outside_jinja/tiramisu/base.py
@@ -0,0 +1,15 @@
+from tiramisu import *
+from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
+from re import compile as re_compile
+from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
+load_functions('tests/dictionaries/../eosfunc/test.py')
+ALLOWED_LEADER_PROPERTIES.add("basic")
+ALLOWED_LEADER_PROPERTIES.add("standard")
+ALLOWED_LEADER_PROPERTIES.add("advanced")
+dict_env['default_rougail.var2'] = "{%- for v in var %}\n{{ v }}\n{%- endfor -%}"
+option_2 = StrOption(name="var", doc="a suffix variable", multi=True, default=["val1", "val2"], default_multi="val1", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'})
+option_4 = StrOption(name="var", doc="a variable inside a dynamic family", default=Calculation(func['calc_value'], Params((ParamSuffix()))), properties=frozenset({"standard"}), informations={'type': 'string'})
+optiondescription_3 = ConvertDynOptionDescription(name="my_dyn_family_{{ suffix }}", doc="a dynamic family", suffixes=Calculation(func['calc_value'], Params((ParamOption(option_2)))), children=[option_4], properties=frozenset({"standard"}))
+option_5 = StrOption(name="var2", doc="a variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/60_5family_dynamic_variable_outside_jinja/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.var2"), 'var': ParamOption(option_4)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'})
+optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", children=[option_2, optiondescription_3, option_5], properties=frozenset({"standard"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1])
diff --git a/tests/dictionaries/60_5family_dynamic_variable_outside_jinja/tiramisu/multi.py b/tests/dictionaries/60_5family_dynamic_variable_outside_jinja/tiramisu/multi.py
new file mode 100644
index 000000000..8b82245bc
--- /dev/null
+++ b/tests/dictionaries/60_5family_dynamic_variable_outside_jinja/tiramisu/multi.py
@@ -0,0 +1,23 @@
+from tiramisu import *
+from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
+from re import compile as re_compile
+from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
+load_functions('tests/dictionaries/../eosfunc/test.py')
+ALLOWED_LEADER_PROPERTIES.add("basic")
+ALLOWED_LEADER_PROPERTIES.add("standard")
+ALLOWED_LEADER_PROPERTIES.add("advanced")
+dict_env['default_1.rougail.var2'] = "{%- for v in var %}\n{{ v }}\n{%- endfor -%}"
+dict_env['default_2.rougail.var2'] = "{%- for v in var %}\n{{ v }}\n{%- endfor -%}"
+option_3 = StrOption(name="var", doc="a suffix variable", multi=True, default=["val1", "val2"], default_multi="val1", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'})
+option_5 = StrOption(name="var", doc="a variable inside a dynamic family", default=Calculation(func['calc_value'], Params((ParamSuffix()))), properties=frozenset({"standard"}), informations={'type': 'string'})
+optiondescription_4 = ConvertDynOptionDescription(name="my_dyn_family_{{ suffix }}", doc="a dynamic family", suffixes=Calculation(func['calc_value'], Params((ParamOption(option_3)))), children=[option_5], properties=frozenset({"standard"}))
+option_6 = StrOption(name="var2", doc="a variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/60_5family_dynamic_variable_outside_jinja/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.var2"), 'var': ParamOption(option_5)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'})
+optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, optiondescription_4, option_6], properties=frozenset({"standard"}))
+optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"}))
+option_9 = StrOption(name="var", doc="a suffix variable", multi=True, default=["val1", "val2"], default_multi="val1", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'})
+option_11 = StrOption(name="var", doc="a variable inside a dynamic family", default=Calculation(func['calc_value'], Params((ParamSuffix()))), properties=frozenset({"standard"}), informations={'type': 'string'})
+optiondescription_10 = ConvertDynOptionDescription(name="my_dyn_family_{{ suffix }}", doc="a dynamic family", suffixes=Calculation(func['calc_value'], Params((ParamOption(option_9)))), children=[option_11], properties=frozenset({"standard"}))
+option_12 = StrOption(name="var2", doc="a variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/60_5family_dynamic_variable_outside_jinja/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.var2"), 'var': ParamOption(option_11)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'})
+optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[option_9, optiondescription_10, option_12], properties=frozenset({"standard"}))
+optiondescription_7 = OptionDescription(name="2", doc="2", children=[optiondescription_8], properties=frozenset({"standard"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_7])
diff --git a/tests/dictionaries_old/00empty/result/services/00_base.yml b/tests/dictionaries_old/00empty/result/services/00_base.yml
deleted file mode 100644
index 8b6e1feff..000000000
--- a/tests/dictionaries_old/00empty/result/services/00_base.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-tata.service: {}
-version: '1.1'
diff --git a/tests/dictionaries_old/00load_autosave/result/rougail/00-base.yml b/tests/dictionaries_old/00load_autosave/result/rougail/00-base.yml
index 8e514f4d6..efd4ae682 100644
--- a/tests/dictionaries_old/00load_autosave/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/00load_autosave/result/rougail/00-base.yml
@@ -1,10 +1,9 @@
+version: 1.1
 server_deployed:
   type: boolean
 general:
   description: général
   mode_conteneur_actif:
-    type: string
     description: No change
     auto_save: true
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/00load_autosaveexpert/result/rougail/00-base.yml b/tests/dictionaries_old/00load_autosaveexpert/result/rougail/00-base.yml
index 9bd9f3f40..d537b561f 100644
--- a/tests/dictionaries_old/00load_autosaveexpert/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/00load_autosaveexpert/result/rougail/00-base.yml
@@ -1,11 +1,10 @@
+version: 1.1
 server_deployed:
   type: boolean
 general:
   description: général
   mode_conteneur_actif:
-    type: string
     description: No change
     auto_save: true
     mode: advanced
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/00load_comment/result/rougail/00-base.yml b/tests/dictionaries_old/00load_comment/result/rougail/00-base.yml
index efac7c360..0777084bf 100644
--- a/tests/dictionaries_old/00load_comment/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/00load_comment/result/rougail/00-base.yml
@@ -1,8 +1,7 @@
+version: 1.1
 general:
   description: général
   mode_conteneur_actif:
-    type: string
     description: No change
     hidden: true
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/00load_notype/result/rougail/00-base.yml b/tests/dictionaries_old/00load_notype/result/rougail/00-base.yml
index 3801bbcc4..991d9cb82 100644
--- a/tests/dictionaries_old/00load_notype/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/00load_notype/result/rougail/00-base.yml
@@ -1,10 +1,9 @@
+version: 1.1
 general:
   description: général
   mode_conteneur_actif:
-    type: string
     description: No change
     hidden: true
     default: non
   without_type:
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/00load_save/result/rougail/00-base.yml b/tests/dictionaries_old/00load_save/result/rougail/00-base.yml
index efac7c360..0777084bf 100644
--- a/tests/dictionaries_old/00load_save/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/00load_save/result/rougail/00-base.yml
@@ -1,8 +1,7 @@
+version: 1.1
 general:
   description: général
   mode_conteneur_actif:
-    type: string
     description: No change
     hidden: true
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/01auto_base/result/rougail/00-base.yml b/tests/dictionaries_old/01auto_base/result/rougail/00-base.yml
index ce0ec21c1..10e800661 100644
--- a/tests/dictionaries_old/01auto_base/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/01auto_base/result/rougail/00-base.yml
@@ -1,3 +1,4 @@
+version: 1.1
 general:
   mode_conteneur_actif:
     type: string
@@ -7,7 +8,5 @@ general:
       type: jinja
       jinja: '{{ rougail.general.mode_conteneur_actif1 | calc_val }}'
   mode_conteneur_actif1:
-    type: string
     description: No change
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/01auto_jinja_base/result/rougail/00-base.yml b/tests/dictionaries_old/01auto_jinja_base/result/rougail/00-base.yml
index 33dd13eed..eeb877959 100644
--- a/tests/dictionaries_old/01auto_jinja_base/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/01auto_jinja_base/result/rougail/00-base.yml
@@ -1,3 +1,4 @@
+version: 1.1
 general:
   mode_conteneur_actif:
     type: string
@@ -7,7 +8,5 @@ general:
       type: jinja
       jinja: '{{ rougail.general.mode_conteneur_actif1 }}'
   mode_conteneur_actif1:
-    type: string
     description: No change
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/01auto_jinja_full_path/result/rougail/00-base.yml b/tests/dictionaries_old/01auto_jinja_full_path/result/rougail/00-base.yml
index 33dd13eed..eeb877959 100644
--- a/tests/dictionaries_old/01auto_jinja_full_path/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/01auto_jinja_full_path/result/rougail/00-base.yml
@@ -1,3 +1,4 @@
+version: 1.1
 general:
   mode_conteneur_actif:
     type: string
@@ -7,7 +8,5 @@ general:
       type: jinja
       jinja: '{{ rougail.general.mode_conteneur_actif1 }}'
   mode_conteneur_actif1:
-    type: string
     description: No change
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/01auto_jinja_if/result/rougail/00-base.yml b/tests/dictionaries_old/01auto_jinja_if/result/rougail/00-base.yml
index fb22c210b..29d253210 100644
--- a/tests/dictionaries_old/01auto_jinja_if/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/01auto_jinja_if/result/rougail/00-base.yml
@@ -1,22 +1,19 @@
+version: 1.1
 general:
   mode_conteneur_actif:
     type: string
     description: No change
     hidden: true
-    mandatory: false
     default:
       type: jinja
       jinja: "{% if mode_conteneur_actif1 == 'non' %}non{% else %}oui{% endif %}"
   mode_conteneur_actif1:
-    type: string
     description: No change
     default: non
   mode_conteneur_actif2:
     type: string
     description: No change
     hidden: true
-    mandatory: false
     default:
       type: jinja
       jinja: '{% if mode_conteneur_actif1 == "non" %}oui{% else %}non{% endif %}'
-version: '1.1'
diff --git a/tests/dictionaries_old/01auto_jinja_if_bool/result/rougail/00-base.yml b/tests/dictionaries_old/01auto_jinja_if_bool/result/rougail/00-base.yml
index 6ec8fa416..cb8943382 100644
--- a/tests/dictionaries_old/01auto_jinja_if_bool/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/01auto_jinja_if_bool/result/rougail/00-base.yml
@@ -1,3 +1,4 @@
+version: 1.1
 general:
   bool:
     type: boolean
@@ -13,4 +14,3 @@ general:
     default:
       type: jinja
       jinja: '{% if not rougail.general.bool %}True,False{% else %}False{% endif %}'
-version: '1.1'
diff --git a/tests/dictionaries_old/01auto_jinja_if_int/result/rougail/00-base.yml b/tests/dictionaries_old/01auto_jinja_if_int/result/rougail/00-base.yml
index faee0e69a..e20d4665d 100644
--- a/tests/dictionaries_old/01auto_jinja_if_int/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/01auto_jinja_if_int/result/rougail/00-base.yml
@@ -1,15 +1,13 @@
+version: 1.1
 bool:
   type: boolean
 int1:
   type: number
-  mandatory: false
   default:
     type: jinja
     jinja: '{% if bool %}1{% else %}2{% endif %}'
 int2:
   type: number
-  mandatory: false
   default:
     type: jinja
     jinja: '{% if not bool %}3{% else %}4{% endif %}'
-version: '1.1'
diff --git a/tests/dictionaries_old/01auto_jinja_set/result/rougail/00-base.yml b/tests/dictionaries_old/01auto_jinja_set/result/rougail/00-base.yml
index 0dd7ac0e1..9b91d15ba 100644
--- a/tests/dictionaries_old/01auto_jinja_set/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/01auto_jinja_set/result/rougail/00-base.yml
@@ -1,15 +1,13 @@
+version: 1.1
 bool:
   type: boolean
 int1:
   type: number
-  mandatory: false
   default:
     type: jinja
     jinja: '{%set bool1 = bool %}{% if bool1 %}1{% else %}2{% endif %}'
 int2:
   type: number
-  mandatory: false
   default:
     type: jinja
     jinja: '{%set bool1 = bool %}{% if not bool1 %}3{% else %}4{% endif %}'
-version: '1.1'
diff --git a/tests/dictionaries_old/01auto_withoutparam/result/rougail/00-base.yml b/tests/dictionaries_old/01auto_withoutparam/result/rougail/00-base.yml
index e8d87157d..66ebc646d 100644
--- a/tests/dictionaries_old/01auto_withoutparam/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/01auto_withoutparam/result/rougail/00-base.yml
@@ -1,3 +1,4 @@
+version: 1.1
 general:
   mode_conteneur_actif:
     type: string
@@ -7,7 +8,5 @@ general:
       type: jinja
       jinja: '{{ calc_val() }}'
   mode_conteneur_actif1:
-    type: string
     description: No change
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/01base_certificate_owner/result/rougail/00-base.yml b/tests/dictionaries_old/01base_certificate_owner/result/rougail/00-base.yml
index 6ff22701c..86d7a7a3b 100644
--- a/tests/dictionaries_old/01base_certificate_owner/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/01base_certificate_owner/result/rougail/00-base.yml
@@ -1,4 +1,4 @@
+version: 1.1
 server_name:
   type: domainname
   default: example.net
-version: '1.1'
diff --git a/tests/dictionaries_old/01base_certificate_owner/result/services/00-base.yml b/tests/dictionaries_old/01base_certificate_owner/result/services/00-base.yml
deleted file mode 100644
index 2c7528636..000000000
--- a/tests/dictionaries_old/01base_certificate_owner/result/services/00-base.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-test.service:
-  certificates:
-    certificate:
-      authority: authority
-      owner: example
-version: '1.1'
diff --git a/tests/dictionaries_old/01base_certificate_owner_variable/result/rougail/00-base.yml b/tests/dictionaries_old/01base_certificate_owner_variable/result/rougail/00-base.yml
index 82e1f6dd3..2714d73b0 100644
--- a/tests/dictionaries_old/01base_certificate_owner_variable/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/01base_certificate_owner_variable/result/rougail/00-base.yml
@@ -1,7 +1,7 @@
+version: 1.1
 owner:
   type: unix_user
   default: example
 server_name:
   type: domainname
   default: example.net
-version: '1.1'
diff --git a/tests/dictionaries_old/01base_certificate_owner_variable/result/services/00-base.yml b/tests/dictionaries_old/01base_certificate_owner_variable/result/services/00-base.yml
deleted file mode 100644
index 5282f1580..000000000
--- a/tests/dictionaries_old/01base_certificate_owner_variable/result/services/00-base.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-test.service:
-  certificates:
-    certificate:
-      authority: authority
-      owner:
-        name: rougail.owner
-        type: variable
-version: '1.1'
diff --git a/tests/dictionaries_old/01base_domainname/result/rougail/00-base.yml b/tests/dictionaries_old/01base_domainname/result/rougail/00-base.yml
index 54de7561b..64a721200 100644
--- a/tests/dictionaries_old/01base_domainname/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/01base_domainname/result/rougail/00-base.yml
@@ -1,6 +1,6 @@
+version: 1.1
 general:
   domain:
     type: domainname
     description: Description
     default: my.domain.name
-version: '1.1'
diff --git a/tests/dictionaries_old/01base_file/result/rougail/00-base.yml b/tests/dictionaries_old/01base_file/result/rougail/00-base.yml
index d5ac95002..837c859ba 100644
--- a/tests/dictionaries_old/01base_file/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/01base_file/result/rougail/00-base.yml
@@ -1,6 +1,5 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: Description
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/01base_file/result/services/00-base.yml b/tests/dictionaries_old/01base_file/result/services/00-base.yml
deleted file mode 100644
index 11a9020fb..000000000
--- a/tests/dictionaries_old/01base_file/result/services/00-base.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-test.service:
-  files:
-    /etc/file: {}
-    /etc/file2:
-      engine: jinja
-version: '1.1'
diff --git a/tests/dictionaries_old/01base_file_disabled/result/rougail/00-base.yml b/tests/dictionaries_old/01base_file_disabled/result/rougail/00-base.yml
index d5ac95002..837c859ba 100644
--- a/tests/dictionaries_old/01base_file_disabled/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/01base_file_disabled/result/rougail/00-base.yml
@@ -1,6 +1,5 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: Description
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/01base_file_disabled/result/services/00-base.yml b/tests/dictionaries_old/01base_file_disabled/result/services/00-base.yml
deleted file mode 100644
index b670ca39e..000000000
--- a/tests/dictionaries_old/01base_file_disabled/result/services/00-base.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-test.service:
-  files:
-    /etc/file: {}
-    /etc/file2:
-      engine: jinja
-    /etc/file3:
-      disabled: true
-version: '1.1'
diff --git a/tests/dictionaries_old/01base_file_include/result/rougail/00-base.yml b/tests/dictionaries_old/01base_file_include/result/rougail/00-base.yml
index d5ac95002..837c859ba 100644
--- a/tests/dictionaries_old/01base_file_include/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/01base_file_include/result/rougail/00-base.yml
@@ -1,6 +1,5 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: Description
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/01base_file_include/result/services/00-base.yml b/tests/dictionaries_old/01base_file_include/result/services/00-base.yml
deleted file mode 100644
index 11a9020fb..000000000
--- a/tests/dictionaries_old/01base_file_include/result/services/00-base.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-test.service:
-  files:
-    /etc/file: {}
-    /etc/file2:
-      engine: jinja
-version: '1.1'
diff --git a/tests/dictionaries_old/01base_file_include_content/result/rougail/00-base.yml b/tests/dictionaries_old/01base_file_include_content/result/rougail/00-base.yml
index d5ac95002..837c859ba 100644
--- a/tests/dictionaries_old/01base_file_include_content/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/01base_file_include_content/result/rougail/00-base.yml
@@ -1,6 +1,5 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: Description
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/01base_file_include_content/result/services/00-base.yml b/tests/dictionaries_old/01base_file_include_content/result/services/00-base.yml
deleted file mode 100644
index 48fea0aa7..000000000
--- a/tests/dictionaries_old/01base_file_include_content/result/services/00-base.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-test.service:
-  files:
-    /etc/file: {}
-    /etc/file2:
-      engine: jinja
-    /etc/dir/incfile:
-      included: content
-version: '1.1'
diff --git a/tests/dictionaries_old/01base_file_include_name/result/rougail/00-base.yml b/tests/dictionaries_old/01base_file_include_name/result/rougail/00-base.yml
index d5ac95002..837c859ba 100644
--- a/tests/dictionaries_old/01base_file_include_name/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/01base_file_include_name/result/rougail/00-base.yml
@@ -1,6 +1,5 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: Description
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/01base_file_include_name/result/services/00-base.yml b/tests/dictionaries_old/01base_file_include_name/result/services/00-base.yml
deleted file mode 100644
index afcac0006..000000000
--- a/tests/dictionaries_old/01base_file_include_name/result/services/00-base.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-test.service:
-  files:
-    /etc/file: {}
-    /etc/file2:
-      engine: jinja
-    /etc/dir/incfile:
-      included: name
-version: '1.1'
diff --git a/tests/dictionaries_old/01base_file_mode/result/services/00-base.yml b/tests/dictionaries_old/01base_file_mode/result/services/00-base.yml
deleted file mode 100644
index f94b56a4b..000000000
--- a/tests/dictionaries_old/01base_file_mode/result/services/00-base.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-test.service:
-  files:
-    /etc/file:
-      mode: 755
-version: '1.1'
diff --git a/tests/dictionaries_old/01base_file_mode2/result/services/00-base.yml b/tests/dictionaries_old/01base_file_mode2/result/services/00-base.yml
deleted file mode 100644
index 47a63eafc..000000000
--- a/tests/dictionaries_old/01base_file_mode2/result/services/00-base.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-test.service:
-  files:
-    /etc/file:
-      mode: 1755
-version: '1.1'
diff --git a/tests/dictionaries_old/01base_file_owner/result/rougail/00-base.yml b/tests/dictionaries_old/01base_file_owner/result/rougail/00-base.yml
index d5ac95002..837c859ba 100644
--- a/tests/dictionaries_old/01base_file_owner/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/01base_file_owner/result/rougail/00-base.yml
@@ -1,6 +1,5 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: Description
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/01base_file_owner/result/services/00-base.yml b/tests/dictionaries_old/01base_file_owner/result/services/00-base.yml
deleted file mode 100644
index 9bbbe9786..000000000
--- a/tests/dictionaries_old/01base_file_owner/result/services/00-base.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-test.service:
-  files:
-    /etc/file:
-      owner: nobody
-      group: nobody
-    /etc/file2:
-      owner: nobody
-      group: nobody
-      engine: jinja
-version: '1.1'
diff --git a/tests/dictionaries_old/01base_file_owner_variable/result/rougail/00-base.yml b/tests/dictionaries_old/01base_file_owner_variable/result/rougail/00-base.yml
index 787894eb8..4e42782f2 100644
--- a/tests/dictionaries_old/01base_file_owner_variable/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/01base_file_owner_variable/result/rougail/00-base.yml
@@ -1,6 +1,6 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: Description
     default: non
   owner:
@@ -9,4 +9,3 @@ general:
   group:
     type: unix_user
     default: nobody
-version: '1.1'
diff --git a/tests/dictionaries_old/01base_file_owner_variable/result/services/00-base.yml b/tests/dictionaries_old/01base_file_owner_variable/result/services/00-base.yml
deleted file mode 100644
index 403ba450a..000000000
--- a/tests/dictionaries_old/01base_file_owner_variable/result/services/00-base.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-test.service:
-  files:
-    /etc/file:
-      owner:
-        name: rougail.general.owner
-        type: variable
-      group:
-        name: rougail.general.group
-        type: variable
-    /etc/file2:
-      owner:
-        name: rougail.general.owner
-        type: variable
-      group:
-        name: rougail.general.group
-        type: variable
-      engine: jinja
-version: '1.1'
diff --git a/tests/dictionaries_old/01base_file_patch/result/rougail/00-base.yml b/tests/dictionaries_old/01base_file_patch/result/rougail/00-base.yml
index d5ac95002..837c859ba 100644
--- a/tests/dictionaries_old/01base_file_patch/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/01base_file_patch/result/rougail/00-base.yml
@@ -1,6 +1,5 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: Description
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/01base_file_patch/result/services/00-base.yml b/tests/dictionaries_old/01base_file_patch/result/services/00-base.yml
deleted file mode 100644
index 11a9020fb..000000000
--- a/tests/dictionaries_old/01base_file_patch/result/services/00-base.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-test.service:
-  files:
-    /etc/file: {}
-    /etc/file2:
-      engine: jinja
-version: '1.1'
diff --git a/tests/dictionaries_old/01base_file_tmpfiles_delete_before_create/result/rougail/00-base.yml b/tests/dictionaries_old/01base_file_tmpfiles_delete_before_create/result/rougail/00-base.yml
index d5ac95002..837c859ba 100644
--- a/tests/dictionaries_old/01base_file_tmpfiles_delete_before_create/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/01base_file_tmpfiles_delete_before_create/result/rougail/00-base.yml
@@ -1,6 +1,5 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: Description
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/01base_file_tmpfiles_delete_before_create/result/services/00-base.yml b/tests/dictionaries_old/01base_file_tmpfiles_delete_before_create/result/services/00-base.yml
deleted file mode 100644
index 11a9020fb..000000000
--- a/tests/dictionaries_old/01base_file_tmpfiles_delete_before_create/result/services/00-base.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-test.service:
-  files:
-    /etc/file: {}
-    /etc/file2:
-      engine: jinja
-version: '1.1'
diff --git a/tests/dictionaries_old/01base_file_tmpfiles_factory_dir/result/rougail/00-base.yml b/tests/dictionaries_old/01base_file_tmpfiles_factory_dir/result/rougail/00-base.yml
index d5ac95002..837c859ba 100644
--- a/tests/dictionaries_old/01base_file_tmpfiles_factory_dir/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/01base_file_tmpfiles_factory_dir/result/rougail/00-base.yml
@@ -1,6 +1,5 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: Description
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/01base_file_tmpfiles_factory_dir/result/services/00-base.yml b/tests/dictionaries_old/01base_file_tmpfiles_factory_dir/result/services/00-base.yml
deleted file mode 100644
index 11a9020fb..000000000
--- a/tests/dictionaries_old/01base_file_tmpfiles_factory_dir/result/services/00-base.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-test.service:
-  files:
-    /etc/file: {}
-    /etc/file2:
-      engine: jinja
-version: '1.1'
diff --git a/tests/dictionaries_old/01base_file_utfchar/result/rougail/00-base.yml b/tests/dictionaries_old/01base_file_utfchar/result/rougail/00-base.yml
index d5ac95002..837c859ba 100644
--- a/tests/dictionaries_old/01base_file_utfchar/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/01base_file_utfchar/result/rougail/00-base.yml
@@ -1,6 +1,5 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: Description
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/01base_file_utfchar/result/services/00-base.yml b/tests/dictionaries_old/01base_file_utfchar/result/services/00-base.yml
deleted file mode 100644
index 4a17cda5f..000000000
--- a/tests/dictionaries_old/01base_file_utfchar/result/services/00-base.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-test.service:
-  files:
-    /etc/systemd-makefs@dev-disk-by\x2dpartlabel: {}
-    /etc/systemd-makefs@dev-disk-by\x2dpartlabel2:
-      engine: jinja
-version: '1.1'
diff --git a/tests/dictionaries_old/01base_file_var_source/result/rougail/00-base.yml b/tests/dictionaries_old/01base_file_var_source/result/rougail/00-base.yml
index f6b3f240c..119f61f6a 100644
--- a/tests/dictionaries_old/01base_file_var_source/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/01base_file_var_source/result/rougail/00-base.yml
@@ -1,10 +1,8 @@
+version: 1.1
 general:
   source_var:
-    type: string
     description: Description
     default: file
   mode_conteneur_actif:
-    type: string
     description: Description
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/01base_file_var_source/result/services/00-base.yml b/tests/dictionaries_old/01base_file_var_source/result/services/00-base.yml
deleted file mode 100644
index 224006286..000000000
--- a/tests/dictionaries_old/01base_file_var_source/result/services/00-base.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-test.service:
-  files:
-    /etc/file:
-      source:
-        name: rougail.general.source_var
-        type: variable
-version: '1.1'
diff --git a/tests/dictionaries_old/01base_float/result/rougail/00-base.yml b/tests/dictionaries_old/01base_float/result/rougail/00-base.yml
index ed6796c1b..4123ef089 100644
--- a/tests/dictionaries_old/01base_float/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/01base_float/result/rougail/00-base.yml
@@ -1,12 +1,9 @@
+version: 1.1
 general:
   float:
-    type: float
     description: Description
     default: 0.527
   float_multi:
-    type: float
     description: Description
-    multi: true
     default:
     - 0.527
-version: '1.1'
diff --git a/tests/dictionaries_old/01base_help_quote/result/rougail/00-base.yml b/tests/dictionaries_old/01base_help_quote/result/rougail/00-base.yml
index e8f52861d..0f265d6a2 100644
--- a/tests/dictionaries_old/01base_help_quote/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/01base_help_quote/result/rougail/00-base.yml
@@ -1,3 +1,4 @@
+version: 1.1
 general:
   mode_conteneur_actif:
     type: string
@@ -9,4 +10,3 @@ general:
     description: Redefine description
     help: message with "
     mandatory: false
-version: '1.1'
diff --git a/tests/dictionaries_old/01base_multi/result/rougail/00-base.yml b/tests/dictionaries_old/01base_multi/result/rougail/00-base.yml
index 6441deee6..94c3703b6 100644
--- a/tests/dictionaries_old/01base_multi/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/01base_multi/result/rougail/00-base.yml
@@ -1,9 +1,7 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: Redefine description
     hidden: true
-    multi: true
     default:
     - non
-version: '1.1'
diff --git a/tests/dictionaries_old/01base_multi_notuniq/result/rougail/00-base.yml b/tests/dictionaries_old/01base_multi_notuniq/result/rougail/00-base.yml
index 0cba74cef..3fd5bff83 100644
--- a/tests/dictionaries_old/01base_multi_notuniq/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/01base_multi_notuniq/result/rougail/00-base.yml
@@ -1,10 +1,8 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: Redefine description
     hidden: true
-    multi: true
     unique: false
     default:
     - non
-version: '1.1'
diff --git a/tests/dictionaries_old/01base_multi_uniq/result/rougail/00-base.yml b/tests/dictionaries_old/01base_multi_uniq/result/rougail/00-base.yml
index 19d96507f..69baa6733 100644
--- a/tests/dictionaries_old/01base_multi_uniq/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/01base_multi_uniq/result/rougail/00-base.yml
@@ -1,10 +1,8 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: Redefine description
     hidden: true
-    multi: true
     unique: true
     default:
     - non
-version: '1.1'
diff --git a/tests/dictionaries_old/01base_provider/result/rougail/00-base.yml b/tests/dictionaries_old/01base_provider/result/rougail/00-base.yml
index 0ca5b7495..80531ceed 100644
--- a/tests/dictionaries_old/01base_provider/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/01base_provider/result/rougail/00-base.yml
@@ -1,13 +1,10 @@
+version: 1.1
 general:
   float:
-    type: float
     description: Description
     provider: float
     default: 0.527
   float_multi:
-    type: float
     description: Description
-    multi: true
     default:
     - 0.527
-version: '1.1'
diff --git a/tests/dictionaries_old/01base_provider_extra/result/extra/00-base.yml b/tests/dictionaries_old/01base_provider_extra/result/extra/extra/00-base.yml
similarity index 84%
rename from tests/dictionaries_old/01base_provider_extra/result/extra/00-base.yml
rename to tests/dictionaries_old/01base_provider_extra/result/extra/extra/00-base.yml
index 27f54187c..e3e3e08cd 100644
--- a/tests/dictionaries_old/01base_provider_extra/result/extra/00-base.yml
+++ b/tests/dictionaries_old/01base_provider_extra/result/extra/extra/00-base.yml
@@ -1,6 +1,6 @@
+version: 1.1
 example:
   description:
     type: string
     provider: example
     mandatory: false
-version: '1.1'
diff --git a/tests/dictionaries_old/01base_provider_extra/result/rougail/00-base.yml b/tests/dictionaries_old/01base_provider_extra/result/rougail/00-base.yml
index dbe765202..95060da4c 100644
--- a/tests/dictionaries_old/01base_provider_extra/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/01base_provider_extra/result/rougail/00-base.yml
@@ -1,5 +1,5 @@
+version: 1.1
 float:
   type: float
   description: Description
   mandatory: false
-version: '1.1'
diff --git a/tests/dictionaries_old/01base_provider_hidden/result/rougail/00-base.yml b/tests/dictionaries_old/01base_provider_hidden/result/rougail/00-base.yml
index 3759f9cec..d75144a38 100644
--- a/tests/dictionaries_old/01base_provider_hidden/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/01base_provider_hidden/result/rougail/00-base.yml
@@ -1,14 +1,11 @@
+version: 1.1
 general:
   float:
-    type: float
     description: Description
     provider: float
     hidden: true
     default: 0.527
   float_multi:
-    type: float
     description: Description
-    multi: true
     default:
     - 0.527
-version: '1.1'
diff --git a/tests/dictionaries_old/01base_value_doublequote/result/rougail/00-base.yml b/tests/dictionaries_old/01base_value_doublequote/result/rougail/00-base.yml
index 1ab9a94e8..a86afc2ba 100644
--- a/tests/dictionaries_old/01base_value_doublequote/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/01base_value_doublequote/result/rougail/00-base.yml
@@ -1,7 +1,6 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: Redefine description
     hidden: true
     default: quote"
-version: '1.1'
diff --git a/tests/dictionaries_old/01base_value_doublequote2/result/rougail/00-base.yml b/tests/dictionaries_old/01base_value_doublequote2/result/rougail/00-base.yml
index 1a5f05ccc..6e1c018b9 100644
--- a/tests/dictionaries_old/01base_value_doublequote2/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/01base_value_doublequote2/result/rougail/00-base.yml
@@ -1,7 +1,6 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: Redefine description
     hidden: true
     default: quote'"
-version: '1.1'
diff --git a/tests/dictionaries_old/01base_value_doublequote3/result/rougail/00-base.yml b/tests/dictionaries_old/01base_value_doublequote3/result/rougail/00-base.yml
index b09d796cd..60491806f 100644
--- a/tests/dictionaries_old/01base_value_doublequote3/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/01base_value_doublequote3/result/rougail/00-base.yml
@@ -1,7 +1,6 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: Redefine description
     hidden: true
     default: quote\"\'
-version: '1.1'
diff --git a/tests/dictionaries_old/01base_value_multi_doublequote/result/rougail/00-base.yml b/tests/dictionaries_old/01base_value_multi_doublequote/result/rougail/00-base.yml
index f6bb1674f..99c268ee8 100644
--- a/tests/dictionaries_old/01base_value_multi_doublequote/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/01base_value_multi_doublequote/result/rougail/00-base.yml
@@ -1,9 +1,7 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: Redefine description
     hidden: true
-    multi: true
     default:
     - quote"
-version: '1.1'
diff --git a/tests/dictionaries_old/01base_value_multi_doublequote2/result/rougail/00-base.yml b/tests/dictionaries_old/01base_value_multi_doublequote2/result/rougail/00-base.yml
index 6346ffee8..7090c5639 100644
--- a/tests/dictionaries_old/01base_value_multi_doublequote2/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/01base_value_multi_doublequote2/result/rougail/00-base.yml
@@ -1,9 +1,7 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: Redefine description
     hidden: true
-    multi: true
     default:
     - quote'"
-version: '1.1'
diff --git a/tests/dictionaries_old/01base_value_multi_quote/result/rougail/00-base.yml b/tests/dictionaries_old/01base_value_multi_quote/result/rougail/00-base.yml
index bdc957143..33bdce932 100644
--- a/tests/dictionaries_old/01base_value_multi_quote/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/01base_value_multi_quote/result/rougail/00-base.yml
@@ -1,9 +1,7 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: Redefine description
     hidden: true
-    multi: true
     default:
     - quote'
-version: '1.1'
diff --git a/tests/dictionaries_old/01base_value_quote/result/rougail/00-base.yml b/tests/dictionaries_old/01base_value_quote/result/rougail/00-base.yml
index 5ce855d77..cad65b1a2 100644
--- a/tests/dictionaries_old/01base_value_quote/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/01base_value_quote/result/rougail/00-base.yml
@@ -1,7 +1,6 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: Redefine description
     hidden: true
     default: quote'
-version: '1.1'
diff --git a/tests/dictionaries_old/01base_var_name_same_family/result/rougail/00-base.yml b/tests/dictionaries_old/01base_var_name_same_family/result/rougail/00-base.yml
index 00c39cecb..19cea1e7e 100644
--- a/tests/dictionaries_old/01base_var_name_same_family/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/01base_var_name_same_family/result/rougail/00-base.yml
@@ -1,6 +1,5 @@
+version: 1.1
 general:
   general:
-    type: string
     description: description
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/01boolean_no_mandatory/result/rougail/00-base.yml b/tests/dictionaries_old/01boolean_no_mandatory/result/rougail/00-base.yml
index 32fd522ff..d88aebbf3 100644
--- a/tests/dictionaries_old/01boolean_no_mandatory/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/01boolean_no_mandatory/result/rougail/00-base.yml
@@ -1,4 +1,4 @@
+version: 1.1
 my_variable:
   type: boolean
   mandatory: false
-version: '1.1'
diff --git a/tests/dictionaries_old/01family_description/result/rougail/00-base.yml b/tests/dictionaries_old/01family_description/result/rougail/00-base.yml
index 14a600058..2e593c3a2 100644
--- a/tests/dictionaries_old/01family_description/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/01family_description/result/rougail/00-base.yml
@@ -1,5 +1,5 @@
+version: 1.1
 general:
   description: Other description
   mode_conteneur_actif:
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/01fill_autofreeze/result/rougail/00-base.yml b/tests/dictionaries_old/01fill_autofreeze/result/rougail/00-base.yml
index 2976f5875..da706761f 100644
--- a/tests/dictionaries_old/01fill_autofreeze/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/01fill_autofreeze/result/rougail/00-base.yml
@@ -1,3 +1,4 @@
+version: 1.1
 my_var1:
   type: string
   default:
@@ -6,6 +7,4 @@ my_var1:
 my_var2:
   default: no
 server_deployed:
-  type: boolean
   default: false
-version: '1.1'
diff --git a/tests/dictionaries_old/01fill_autosave/result/rougail/00-base.yml b/tests/dictionaries_old/01fill_autosave/result/rougail/00-base.yml
index 7140ac005..0c91491fe 100644
--- a/tests/dictionaries_old/01fill_autosave/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/01fill_autosave/result/rougail/00-base.yml
@@ -1,3 +1,4 @@
+version: 1.1
 server_deployed:
   type: boolean
 general:
@@ -9,7 +10,5 @@ general:
       type: jinja
       jinja: '{{ rougail.general.mode_conteneur_actif1 | calc_val }}'
   mode_conteneur_actif1:
-    type: string
     description: No change
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/01fill_base/result/rougail/00-base.yml b/tests/dictionaries_old/01fill_base/result/rougail/00-base.yml
index de73a6d7d..0a82418b1 100644
--- a/tests/dictionaries_old/01fill_base/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/01fill_base/result/rougail/00-base.yml
@@ -1,13 +1,11 @@
+version: 1.1
 general:
   mode_conteneur_actif:
     type: string
     description: No change
-    mandatory: false
     default:
       type: jinja
       jinja: '{{ rougail.general.mode_conteneur_actif1 | calc_val }}'
   mode_conteneur_actif1:
-    type: string
     description: No change
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/01fill_mandatory/result/rougail/00-base.yml b/tests/dictionaries_old/01fill_mandatory/result/rougail/00-base.yml
index 381c765d6..902065ef8 100644
--- a/tests/dictionaries_old/01fill_mandatory/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/01fill_mandatory/result/rougail/00-base.yml
@@ -1,15 +1,13 @@
+version: 1.1
 general:
   mode: basic
   mode_conteneur_actif:
     type: string
     description: No change
-    mandatory: true
     mode: advanced
     default:
       type: jinja
       jinja: '{{ rougail.general.mode_conteneur_actif1 | calc_val }}'
   mode_conteneur_actif1:
-    type: string
     description: No change
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/01fill_number/result/rougail/00-base.yml b/tests/dictionaries_old/01fill_number/result/rougail/00-base.yml
index d6775719c..aa81277d2 100644
--- a/tests/dictionaries_old/01fill_number/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/01fill_number/result/rougail/00-base.yml
@@ -1,14 +1,12 @@
+version: 1.1
 general:
   mode_conteneur_actif:
     type: number
     description: No change
     hidden: true
-    mandatory: false
     default:
       type: jinja
       jinja: '{{ 3 | calc_val }}'
   mode_conteneur_actif1:
-    type: string
     description: No change
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/01fill_only_optional/result/rougail/00-base.yml b/tests/dictionaries_old/01fill_only_optional/result/rougail/00-base.yml
index 0809635c2..100a36c14 100644
--- a/tests/dictionaries_old/01fill_only_optional/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/01fill_only_optional/result/rougail/00-base.yml
@@ -1,3 +1,4 @@
+version: 1.1
 general:
   mode_conteneur_actif:
     type: string
@@ -5,14 +6,12 @@ general:
     hidden: true
     default:
       type: jinja
-      jinja: '{{ __mode_conteneur_actif4 | calc_val }}'
+      jinja: '{{ mode_conteneur_actif4 | calc_val }}'
       params:
-        __mode_conteneur_actif4:
+        mode_conteneur_actif4:
           type: variable
-          variable: __mode_conteneur_actif4
+          variable: mode_conteneur_actif4
           optional: true
   mode_conteneur_actif1:
-    type: string
     description: No change
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/01fill_optional/result/rougail/00-base.yml b/tests/dictionaries_old/01fill_optional/result/rougail/00-base.yml
index 7a6ec51fd..1569bd2d4 100644
--- a/tests/dictionaries_old/01fill_optional/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/01fill_optional/result/rougail/00-base.yml
@@ -1,3 +1,4 @@
+version: 1.1
 general:
   mode_conteneur_actif:
     type: string
@@ -5,19 +6,17 @@ general:
     hidden: true
     default:
       type: jinja
-      jinja: '{{ __mode_conteneur_actif4 | calc_val(rougail.general.mode_conteneur_actif1,
-        __mode_conteneur_actif3) }}'
+      jinja: '{{ mode_conteneur_actif4 | calc_val(rougail.general.mode_conteneur_actif1,
+        mode_conteneur_actif3) }}'
       params:
-        __mode_conteneur_actif4:
+        mode_conteneur_actif4:
           type: variable
-          variable: __mode_conteneur_actif4
+          variable: mode_conteneur_actif4
           optional: true
-        __mode_conteneur_actif3:
+        mode_conteneur_actif3:
           type: variable
-          variable: __mode_conteneur_actif3
+          variable: mode_conteneur_actif3
           optional: true
   mode_conteneur_actif1:
-    type: string
     description: No change
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/01fill_quote/result/rougail/00-base.yml b/tests/dictionaries_old/01fill_quote/result/rougail/00-base.yml
index 6e2b83821..541627736 100644
--- a/tests/dictionaries_old/01fill_quote/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/01fill_quote/result/rougail/00-base.yml
@@ -1,30 +1,26 @@
+version: 1.1
 general:
   mode_conteneur_actif:
     type: string
     description: No change
-    mandatory: false
     default:
       type: jinja
       jinja: "{{ \"quote'\" | calc_val }}"
   mode_conteneur_actif1:
     type: string
     description: No change
-    mandatory: false
     default:
       type: jinja
       jinja: '{{ "quote\"" | calc_val }}'
   mode_conteneur_actif2:
     type: string
     description: No change
-    mandatory: false
     default:
       type: jinja
       jinja: "{{ \"quote\\\"'\" | calc_val }}"
   mode_conteneur_actif3:
     type: string
     description: No change
-    mandatory: false
     default:
       type: jinja
       jinja: "{{ \"quote\\\"\\\\'\" | calc_val }}"
-version: '1.1'
diff --git a/tests/dictionaries_old/01fill_target_optional/makedict/after.json b/tests/dictionaries_old/01fill_target_optional/makedict/after.json
deleted file mode 100644
index 45961373b..000000000
--- a/tests/dictionaries_old/01fill_target_optional/makedict/after.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "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
deleted file mode 100644
index 6cbc4d6bc..000000000
--- a/tests/dictionaries_old/01fill_target_optional/makedict/base.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "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
deleted file mode 100644
index 45961373b..000000000
--- a/tests/dictionaries_old/01fill_target_optional/makedict/before.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "rougail.general.mode_conteneur_actif1": {
-        "owner": "default",
-        "value": "non"
-    }
-}
diff --git a/tests/dictionaries_old/01fill_target_optional/result/rougail/00-base.yml b/tests/dictionaries_old/01fill_target_optional/result/rougail/00-base.yml
deleted file mode 100644
index d999f7a32..000000000
--- a/tests/dictionaries_old/01fill_target_optional/result/rougail/00-base.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-general:
-  mode_conteneur_actif1:
-    type: string
-    description: No change
-    default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/01fill_target_optional/tiramisu/base.py b/tests/dictionaries_old/01fill_target_optional/tiramisu/base.py
deleted file mode 100644
index a743fa264..000000000
--- a/tests/dictionaries_old/01fill_target_optional/tiramisu/base.py
+++ /dev/null
@@ -1,29 +0,0 @@
-from importlib.machinery import SourceFileLoader as _SourceFileLoader
-from importlib.util import spec_from_loader as _spec_from_loader, module_from_spec as _module_from_spec
-class func:
-    pass
-
-def _load_functions(path):
-    global _SourceFileLoader, _spec_from_loader, _module_from_spec, func
-    loader = _SourceFileLoader('func', path)
-    spec = _spec_from_loader(loader.name, loader)
-    func_ = _module_from_spec(spec)
-    loader.exec_module(func_)
-    for function in dir(func_):
-        if function.startswith('_'):
-            continue
-        setattr(func, function, getattr(func_, function))
-_load_functions('tests/dictionaries_old/../eosfunc/test.py')
-try:
-    from tiramisu4 import *
-    from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES
-except:
-    from tiramisu import *
-    from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
-ALLOWED_LEADER_PROPERTIES.add("basic")
-ALLOWED_LEADER_PROPERTIES.add("normal")
-ALLOWED_LEADER_PROPERTIES.add("expert")
-option_3 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
-optiondescription_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
-optiondescription_1 = OptionDescription(name="rougail", doc="rougail", children=[optiondescription_2], properties=frozenset({"normal"}))
-option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1])
diff --git a/tests/dictionaries_old/01fill_target_optional/tiramisu/multi.py b/tests/dictionaries_old/01fill_target_optional/tiramisu/multi.py
deleted file mode 100644
index 4b80c9e95..000000000
--- a/tests/dictionaries_old/01fill_target_optional/tiramisu/multi.py
+++ /dev/null
@@ -1,34 +0,0 @@
-from importlib.machinery import SourceFileLoader as _SourceFileLoader
-from importlib.util import spec_from_loader as _spec_from_loader, module_from_spec as _module_from_spec
-class func:
-    pass
-
-def _load_functions(path):
-    global _SourceFileLoader, _spec_from_loader, _module_from_spec, func
-    loader = _SourceFileLoader('func', path)
-    spec = _spec_from_loader(loader.name, loader)
-    func_ = _module_from_spec(spec)
-    loader.exec_module(func_)
-    for function in dir(func_):
-        if function.startswith('_'):
-            continue
-        setattr(func, function, getattr(func_, function))
-_load_functions('tests/dictionaries/../eosfunc/test.py')
-try:
-    from tiramisu4 import *
-    from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES
-except:
-    from tiramisu import *
-    from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
-ALLOWED_LEADER_PROPERTIES.add("basic")
-ALLOWED_LEADER_PROPERTIES.add("normal")
-ALLOWED_LEADER_PROPERTIES.add("expert")
-option_2 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
-optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"}))
-optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"}))
-optiondescription_5 = OptionDescription(name="1", doc="1", children=[optiondescription_6])
-option_4 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
-optiondescription_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"normal"}))
-optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"}))
-optiondescription_7 = OptionDescription(name="2", doc="2", children=[optiondescription_8])
-option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_5, optiondescription_7])
diff --git a/tests/dictionaries_old/01fill_target_optional/xml/00-base.xml b/tests/dictionaries_old/01fill_target_optional/xml/00-base.xml
deleted file mode 100644
index 7dbd36d93..000000000
--- a/tests/dictionaries_old/01fill_target_optional/xml/00-base.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<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>
diff --git a/tests/dictionaries_old/01fill_target_optional/yml/00-base.yml b/tests/dictionaries_old/01fill_target_optional/yml/00-base.yml
deleted file mode 100644
index 79ae7fc08..000000000
--- a/tests/dictionaries_old/01fill_target_optional/yml/00-base.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-version: '0.10'
-variables:
-- family:
-  - name: general
-    variables:
-    - variable:
-      - name: mode_conteneur_actif1
-        type: string
-        description: No change
-        value:
-        - text: non
-constraints:
-- fill:
-  - name: calc_val
-    param:
-    - type: variable
-      text: mode_conteneur_actif1
-    target:
-    - optional: true
-      text: mode_conteneur_actif
diff --git a/tests/dictionaries_old/01hidden_if_in_autofreeze/result/rougail/00-base.yml b/tests/dictionaries_old/01hidden_if_in_autofreeze/result/rougail/00-base.yml
index a918a74d3..43b87763e 100644
--- a/tests/dictionaries_old/01hidden_if_in_autofreeze/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/01hidden_if_in_autofreeze/result/rougail/00-base.yml
@@ -1,5 +1,5 @@
+version: 1.1
 server_deployed:
-  type: boolean
   default: false
 my_var:
   type: string
@@ -9,4 +9,3 @@ my_var:
   hidden:
     type: jinja
     jinja: '{% if rougail.server_deployed == true %}hidden{% endif %}'
-version: '1.1'
diff --git a/tests/dictionaries_old/01test/result/rougail/00-base.yml b/tests/dictionaries_old/01test/result/rougail/00-base.yml
index cdefc6042..11e5edacc 100644
--- a/tests/dictionaries_old/01test/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/01test/result/rougail/00-base.yml
@@ -1,6 +1,6 @@
+version: 1.1
 general:
   mode_conteneur_actif:
     test:
     - test
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/01test_multi/result/rougail/00-base.yml b/tests/dictionaries_old/01test_multi/result/rougail/00-base.yml
index 881305a4a..fbf78f68c 100644
--- a/tests/dictionaries_old/01test_multi/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/01test_multi/result/rougail/00-base.yml
@@ -1,7 +1,7 @@
+version: 1.1
 general:
   mode_conteneur_actif:
     test:
     - test1
     - test2
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/01test_multi_none/result/rougail/00-base.yml b/tests/dictionaries_old/01test_multi_none/result/rougail/00-base.yml
index 4bd3ac5db..e13d37c25 100644
--- a/tests/dictionaries_old/01test_multi_none/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/01test_multi_none/result/rougail/00-base.yml
@@ -1,3 +1,4 @@
+version: 1.1
 general:
   mode_conteneur_actif:
     test:
@@ -5,4 +6,3 @@ general:
     - test1
     - test2
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/01test_redefine/result/rougail/00-base.yml b/tests/dictionaries_old/01test_redefine/result/rougail/00-base.yml
index cdefc6042..11e5edacc 100644
--- a/tests/dictionaries_old/01test_redefine/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/01test_redefine/result/rougail/00-base.yml
@@ -1,6 +1,6 @@
+version: 1.1
 general:
   mode_conteneur_actif:
     test:
     - test
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/01test_redefine/result/rougail/10-base.yml b/tests/dictionaries_old/01test_redefine/result/rougail/10-base.yml
index c6cd94a3f..84ce783bb 100644
--- a/tests/dictionaries_old/01test_redefine/result/rougail/10-base.yml
+++ b/tests/dictionaries_old/01test_redefine/result/rougail/10-base.yml
@@ -1,6 +1,6 @@
+version: 1.1
 general:
   mode_conteneur_actif:
     redefine: true
     test:
     - test1
-version: '1.1'
diff --git a/tests/dictionaries_old/01test_redefine_base/result/rougail/00-base.yml b/tests/dictionaries_old/01test_redefine_base/result/rougail/00-base.yml
index fffd23ae7..e801847b2 100644
--- a/tests/dictionaries_old/01test_redefine_base/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/01test_redefine_base/result/rougail/00-base.yml
@@ -1,4 +1,4 @@
+version: 1.1
 my_variable:
   type: string
   mandatory: false
-version: '1.1'
diff --git a/tests/dictionaries_old/01test_redefine_base/result/rougail/10-base.yml b/tests/dictionaries_old/01test_redefine_base/result/rougail/10-base.yml
index 5c74bb933..3aab1516d 100644
--- a/tests/dictionaries_old/01test_redefine_base/result/rougail/10-base.yml
+++ b/tests/dictionaries_old/01test_redefine_base/result/rougail/10-base.yml
@@ -1,5 +1,5 @@
+version: 1.1
 my_variable:
   redefine: true
   test:
   - test1
-version: '1.1'
diff --git a/tests/dictionaries_old/01test_redefine_remove/result/rougail/00-base.yml b/tests/dictionaries_old/01test_redefine_remove/result/rougail/00-base.yml
index cdefc6042..11e5edacc 100644
--- a/tests/dictionaries_old/01test_redefine_remove/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/01test_redefine_remove/result/rougail/00-base.yml
@@ -1,6 +1,6 @@
+version: 1.1
 general:
   mode_conteneur_actif:
     test:
     - test
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/01test_redefine_remove/result/rougail/10-base.yml b/tests/dictionaries_old/01test_redefine_remove/result/rougail/10-base.yml
index e5461ba1c..51d62dc83 100644
--- a/tests/dictionaries_old/01test_redefine_remove/result/rougail/10-base.yml
+++ b/tests/dictionaries_old/01test_redefine_remove/result/rougail/10-base.yml
@@ -1,6 +1,6 @@
+version: 1.1
 general:
   mode_conteneur_actif:
     redefine: true
     test:
     - 
-version: '1.1'
diff --git a/tests/dictionaries_old/02autosave_hidden_frozenifin/result/rougail/00-base.yml b/tests/dictionaries_old/02autosave_hidden_frozenifin/result/rougail/00-base.yml
index 911fe2c8d..d9df0fa67 100644
--- a/tests/dictionaries_old/02autosave_hidden_frozenifin/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/02autosave_hidden_frozenifin/result/rougail/00-base.yml
@@ -1,9 +1,9 @@
+version: 1.1
 server_deployed:
   type: boolean
 general:
   description: général
   mode_conteneur_actif:
-    type: string
     description: No change
     hidden: true
     default: non
@@ -11,7 +11,6 @@ general:
     type: string
     description: autosave variable
     auto_save: true
-    mandatory: false
     hidden:
       type: jinja
       jinja: '{% if rougail.general.mode_conteneur_actif == "oui" %}hidden{% endif
@@ -19,4 +18,3 @@ general:
     default:
       type: jinja
       jinja: '{{ "oui" | calc_val }}'
-version: '1.1'
diff --git a/tests/dictionaries_old/02fill_multi_calc_val/result/rougail/00-base.yml b/tests/dictionaries_old/02fill_multi_calc_val/result/rougail/00-base.yml
index e957acd8e..ad9919228 100644
--- a/tests/dictionaries_old/02fill_multi_calc_val/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/02fill_multi_calc_val/result/rougail/00-base.yml
@@ -1,9 +1,9 @@
+version: 1.1
 var1:
   default: no
 var2:
   multi: true
-  mandatory: false
   default:
     type: jinja
-    jinja: '{{ rougail.var1 | calc_value(multi=true) }}'
-version: '1.1'
+    jinja: "{% for __variable in rougail.var1 | calc_value(multi=true) %}\n{{ __variable
+      }}\n{% endfor %}"
diff --git a/tests/dictionaries_old/02fill_multi_calc_val_multi/result/rougail/00-base.yml b/tests/dictionaries_old/02fill_multi_calc_val_multi/result/rougail/00-base.yml
index a153ce429..1a3c26232 100644
--- a/tests/dictionaries_old/02fill_multi_calc_val_multi/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/02fill_multi_calc_val_multi/result/rougail/00-base.yml
@@ -1,13 +1,11 @@
+version: 1.1
 var1:
-  multi: true
   default:
   - no
   - yes
   - maybe
 var2:
   multi: true
-  mandatory: false
   default:
-    type: jinja
-    jinja: '{{ rougail.var1 | calc_value }}'
-version: '1.1'
+    type: variable
+    variable: rougail.var1
diff --git a/tests/dictionaries_old/10autosave_hidden/result/rougail/00-base.yml b/tests/dictionaries_old/10autosave_hidden/result/rougail/00-base.yml
index 48fc3cce0..dd5372be7 100644
--- a/tests/dictionaries_old/10autosave_hidden/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10autosave_hidden/result/rougail/00-base.yml
@@ -1,9 +1,9 @@
+version: 1.1
 server_deployed:
   type: boolean
 general:
   description: général
   mode_conteneur_actif:
-    type: string
     description: No change
     hidden: true
     default: non
@@ -12,8 +12,6 @@ general:
     description: autosave variable
     hidden: true
     auto_save: true
-    mandatory: false
     default:
       type: jinja
       jinja: '{{ "oui" | calc_val }}'
-version: '1.1'
diff --git a/tests/dictionaries_old/10base_certificate_list/result/rougail/00-base.yml b/tests/dictionaries_old/10base_certificate_list/result/rougail/00-base.yml
index 6ff22701c..86d7a7a3b 100644
--- a/tests/dictionaries_old/10base_certificate_list/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10base_certificate_list/result/rougail/00-base.yml
@@ -1,4 +1,4 @@
+version: 1.1
 server_name:
   type: domainname
   default: example.net
-version: '1.1'
diff --git a/tests/dictionaries_old/10base_certificate_list/result/services/00-base.yml b/tests/dictionaries_old/10base_certificate_list/result/services/00-base.yml
deleted file mode 100644
index 87f6c1125..000000000
--- a/tests/dictionaries_old/10base_certificate_list/result/services/00-base.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-test.service:
-  certificates:
-    certificate:
-      authority: authority
-      owner: example
-      disabled:
-        type: jinja
-        jinja: '{% if rougail.server_name == "example1.net" %}disabled{% endif %}'
-version: '1.1'
diff --git a/tests/dictionaries_old/10base_certificate_list_disabled/result/rougail/00-base.yml b/tests/dictionaries_old/10base_certificate_list_disabled/result/rougail/00-base.yml
index 6ff22701c..86d7a7a3b 100644
--- a/tests/dictionaries_old/10base_certificate_list_disabled/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10base_certificate_list_disabled/result/rougail/00-base.yml
@@ -1,4 +1,4 @@
+version: 1.1
 server_name:
   type: domainname
   default: example.net
-version: '1.1'
diff --git a/tests/dictionaries_old/10base_certificate_list_disabled/result/services/00-base.yml b/tests/dictionaries_old/10base_certificate_list_disabled/result/services/00-base.yml
deleted file mode 100644
index 4260fdc09..000000000
--- a/tests/dictionaries_old/10base_certificate_list_disabled/result/services/00-base.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-test.service:
-  certificates:
-    certificate:
-      authority: authority
-      owner: example
-      disabled:
-        type: jinja
-        jinja: '{% if rougail.server_name == "example.net" %}disabled{% endif %}'
-version: '1.1'
diff --git a/tests/dictionaries_old/10check_base/result/rougail/00-base.yml b/tests/dictionaries_old/10check_base/result/rougail/00-base.yml
index 538513a34..1d4aa6a1a 100644
--- a/tests/dictionaries_old/10check_base/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10check_base/result/rougail/00-base.yml
@@ -1,6 +1,6 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: No change
     default: b
   int:
@@ -10,4 +10,3 @@ general:
     validators:
     - type: jinja
       jinja: '{{ rougail.general.int | valid_entier(mini=0, maxi=100) }}'
-version: '1.1'
diff --git a/tests/dictionaries_old/10check_base_target_optional/__init__.py b/tests/dictionaries_old/10check_base_target_optional/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/dictionaries_old/10check_base_target_optional/makedict/after.json b/tests/dictionaries_old/10check_base_target_optional/makedict/after.json
deleted file mode 100644
index bd8910427..000000000
--- a/tests/dictionaries_old/10check_base_target_optional/makedict/after.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "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
deleted file mode 100644
index 9b3f9ac4b..000000000
--- a/tests/dictionaries_old/10check_base_target_optional/makedict/base.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "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
deleted file mode 100644
index bd8910427..000000000
--- a/tests/dictionaries_old/10check_base_target_optional/makedict/before.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "rougail.my_variable": {
-        "owner": "default",
-        "value": null
-    }
-}
diff --git a/tests/dictionaries_old/10check_base_target_optional/result/rougail/00-base.yml b/tests/dictionaries_old/10check_base_target_optional/result/rougail/00-base.yml
deleted file mode 100644
index fffd23ae7..000000000
--- a/tests/dictionaries_old/10check_base_target_optional/result/rougail/00-base.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-my_variable:
-  type: string
-  mandatory: false
-version: '1.1'
diff --git a/tests/dictionaries_old/10check_base_target_optional/tiramisu/base.py b/tests/dictionaries_old/10check_base_target_optional/tiramisu/base.py
deleted file mode 100644
index 8267ca2f8..000000000
--- a/tests/dictionaries_old/10check_base_target_optional/tiramisu/base.py
+++ /dev/null
@@ -1,28 +0,0 @@
-from importlib.machinery import SourceFileLoader as _SourceFileLoader
-from importlib.util import spec_from_loader as _spec_from_loader, module_from_spec as _module_from_spec
-class func:
-    pass
-
-def _load_functions(path):
-    global _SourceFileLoader, _spec_from_loader, _module_from_spec, func
-    loader = _SourceFileLoader('func', path)
-    spec = _spec_from_loader(loader.name, loader)
-    func_ = _module_from_spec(spec)
-    loader.exec_module(func_)
-    for function in dir(func_):
-        if function.startswith('_'):
-            continue
-        setattr(func, function, getattr(func_, function))
-_load_functions('tests/dictionaries_old/../eosfunc/test.py')
-try:
-    from tiramisu4 import *
-    from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES
-except:
-    from tiramisu import *
-    from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
-ALLOWED_LEADER_PROPERTIES.add("basic")
-ALLOWED_LEADER_PROPERTIES.add("normal")
-ALLOWED_LEADER_PROPERTIES.add("expert")
-option_2 = StrOption(name="my_variable", doc="my_variable", properties=frozenset({"normal"}))
-optiondescription_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2], properties=frozenset({"normal"}))
-option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1])
diff --git a/tests/dictionaries_old/10check_base_target_optional/tiramisu/multi.py b/tests/dictionaries_old/10check_base_target_optional/tiramisu/multi.py
deleted file mode 100644
index b3d78e184..000000000
--- a/tests/dictionaries_old/10check_base_target_optional/tiramisu/multi.py
+++ /dev/null
@@ -1,32 +0,0 @@
-from importlib.machinery import SourceFileLoader as _SourceFileLoader
-from importlib.util import spec_from_loader as _spec_from_loader, module_from_spec as _module_from_spec
-class func:
-    pass
-
-def _load_functions(path):
-    global _SourceFileLoader, _spec_from_loader, _module_from_spec, func
-    loader = _SourceFileLoader('func', path)
-    spec = _spec_from_loader(loader.name, loader)
-    func_ = _module_from_spec(spec)
-    loader.exec_module(func_)
-    for function in dir(func_):
-        if function.startswith('_'):
-            continue
-        setattr(func, function, getattr(func_, function))
-_load_functions('tests/dictionaries/../eosfunc/test.py')
-try:
-    from tiramisu4 import *
-    from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES
-except:
-    from tiramisu import *
-    from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
-ALLOWED_LEADER_PROPERTIES.add("basic")
-ALLOWED_LEADER_PROPERTIES.add("normal")
-ALLOWED_LEADER_PROPERTIES.add("expert")
-option_1 = StrOption(name="my_variable", doc="my_variable", properties=frozenset({"normal"}))
-optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[option_1], properties=frozenset({"normal"}))
-optiondescription_3 = OptionDescription(name="1", doc="1", children=[optiondescription_4])
-option_2 = StrOption(name="my_variable", doc="my_variable", properties=frozenset({"normal"}))
-optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[option_2], properties=frozenset({"normal"}))
-optiondescription_5 = OptionDescription(name="2", doc="2", children=[optiondescription_6])
-option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_3, optiondescription_5])
diff --git a/tests/dictionaries_old/10check_base_target_optional/xml/00-base.xml b/tests/dictionaries_old/10check_base_target_optional/xml/00-base.xml
deleted file mode 100644
index be6d5b08a..000000000
--- a/tests/dictionaries_old/10check_base_target_optional/xml/00-base.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.10">
-  <variables>
-    <variable name="my_variable" type="string"/>
-  </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/yml/00-base.yml b/tests/dictionaries_old/10check_base_target_optional/yml/00-base.yml
deleted file mode 100644
index d5fbc6b51..000000000
--- a/tests/dictionaries_old/10check_base_target_optional/yml/00-base.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-version: '0.10'
-variables:
-- variable:
-  - name: my_variable
-constraints:
-- check:
-  - name: valid_entier
-    param:
-    - name: mini
-      type: number
-      text: 0
-    - name: maxi
-      type: number
-      text: 100
-    target:
-    - optional: true
-      text: int
diff --git a/tests/dictionaries_old/10check_no_param/result/rougail/00-base.yml b/tests/dictionaries_old/10check_no_param/result/rougail/00-base.yml
index da6f8dec7..2d50f1439 100644
--- a/tests/dictionaries_old/10check_no_param/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10check_no_param/result/rougail/00-base.yml
@@ -1,6 +1,6 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: No change
     default: b
   int:
@@ -10,4 +10,3 @@ general:
     validators:
     - type: jinja
       jinja: '{{ rougail.general.int | valid_lower }}'
-version: '1.1'
diff --git a/tests/dictionaries_old/10check_option/result/rougail/00-base.yml b/tests/dictionaries_old/10check_option/result/rougail/00-base.yml
index fe7aea839..1d32f7858 100644
--- a/tests/dictionaries_old/10check_option/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10check_option/result/rougail/00-base.yml
@@ -1,10 +1,9 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: No change
     default: b
   int2:
-    type: number
     description: No change
     default: 100
   int:
@@ -15,4 +14,3 @@ general:
     - type: jinja
       jinja: '{{ rougail.general.int | valid_lower(mini=0, maxi=rougail.general.int2)
         }}'
-version: '1.1'
diff --git a/tests/dictionaries_old/10check_optional/result/rougail/00-base.yml b/tests/dictionaries_old/10check_optional/result/rougail/00-base.yml
index aef9d1b21..a95f89c30 100644
--- a/tests/dictionaries_old/10check_optional/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10check_optional/result/rougail/00-base.yml
@@ -1,6 +1,6 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: No change
     default: b
   int:
@@ -16,14 +16,13 @@ general:
           variable: rougail.general.int2
           optional: true
     - type: jinja
-      jinja: '{{ rougail.general.int | valid_differ(__int3) }}'
+      jinja: '{{ rougail.general.int | valid_differ(int3) }}'
       params:
-        __int3:
+        int3:
           type: variable
-          variable: __int3
+          variable: int3
           optional: true
   int2:
     type: number
     description: No change
     mandatory: false
-version: '1.1'
diff --git a/tests/dictionaries_old/10check_valid_differ/result/rougail/00-base.yml b/tests/dictionaries_old/10check_valid_differ/result/rougail/00-base.yml
index 27d138cbc..b17df5237 100644
--- a/tests/dictionaries_old/10check_valid_differ/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10check_valid_differ/result/rougail/00-base.yml
@@ -1,6 +1,6 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: No change
     default: oui
     validators:
@@ -8,7 +8,5 @@ general:
       jinja: '{{ rougail.general.mode_conteneur_actif | valid_differ(rougail.general.mode_conteneur_actif1)
         }}'
   mode_conteneur_actif1:
-    type: string
     description: No change
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/10check_valid_differ_add/result/rougail/00-base.yml b/tests/dictionaries_old/10check_valid_differ_add/result/rougail/00-base.yml
index 3a6962343..f3dc02b86 100644
--- a/tests/dictionaries_old/10check_valid_differ_add/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10check_valid_differ_add/result/rougail/00-base.yml
@@ -1,22 +1,18 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: No change
     default: oui
   mode_conteneur_actif1:
-    type: string
     description: No change
     default: non
   mode_conteneur_actif2:
-    type: string
     description: No change
     default: non
   mode_conteneur_actif3:
-    type: string
     description: No change
     default: oui
     validators:
     - type: jinja
       jinja: '{{ rougail.general.mode_conteneur_actif3 | valid_differ(rougail.general.mode_conteneur_actif1)
         }}'
-version: '1.1'
diff --git a/tests/dictionaries_old/10check_valid_differ_add/result/rougail/01-base.yml b/tests/dictionaries_old/10check_valid_differ_add/result/rougail/01-base.yml
index 1c37f7a58..e72ebd920 100644
--- a/tests/dictionaries_old/10check_valid_differ_add/result/rougail/01-base.yml
+++ b/tests/dictionaries_old/10check_valid_differ_add/result/rougail/01-base.yml
@@ -1,11 +1,11 @@
+version: 1.1
 general:
   mode_conteneur_actif3:
     redefine: true
     validators:
     - type: jinja
-      jinja: '{{ rougail.general.mode_conteneur_actif3 | valid_differ(__mode_conteneur_actif1)
+      jinja: '{{ rougail.general.mode_conteneur_actif3 | valid_differ(mode_conteneur_actif1)
         }}'
     - type: jinja
-      jinja: '{{ rougail.general.mode_conteneur_actif3 | valid_differ(__mode_conteneur_actif2)
+      jinja: '{{ rougail.general.mode_conteneur_actif3 | valid_differ(mode_conteneur_actif2)
         }}'
-version: '1.1'
diff --git a/tests/dictionaries_old/10check_valid_differ_removecheck/result/rougail/00-base.yml b/tests/dictionaries_old/10check_valid_differ_removecheck/result/rougail/00-base.yml
index 3a6962343..f3dc02b86 100644
--- a/tests/dictionaries_old/10check_valid_differ_removecheck/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10check_valid_differ_removecheck/result/rougail/00-base.yml
@@ -1,22 +1,18 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: No change
     default: oui
   mode_conteneur_actif1:
-    type: string
     description: No change
     default: non
   mode_conteneur_actif2:
-    type: string
     description: No change
     default: non
   mode_conteneur_actif3:
-    type: string
     description: No change
     default: oui
     validators:
     - type: jinja
       jinja: '{{ rougail.general.mode_conteneur_actif3 | valid_differ(rougail.general.mode_conteneur_actif1)
         }}'
-version: '1.1'
diff --git a/tests/dictionaries_old/10check_valid_differ_removecheck/result/rougail/01-base.yml b/tests/dictionaries_old/10check_valid_differ_removecheck/result/rougail/01-base.yml
index 3b36095a0..d115bf359 100644
--- a/tests/dictionaries_old/10check_valid_differ_removecheck/result/rougail/01-base.yml
+++ b/tests/dictionaries_old/10check_valid_differ_removecheck/result/rougail/01-base.yml
@@ -1,12 +1,12 @@
+version: 1.1
 general:
   mode_conteneur_actif3:
     redefine: true
     default: oui
     validators:
     - type: jinja
-      jinja: '{{ rougail.general.mode_conteneur_actif3 | valid_differ(__mode_conteneur_actif1)
+      jinja: '{{ rougail.general.mode_conteneur_actif3 | valid_differ(mode_conteneur_actif1)
         }}'
     - type: jinja
-      jinja: '{{ rougail.general.mode_conteneur_actif3 | valid_differ(__mode_conteneur_actif2)
+      jinja: '{{ rougail.general.mode_conteneur_actif3 | valid_differ(mode_conteneur_actif2)
         }}'
-version: '1.1'
diff --git a/tests/dictionaries_old/10check_valid_in_network/result/rougail/00-base.yml b/tests/dictionaries_old/10check_valid_in_network/result/rougail/00-base.yml
index 7282000af..af6267550 100644
--- a/tests/dictionaries_old/10check_valid_in_network/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10check_valid_in_network/result/rougail/00-base.yml
@@ -1,25 +1,21 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: No change
     default: oui
   adresse_ip_eth0:
     type: local_ip
     description: Adresse IP de la carte
-    mandatory: true
     mode: basic
   adresse_netmask_eth0:
     type: netmask
     description: Masque de sous réseau de la carte
-    mandatory: true
     mode: basic
   adresse_ip:
     type: local_ip
     description: IP
-    mandatory: true
     mode: basic
     validators:
     - type: jinja
       jinja: '{{ rougail.general.adresse_ip | valid_in_network(rougail.general.adresse_ip_eth0,
         rougail.general.adresse_netmask_eth0) }}'
-version: '1.1'
diff --git a/tests/dictionaries_old/10check_valid_in_network_cidr/result/rougail/00-base.yml b/tests/dictionaries_old/10check_valid_in_network_cidr/result/rougail/00-base.yml
index 89ff58439..28cec6ebd 100644
--- a/tests/dictionaries_old/10check_valid_in_network_cidr/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10check_valid_in_network_cidr/result/rougail/00-base.yml
@@ -1,20 +1,17 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: No change
     default: oui
   adresse_ip_eth0:
     type: cidr
     description: Adresse IP de la carte
-    mandatory: true
     mode: basic
   adresse_ip:
     type: local_ip
     description: IP
-    mandatory: true
     mode: basic
     validators:
     - type: jinja
       jinja: '{{ rougail.general.adresse_ip | valid_in_network(rougail.general.adresse_ip_eth0)
         }}'
-version: '1.1'
diff --git a/tests/dictionaries_old/10check_valid_ipnetmask/result/rougail/00-base.yml b/tests/dictionaries_old/10check_valid_ipnetmask/result/rougail/00-base.yml
index f6d9c6313..2d2a95a77 100644
--- a/tests/dictionaries_old/10check_valid_ipnetmask/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10check_valid_ipnetmask/result/rougail/00-base.yml
@@ -1,20 +1,17 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: No change
     default: oui
   adresse_ip_eth0:
     type: local_ip
     description: Adresse IP de la carte
-    mandatory: true
     mode: basic
   adresse_netmask_eth0:
     type: netmask
     description: Masque de sous réseau de la carte
-    mandatory: true
     mode: basic
     validators:
     - type: jinja
       jinja: '{{ rougail.general.adresse_netmask_eth0 | valid_ipnetmask(rougail.general.adresse_ip_eth0)
         }}'
-version: '1.1'
diff --git a/tests/dictionaries_old/10check_valid_jinja/result/rougail/00-base.yml b/tests/dictionaries_old/10check_valid_jinja/result/rougail/00-base.yml
index 5f09f7c38..e319296d1 100644
--- a/tests/dictionaries_old/10check_valid_jinja/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10check_valid_jinja/result/rougail/00-base.yml
@@ -1,6 +1,6 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: No change
     default: oui
     validators:
@@ -8,7 +8,5 @@ general:
       %}the value must be different than "{{ rougail.general.mode_conteneur_actif
       }}"{% endif %}'
   mode_conteneur_actif1:
-    type: string
     description: No change
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/10fill_information/result/rougail/00-base.yml b/tests/dictionaries_old/10fill_information/result/rougail/00-base.yml
index 553ce1f43..6f675667a 100644
--- a/tests/dictionaries_old/10fill_information/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10fill_information/result/rougail/00-base.yml
@@ -1,13 +1,12 @@
+version: 1.1
 general:
   mode_conteneur_actif:
     type: string
     description: No change
-    mandatory: false
     default:
       type: jinja
-      jinja: '{{ __information.test_information | calc_val }}'
+      jinja: '{{ __information_test_information | calc_val }}'
       params:
-        __information.test_information:
+        __information_test_information:
           type: information
           information: test_information
-version: '1.1'
diff --git a/tests/dictionaries_old/10fill_information_multi/result/rougail/00-base.yml b/tests/dictionaries_old/10fill_information_multi/result/rougail/00-base.yml
index 932599ab7..a43c1b1e1 100644
--- a/tests/dictionaries_old/10fill_information_multi/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10fill_information_multi/result/rougail/00-base.yml
@@ -1,14 +1,14 @@
+version: 1.1
 general:
   mode_conteneur_actif:
     type: string
     description: No change
     multi: true
-    mandatory: false
     default:
       type: jinja
-      jinja: '{{ __information.test_information | calc_val }}'
+      jinja: "{% for __variable in __information_test_information | calc_val %}\n
+        {{ __variable }}\n{% endfor %}"
       params:
-        __information.test_information:
+        __information_test_information:
           type: information
           information: test_information
-version: '1.1'
diff --git a/tests/dictionaries_old/10fill_option_information/result/rougail/00-base.yml b/tests/dictionaries_old/10fill_option_information/result/rougail/00-base.yml
index fff614949..b6545ac83 100644
--- a/tests/dictionaries_old/10fill_option_information/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10fill_option_information/result/rougail/00-base.yml
@@ -1,3 +1,4 @@
+version: 1.1
 general:
   variable:
     type: string
@@ -6,14 +7,12 @@ general:
   mode_conteneur_actif:
     type: string
     description: No change
-    mandatory: false
     default:
       type: jinja
-      jinja: '{{ __information.rougail.general.variable.test_information | calc_val
+      jinja: '{{ __information_rougail.general.variable.test_information | calc_val
         }}'
       params:
-        __information.rougail.general.variable.test_information:
+        __information_rougail.general.variable.test_information:
           type: information
           information: test_information
           variable: rougail.general.variable
-version: '1.1'
diff --git a/tests/dictionaries_old/10fill_option_od_information/result/rougail/00-base.yml b/tests/dictionaries_old/10fill_option_od_information/result/rougail/00-base.yml
index 2b379b304..0d645de8a 100644
--- a/tests/dictionaries_old/10fill_option_od_information/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10fill_option_od_information/result/rougail/00-base.yml
@@ -1,14 +1,14 @@
+version: 1.1
 general:
   mode_conteneur_actif:
     type: string
     description: No change
-    mandatory: false
     default:
       type: jinja
-      jinja: '{{ __information.rougail.general.od.variable.test_information | calc_val
+      jinja: '{{ __information_rougail.general.od.variable.test_information | calc_val
         }}'
       params:
-        __information.rougail.general.od.variable.test_information:
+        __information_rougail.general.od.variable.test_information:
           type: information
           information: test_information
           variable: rougail.general.od.variable
@@ -17,4 +17,3 @@ general:
       type: string
       description: No change
       mandatory: false
-version: '1.1'
diff --git a/tests/dictionaries_old/10fill_target_information/result/rougail/00-base.yml b/tests/dictionaries_old/10fill_target_information/result/rougail/00-base.yml
index e1a6d8a3b..8ae755967 100644
--- a/tests/dictionaries_old/10fill_target_information/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10fill_target_information/result/rougail/00-base.yml
@@ -1,15 +1,14 @@
+version: 1.1
 general:
   mode_conteneur_actif:
     type: string
     description: No change
-    mandatory: false
     default:
       type: jinja
-      jinja: '{{ __information.rougail.general.mode_conteneur_actif.test_information
+      jinja: '{{ __information_rougail.general.mode_conteneur_actif.test_information
         | calc_val }}'
       params:
-        __information.rougail.general.mode_conteneur_actif.test_information:
+        __information_rougail.general.mode_conteneur_actif.test_information:
           type: information
           information: test_information
           variable: rougail.general.mode_conteneur_actif
-version: '1.1'
diff --git a/tests/dictionaries_old/10frozenifin_unknown_valid_enum_number/result/rougail/00-base.yml b/tests/dictionaries_old/10frozenifin_unknown_valid_enum_number/result/rougail/00-base.yml
index b11eb6b45..7c966e234 100644
--- a/tests/dictionaries_old/10frozenifin_unknown_valid_enum_number/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10frozenifin_unknown_valid_enum_number/result/rougail/00-base.yml
@@ -1,7 +1,7 @@
+version: 1.1
 general:
   mode: advanced
   mode_conteneur_actif:
-    type: string
     description: No change
     default: non
 enumfam:
@@ -22,4 +22,3 @@ enumfam:
     hidden:
       type: jinja
       jinja: '{% if rougail.enumfam.enumvar == "4" %}hidden{% endif %}'
-version: '1.1'
diff --git a/tests/dictionaries_old/10leadership_append/result/rougail/00-base.yml b/tests/dictionaries_old/10leadership_append/result/rougail/00-base.yml
index cd1d19335..b1ccc74b9 100644
--- a/tests/dictionaries_old/10leadership_append/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10leadership_append/result/rougail/00-base.yml
@@ -1,6 +1,6 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: No change
     default: non
 general1:
@@ -15,15 +15,12 @@ general1:
     follower1:
       type: string
       description: follower1
-      mandatory: false
       default:
         type: jinja
         jinja: '{{ "valfill" | calc_val }}'
     follower2:
       type: string
       description: follower2
-      mandatory: false
       default:
         type: jinja
         jinja: '{{ rougail.general1.leader.follower1 | calc_val }}'
-version: '1.1'
diff --git a/tests/dictionaries_old/10leadership_append/result/rougail/01-base.yml b/tests/dictionaries_old/10leadership_append/result/rougail/01-base.yml
index 34530bde0..65b9658be 100644
--- a/tests/dictionaries_old/10leadership_append/result/rougail/01-base.yml
+++ b/tests/dictionaries_old/10leadership_append/result/rougail/01-base.yml
@@ -1,7 +1,7 @@
+version: 1.1
 general1:
   leader:
     follower3:
       type: string
       description: follower3
       mandatory: false
-version: '1.1'
diff --git a/tests/dictionaries_old/10leadership_append_hidden/result/rougail/00-base.yml b/tests/dictionaries_old/10leadership_append_hidden/result/rougail/00-base.yml
index 34bc2b0c3..2d5eab06c 100644
--- a/tests/dictionaries_old/10leadership_append_hidden/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10leadership_append_hidden/result/rougail/00-base.yml
@@ -1,6 +1,6 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: No change
     default: non
 general1:
@@ -16,15 +16,12 @@ general1:
     follower1:
       type: string
       description: follower1
-      mandatory: false
       default:
         type: jinja
         jinja: '{{ "valfill" | calc_val }}'
     follower2:
       type: string
       description: follower2
-      mandatory: false
       default:
         type: jinja
         jinja: '{{ rougail.general1.leader.follower1 | calc_val }}'
-version: '1.1'
diff --git a/tests/dictionaries_old/10leadership_append_hidden/result/rougail/01-base.yml b/tests/dictionaries_old/10leadership_append_hidden/result/rougail/01-base.yml
index 34530bde0..65b9658be 100644
--- a/tests/dictionaries_old/10leadership_append_hidden/result/rougail/01-base.yml
+++ b/tests/dictionaries_old/10leadership_append_hidden/result/rougail/01-base.yml
@@ -1,7 +1,7 @@
+version: 1.1
 general1:
   leader:
     follower3:
       type: string
       description: follower3
       mandatory: false
-version: '1.1'
diff --git a/tests/dictionaries_old/10leadership_append_name/result/rougail/00-base.yml b/tests/dictionaries_old/10leadership_append_name/result/rougail/00-base.yml
index 2e3c4ddcf..52aeefe17 100644
--- a/tests/dictionaries_old/10leadership_append_name/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10leadership_append_name/result/rougail/00-base.yml
@@ -1,6 +1,6 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: No change
     default: non
 general1:
@@ -15,15 +15,12 @@ general1:
     follower1:
       type: string
       description: follower1
-      mandatory: false
       default:
         type: jinja
         jinja: '{{ "valfill" | calc_val }}'
     follower2:
       type: string
       description: follower2
-      mandatory: false
       default:
         type: jinja
         jinja: '{{ rougail.general1.leadership.follower1 | calc_val }}'
-version: '1.1'
diff --git a/tests/dictionaries_old/10leadership_append_name/result/rougail/01-base.yml b/tests/dictionaries_old/10leadership_append_name/result/rougail/01-base.yml
index 91c8f4489..108a3a868 100644
--- a/tests/dictionaries_old/10leadership_append_name/result/rougail/01-base.yml
+++ b/tests/dictionaries_old/10leadership_append_name/result/rougail/01-base.yml
@@ -1,7 +1,7 @@
+version: 1.1
 general1:
   leadership:
     follower3:
       type: string
       description: follower3
       mandatory: false
-version: '1.1'
diff --git a/tests/dictionaries_old/10leadership_auto/result/rougail/00-base.yml b/tests/dictionaries_old/10leadership_auto/result/rougail/00-base.yml
index 6f9086f67..c27bc8673 100644
--- a/tests/dictionaries_old/10leadership_auto/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10leadership_auto/result/rougail/00-base.yml
@@ -1,6 +1,6 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: No change
     default: non
   leader:
@@ -15,7 +15,6 @@ general:
       type: string
       description: follower1
       hidden: true
-      mandatory: false
       default:
         type: jinja
         jinja: '{{ "valfill" | calc_val }}'
@@ -23,7 +22,6 @@ general:
       type: string
       description: follower2
       hidden: true
-      mandatory: false
       default:
         type: jinja
         jinja: '{{ rougail.general.leader.follower1 | calc_val }}'
@@ -31,8 +29,6 @@ general:
       type: string
       description: follower3
       hidden: true
-      mandatory: false
       default:
         type: jinja
         jinja: '{{ rougail.general.leader.leader | calc_val }}'
-version: '1.1'
diff --git a/tests/dictionaries_old/10leadership_auto_index/result/rougail/00-base.yml b/tests/dictionaries_old/10leadership_auto_index/result/rougail/00-base.yml
index b46edca55..cd9e1bc87 100644
--- a/tests/dictionaries_old/10leadership_auto_index/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10leadership_auto_index/result/rougail/00-base.yml
@@ -1,19 +1,17 @@
+version: 1.1
 leader:
   description: leader
   type: leadership
   leader:
-    multi: true
     default:
     - a
     - b
     - c
   follower1:
     type: number
-    mandatory: false
     default:
       type: jinja
       jinja: '{{ __index | calc_val }}'
       params:
         __index:
           type: index
-version: '1.1'
diff --git a/tests/dictionaries_old/10leadership_autoleader/result/rougail/00-base.yml b/tests/dictionaries_old/10leadership_autoleader/result/rougail/00-base.yml
index 7d9e2e1c5..61a972e2f 100644
--- a/tests/dictionaries_old/10leadership_autoleader/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10leadership_autoleader/result/rougail/00-base.yml
@@ -1,6 +1,6 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: No change
     default: non
   leader:
@@ -15,7 +15,6 @@ general:
       type: string
       description: follower1
       hidden: true
-      mandatory: false
       default:
         type: jinja
         jinja: '{{ "valfill" | calc_val }}'
@@ -23,8 +22,6 @@ general:
       type: string
       description: follower2
       hidden: true
-      mandatory: false
       default:
         type: jinja
         jinja: '{{ rougail.general.leader.leader | calc_val }}'
-version: '1.1'
diff --git a/tests/dictionaries_old/10leadership_autoleader_expert/result/rougail/00-base.yml b/tests/dictionaries_old/10leadership_autoleader_expert/result/rougail/00-base.yml
index 5fd2f3419..3a7c892ba 100644
--- a/tests/dictionaries_old/10leadership_autoleader_expert/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10leadership_autoleader_expert/result/rougail/00-base.yml
@@ -1,7 +1,7 @@
+version: 1.1
 general:
   mode: advanced
   mode_conteneur_actif:
-    type: string
     description: No change
     default: non
 leadermode:
@@ -13,10 +13,10 @@ leadermode:
       description: leader
       multi: true
       mode: advanced
-      mandatory: false
       default:
         type: jinja
-        jinja: '{{ "valfill" | calc_list }}'
+        jinja: "{% for __variable in \"valfill\" | calc_list %}\n{{ __variable }}\n
+          {% endfor %}"
     follower1:
       type: string
       description: follower1
@@ -25,4 +25,3 @@ leadermode:
       type: string
       description: follower2
       mandatory: false
-version: '1.1'
diff --git a/tests/dictionaries_old/10leadership_autosaveexpert/result/rougail/00-base.yml b/tests/dictionaries_old/10leadership_autosaveexpert/result/rougail/00-base.yml
index 1172a93cd..c5f210936 100644
--- a/tests/dictionaries_old/10leadership_autosaveexpert/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10leadership_autosaveexpert/result/rougail/00-base.yml
@@ -1,6 +1,6 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: No change
     default: non
   leader:
@@ -14,7 +14,6 @@ general:
     follower1:
       type: string
       description: follower1
-      mandatory: false
       default:
         type: jinja
         jinja: '{{ "valfill" | calc_val }}'
@@ -22,8 +21,6 @@ general:
       type: string
       description: follower2
       mode: advanced
-      mandatory: false
       default:
         type: jinja
         jinja: '{{ rougail.general.leader.follower1 | calc_val }}'
-version: '1.1'
diff --git a/tests/dictionaries_old/10leadership_empty/result/rougail/00_base.yml b/tests/dictionaries_old/10leadership_empty/result/rougail/00_base.yml
index b00388f4f..2c0bc300f 100644
--- a/tests/dictionaries_old/10leadership_empty/result/rougail/00_base.yml
+++ b/tests/dictionaries_old/10leadership_empty/result/rougail/00_base.yml
@@ -1,3 +1,3 @@
+version: 1.1
 empty_leader:
   type: leadership
-version: '1.1'
diff --git a/tests/dictionaries_old/10leadership_empty/result/services/00_base.yml b/tests/dictionaries_old/10leadership_empty/result/services/00_base.yml
deleted file mode 100644
index 8b6e1feff..000000000
--- a/tests/dictionaries_old/10leadership_empty/result/services/00_base.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-tata.service: {}
-version: '1.1'
diff --git a/tests/dictionaries_old/10leadership_hidden/result/rougail/00-base.yml b/tests/dictionaries_old/10leadership_hidden/result/rougail/00-base.yml
index ed77ad9f4..8124b4e04 100644
--- a/tests/dictionaries_old/10leadership_hidden/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10leadership_hidden/result/rougail/00-base.yml
@@ -1,7 +1,7 @@
+version: 1.1
 general:
   mode: advanced
   mode_conteneur_actif:
-    type: string
     description: No change
     default: non
 leadermode:
@@ -13,10 +13,10 @@ leadermode:
       type: string
       description: leader
       multi: true
-      mandatory: false
       default:
         type: jinja
-        jinja: '{{ "valfill" | calc_list }}'
+        jinja: "{% for __variable in \"valfill\" | calc_list %}\n{{ __variable }}\n
+          {% endfor %}"
     follower1:
       type: string
       description: follower1
@@ -25,4 +25,3 @@ leadermode:
       type: string
       description: follower2
       mandatory: false
-version: '1.1'
diff --git a/tests/dictionaries_old/10leadership_leader_hidden/result/rougail/00-base.yml b/tests/dictionaries_old/10leadership_leader_hidden/result/rougail/00-base.yml
index 9fb32ac45..24224faf6 100644
--- a/tests/dictionaries_old/10leadership_leader_hidden/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10leadership_leader_hidden/result/rougail/00-base.yml
@@ -1,7 +1,7 @@
+version: 1.1
 general:
   mode: advanced
   mode_conteneur_actif:
-    type: string
     description: No change
     default: non
 leadermode:
@@ -13,10 +13,10 @@ leadermode:
       description: leader
       multi: true
       hidden: true
-      mandatory: false
       default:
         type: jinja
-        jinja: '{{ "valfill" | calc_list }}'
+        jinja: "{% for __variable in \"valfill\" | calc_list %}\n{{ __variable }}\n
+          {% endfor %}"
     follower1:
       type: string
       description: follower1
@@ -25,4 +25,3 @@ leadermode:
       type: string
       description: follower2
       mandatory: false
-version: '1.1'
diff --git a/tests/dictionaries_old/10leadership_leader_hidden_if_in/result/rougail/00-base.yml b/tests/dictionaries_old/10leadership_leader_hidden_if_in/result/rougail/00-base.yml
index 529be144c..0da73a21a 100644
--- a/tests/dictionaries_old/10leadership_leader_hidden_if_in/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10leadership_leader_hidden_if_in/result/rougail/00-base.yml
@@ -1,7 +1,7 @@
+version: 1.1
 general:
   mode: advanced
   mode_conteneur_actif:
-    type: string
     description: No change
     default: non
 leadermode:
@@ -25,4 +25,3 @@ leadermode:
       type: string
       description: follower2
       mandatory: false
-version: '1.1'
diff --git a/tests/dictionaries_old/10leadership_leader_hidden_if_in_name/result/rougail/00-base.yml b/tests/dictionaries_old/10leadership_leader_hidden_if_in_name/result/rougail/00-base.yml
index 8c5162b41..39586e51a 100644
--- a/tests/dictionaries_old/10leadership_leader_hidden_if_in_name/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10leadership_leader_hidden_if_in_name/result/rougail/00-base.yml
@@ -1,7 +1,7 @@
+version: 1.1
 general:
   mode: advanced
   mode_conteneur_actif:
-    type: string
     description: No change
     default: non
 leadermode:
@@ -25,4 +25,3 @@ leadermode:
       type: string
       description: follower2
       mandatory: false
-version: '1.1'
diff --git a/tests/dictionaries_old/10leadership_leadermandatory/result/rougail/00-base.yml b/tests/dictionaries_old/10leadership_leadermandatory/result/rougail/00-base.yml
index 2aa941177..40e6fdc2e 100644
--- a/tests/dictionaries_old/10leadership_leadermandatory/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10leadership_leadermandatory/result/rougail/00-base.yml
@@ -1,6 +1,6 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: No change
     default: non
   leader:
@@ -10,19 +10,15 @@ general:
       type: string
       description: leader
       multi: true
-      mandatory: true
     follower1:
       type: string
       description: follower1
-      mandatory: false
       default:
         type: jinja
         jinja: '{{ "valfill" | calc_val }}'
     follower2:
       type: string
       description: follower2
-      mandatory: false
       default:
         type: jinja
         jinja: '{{ rougail.general.leader.follower1 | calc_val }}'
-version: '1.1'
diff --git a/tests/dictionaries_old/10leadership_mandatoryfollower/result/rougail/00-base.yml b/tests/dictionaries_old/10leadership_mandatoryfollower/result/rougail/00-base.yml
index 2c7864558..108500a9a 100644
--- a/tests/dictionaries_old/10leadership_mandatoryfollower/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10leadership_mandatoryfollower/result/rougail/00-base.yml
@@ -1,7 +1,7 @@
+version: 1.1
 general:
   description: général
   mode_conteneur_actif:
-    type: string
     description: No change
     hidden: true
     default: oui
@@ -16,5 +16,3 @@ general:
     nut_monitor_host:
       type: network
       description: Adresse IP du réseau de l'esclave
-      mandatory: true
-version: '1.1'
diff --git a/tests/dictionaries_old/10leadership_mandatoryfollower_value/result/rougail/00-base.yml b/tests/dictionaries_old/10leadership_mandatoryfollower_value/result/rougail/00-base.yml
index ad58c1728..582270fd2 100644
--- a/tests/dictionaries_old/10leadership_mandatoryfollower_value/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10leadership_mandatoryfollower_value/result/rougail/00-base.yml
@@ -1,7 +1,7 @@
+version: 1.1
 general:
   description: général
   mode_conteneur_actif:
-    type: string
     description: No change
     hidden: true
     default: oui
@@ -16,6 +16,4 @@ general:
     nut_monitor_host:
       type: network
       description: Adresse IP du réseau de l'esclave
-      mandatory: true
       default: 192.168.0.0
-version: '1.1'
diff --git a/tests/dictionaries_old/10leadership_multi/result/rougail/00-base.yml b/tests/dictionaries_old/10leadership_multi/result/rougail/00-base.yml
index a73c793e6..4968bea75 100644
--- a/tests/dictionaries_old/10leadership_multi/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10leadership_multi/result/rougail/00-base.yml
@@ -1,6 +1,6 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: No change
     default: non
 general1:
@@ -15,14 +15,12 @@ general1:
     follower1:
       type: string
       description: follower1
-      mandatory: false
       default:
         type: jinja
         jinja: '{{ "valfill" | calc_val }}'
     follower2:
       type: string
       description: follower2
-      mandatory: false
       default:
         type: jinja
         jinja: '{{ rougail.general1.leader.follower1 | calc_val }}'
@@ -42,4 +40,3 @@ general1:
       type: string
       description: follower2
       mandatory: false
-version: '1.1'
diff --git a/tests/dictionaries_old/10load_disabled_if_in/result/rougail/00-base.yml b/tests/dictionaries_old/10load_disabled_if_in/result/rougail/00-base.yml
index 71b0e0ab2..9aaab3afa 100644
--- a/tests/dictionaries_old/10load_disabled_if_in/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10load_disabled_if_in/result/rougail/00-base.yml
@@ -1,10 +1,9 @@
+version: 1.1
 general:
   condition:
-    type: string
     description: No change
     default: non
   mode_conteneur_actif:
-    type: string
     description: No change
     hidden: true
     default: non
@@ -12,9 +11,7 @@ general:
       type: jinja
       jinja: '{% if rougail.general.condition == "oui" %}disabled{% endif %}'
   mode_conteneur_actif2:
-    type: string
     description: No change
     hidden: true
     default: non
     disabled: *id001
-version: '1.1'
diff --git a/tests/dictionaries_old/10load_disabled_if_in_fill/result/rougail/00-base.yml b/tests/dictionaries_old/10load_disabled_if_in_fill/result/rougail/00-base.yml
index 73e9aec3f..1bcdac812 100644
--- a/tests/dictionaries_old/10load_disabled_if_in_fill/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10load_disabled_if_in_fill/result/rougail/00-base.yml
@@ -1,6 +1,6 @@
+version: 1.1
 general:
   condition:
-    type: string
     default: no
   variable1:
     type: string
@@ -10,7 +10,6 @@ general:
       jinja: '{% if rougail.general.condition == "no" %}disabled{% endif %}'
   variable2:
     type: string
-    mandatory: false
     default:
       type: jinja
       jinja: '{{ rougail.general.variable1 | calc_val }}'
@@ -19,4 +18,3 @@ general:
           type: variable
           variable: rougail.general.variable1
           propertyerror: false
-version: '1.1'
diff --git a/tests/dictionaries_old/10load_disabled_if_in_list_optional/result/rougail/00-base.yml b/tests/dictionaries_old/10load_disabled_if_in_list_optional/result/rougail/00-base.yml
index 3142ccc6d..4ac9c1db2 100644
--- a/tests/dictionaries_old/10load_disabled_if_in_list_optional/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10load_disabled_if_in_list_optional/result/rougail/00-base.yml
@@ -1,3 +1,3 @@
+version: 1.1
 condition:
   type: boolean
-version: '1.1'
diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param/result/rougail/00-base.yml b/tests/dictionaries_old/10load_disabled_if_in_multi_param/result/rougail/00-base.yml
index a89e2546f..8b96ff338 100644
--- a/tests/dictionaries_old/10load_disabled_if_in_multi_param/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10load_disabled_if_in_multi_param/result/rougail/00-base.yml
@@ -1,10 +1,9 @@
+version: 1.1
 general:
   condition:
-    type: string
     description: No change
     default: non
   mode_conteneur_actif:
-    type: string
     description: No change
     hidden: true
     default: non
@@ -13,9 +12,7 @@ general:
       jinja: '{% if rougail.general.condition == "oui" or rougail.general.condition
         == "maybe" %}disabled{% endif %}'
   mode_conteneur_actif2:
-    type: string
     description: No change
     hidden: true
     default: non
     disabled: *id001
-version: '1.1'
diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param/result/services/00-base.yml b/tests/dictionaries_old/10load_disabled_if_in_multi_param/result/services/00-base.yml
deleted file mode 100644
index 9e1cc6446..000000000
--- a/tests/dictionaries_old/10load_disabled_if_in_multi_param/result/services/00-base.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-test.service:
-  files:
-    /tmp/file1:
-      disabled:
-        type: jinja
-        jinja: '{% if rougail.general.condition == "oui" or rougail.general.condition
-          == "maybe" %}disabled{% endif %}'
-version: '1.1'
diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param2/result/rougail/00-base.yml b/tests/dictionaries_old/10load_disabled_if_in_multi_param2/result/rougail/00-base.yml
index b3d02fe1c..de2fc3426 100644
--- a/tests/dictionaries_old/10load_disabled_if_in_multi_param2/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10load_disabled_if_in_multi_param2/result/rougail/00-base.yml
@@ -1,14 +1,12 @@
+version: 1.1
 general:
   condition:
-    type: string
     description: No change
     default: no
   condition2:
-    type: string
     description: No change
     default: no
   test_variable:
-    type: string
     description: No change
     hidden: true
     default: no
@@ -16,4 +14,3 @@ general:
       type: jinja
       jinja: '{% if rougail.general.condition2 == "yes" or rougail.general.condition2
         == "maybe" %}disabled{% endif %}'
-version: '1.1'
diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param2/result/services/00-base.yml b/tests/dictionaries_old/10load_disabled_if_in_multi_param2/result/services/00-base.yml
deleted file mode 100644
index e094b83aa..000000000
--- a/tests/dictionaries_old/10load_disabled_if_in_multi_param2/result/services/00-base.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-test.service:
-  files:
-    /tmp/file1:
-      disabled:
-        type: jinja
-        jinja: '{% if rougail.general.condition == "yes" or rougail.general.condition
-          == "maybe" %}disabled{% endif %}'
-version: '1.1'
diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param3/result/rougail/00-base.yml b/tests/dictionaries_old/10load_disabled_if_in_multi_param3/result/rougail/00-base.yml
index b3d02fe1c..de2fc3426 100644
--- a/tests/dictionaries_old/10load_disabled_if_in_multi_param3/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10load_disabled_if_in_multi_param3/result/rougail/00-base.yml
@@ -1,14 +1,12 @@
+version: 1.1
 general:
   condition:
-    type: string
     description: No change
     default: no
   condition2:
-    type: string
     description: No change
     default: no
   test_variable:
-    type: string
     description: No change
     hidden: true
     default: no
@@ -16,4 +14,3 @@ general:
       type: jinja
       jinja: '{% if rougail.general.condition2 == "yes" or rougail.general.condition2
         == "maybe" %}disabled{% endif %}'
-version: '1.1'
diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param3/result/services/00-base.yml b/tests/dictionaries_old/10load_disabled_if_in_multi_param3/result/services/00-base.yml
deleted file mode 100644
index 84fe53e0f..000000000
--- a/tests/dictionaries_old/10load_disabled_if_in_multi_param3/result/services/00-base.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-test.service:
-  files:
-    /tmp/file1:
-      disabled:
-        type: jinja
-        jinja: '{% if rougail.general.condition == "yes" or rougail.general.condition
-          == "maybe" %}{% else %}disabled{% endif %}'
-version: '1.1'
diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param4/result/rougail/00-base.yml b/tests/dictionaries_old/10load_disabled_if_in_multi_param4/result/rougail/00-base.yml
index d23d1ca1d..f726f263b 100644
--- a/tests/dictionaries_old/10load_disabled_if_in_multi_param4/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10load_disabled_if_in_multi_param4/result/rougail/00-base.yml
@@ -1,14 +1,12 @@
+version: 1.1
 general:
   condition:
-    type: string
     description: No change
     default: yes
   condition2:
-    type: string
     description: No change
     default: no
   test_variable:
-    type: string
     description: No change
     hidden: true
     default: no
@@ -16,4 +14,3 @@ general:
       type: jinja
       jinja: '{% if rougail.general.condition2 == "yes" or rougail.general.condition2
         == "maybe" %}disabled{% endif %}'
-version: '1.1'
diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param4/result/services/00-base.yml b/tests/dictionaries_old/10load_disabled_if_in_multi_param4/result/services/00-base.yml
deleted file mode 100644
index 84fe53e0f..000000000
--- a/tests/dictionaries_old/10load_disabled_if_in_multi_param4/result/services/00-base.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-test.service:
-  files:
-    /tmp/file1:
-      disabled:
-        type: jinja
-        jinja: '{% if rougail.general.condition == "yes" or rougail.general.condition
-          == "maybe" %}{% else %}disabled{% endif %}'
-version: '1.1'
diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param5/result/rougail/00-base.yml b/tests/dictionaries_old/10load_disabled_if_in_multi_param5/result/rougail/00-base.yml
index 687d6baff..16bb6c7d9 100644
--- a/tests/dictionaries_old/10load_disabled_if_in_multi_param5/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10load_disabled_if_in_multi_param5/result/rougail/00-base.yml
@@ -1,14 +1,12 @@
+version: 1.1
 general:
   condition:
-    type: string
     description: No change
     default: yes
   condition2:
-    type: string
     description: No change
     default: yes
   test_variable:
-    type: string
     description: No change
     hidden: true
     default: no
@@ -16,4 +14,3 @@ general:
       type: jinja
       jinja: '{% if rougail.general.condition2 == "yes" or rougail.general.condition2
         == "maybe" %}disabled{% endif %}'
-version: '1.1'
diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param5/result/services/00-base.yml b/tests/dictionaries_old/10load_disabled_if_in_multi_param5/result/services/00-base.yml
deleted file mode 100644
index 84fe53e0f..000000000
--- a/tests/dictionaries_old/10load_disabled_if_in_multi_param5/result/services/00-base.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-test.service:
-  files:
-    /tmp/file1:
-      disabled:
-        type: jinja
-        jinja: '{% if rougail.general.condition == "yes" or rougail.general.condition
-          == "maybe" %}{% else %}disabled{% endif %}'
-version: '1.1'
diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param6/result/rougail/00-base.yml b/tests/dictionaries_old/10load_disabled_if_in_multi_param6/result/rougail/00-base.yml
index 4d1fde9f3..b71d3c930 100644
--- a/tests/dictionaries_old/10load_disabled_if_in_multi_param6/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10load_disabled_if_in_multi_param6/result/rougail/00-base.yml
@@ -1,14 +1,12 @@
+version: 1.1
 general:
   condition:
-    type: string
     description: No change
     default: no
   condition2:
-    type: string
     description: No change
     default: yes
   test_variable:
-    type: string
     description: No change
     hidden: true
     default: no
@@ -16,4 +14,3 @@ general:
       type: jinja
       jinja: '{% if rougail.general.condition2 == "yes" or rougail.general.condition2
         == "maybe" %}disabled{% endif %}'
-version: '1.1'
diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param6/result/services/00-base.yml b/tests/dictionaries_old/10load_disabled_if_in_multi_param6/result/services/00-base.yml
deleted file mode 100644
index 84fe53e0f..000000000
--- a/tests/dictionaries_old/10load_disabled_if_in_multi_param6/result/services/00-base.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-test.service:
-  files:
-    /tmp/file1:
-      disabled:
-        type: jinja
-        jinja: '{% if rougail.general.condition == "yes" or rougail.general.condition
-          == "maybe" %}{% else %}disabled{% endif %}'
-version: '1.1'
diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param_disabled/result/rougail/00-base.yml b/tests/dictionaries_old/10load_disabled_if_in_multi_param_disabled/result/rougail/00-base.yml
index 647816463..a60a55a5b 100644
--- a/tests/dictionaries_old/10load_disabled_if_in_multi_param_disabled/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10load_disabled_if_in_multi_param_disabled/result/rougail/00-base.yml
@@ -1,10 +1,9 @@
+version: 1.1
 general:
   condition:
-    type: string
     description: No change
     default: oui
   mode_conteneur_actif:
-    type: string
     description: No change
     hidden: true
     default: non
@@ -13,9 +12,7 @@ general:
       jinja: '{% if rougail.general.condition == "oui" or rougail.general.condition
         == "maybe" %}disabled{% endif %}'
   mode_conteneur_actif2:
-    type: string
     description: No change
     hidden: true
     default: non
     disabled: *id001
-version: '1.1'
diff --git a/tests/dictionaries_old/10load_disabled_if_in_multi_param_disabled/result/services/00-base.yml b/tests/dictionaries_old/10load_disabled_if_in_multi_param_disabled/result/services/00-base.yml
deleted file mode 100644
index 9e1cc6446..000000000
--- a/tests/dictionaries_old/10load_disabled_if_in_multi_param_disabled/result/services/00-base.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-test.service:
-  files:
-    /tmp/file1:
-      disabled:
-        type: jinja
-        jinja: '{% if rougail.general.condition == "oui" or rougail.general.condition
-          == "maybe" %}disabled{% endif %}'
-version: '1.1'
diff --git a/tests/dictionaries_old/10load_disabled_if_in_none/result/rougail/00-base.yml b/tests/dictionaries_old/10load_disabled_if_in_none/result/rougail/00-base.yml
index 731274e3c..76164974e 100644
--- a/tests/dictionaries_old/10load_disabled_if_in_none/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10load_disabled_if_in_none/result/rougail/00-base.yml
@@ -1,10 +1,9 @@
+version: 1.1
 general:
   condition:
-    type: string
     description: No change
     default: non
   mode_conteneur_actif:
-    type: string
     description: No change
     hidden: true
     default: non
@@ -12,9 +11,7 @@ general:
       type: jinja
       jinja: '{% if rougail.general.condition == null %}disabled{% endif %}'
   mode_conteneur_actif2:
-    type: string
     description: No change
     hidden: true
     default: non
     disabled: *id001
-version: '1.1'
diff --git a/tests/dictionaries_old/10load_disabled_if_in_twice/result/rougail/00-base.yml b/tests/dictionaries_old/10load_disabled_if_in_twice/result/rougail/00-base.yml
index 324d0e8bf..3bb2906c1 100644
--- a/tests/dictionaries_old/10load_disabled_if_in_twice/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10load_disabled_if_in_twice/result/rougail/00-base.yml
@@ -1,3 +1,4 @@
+version: 1.1
 my_var1:
   default: no
 my_var2:
@@ -10,4 +11,3 @@ my_var3:
   disabled:
     type: jinja
     jinja: '{% if rougail.my_var2 == "no" %}disabled{% endif %}'
-version: '1.1'
diff --git a/tests/dictionaries_old/10load_disabled_if_in_variable/result/rougail/00-base.yml b/tests/dictionaries_old/10load_disabled_if_in_variable/result/rougail/00-base.yml
index 29c924a41..1496d4d2e 100644
--- a/tests/dictionaries_old/10load_disabled_if_in_variable/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10load_disabled_if_in_variable/result/rougail/00-base.yml
@@ -1,3 +1,4 @@
+version: 1.1
 general:
   condition:
     type: choice
@@ -8,15 +9,12 @@ general:
     - authentifié
     - aucun
   mode_conteneur_actif:
-    type: string
     description: No change
     default: tous
   mode_conteneur_actif2:
-    type: string
     description: No change
     default: non
     disabled:
       type: jinja
       jinja: '{% if rougail.general.condition == rougail.general.mode_conteneur_actif
         %}disabled{% endif %}'
-version: '1.1'
diff --git a/tests/dictionaries_old/10load_disabled_if_in_variable2/result/rougail/00-base.yml b/tests/dictionaries_old/10load_disabled_if_in_variable2/result/rougail/00-base.yml
index 212af8550..c803f9ee1 100644
--- a/tests/dictionaries_old/10load_disabled_if_in_variable2/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10load_disabled_if_in_variable2/result/rougail/00-base.yml
@@ -1,3 +1,4 @@
+version: 1.1
 general:
   condition:
     type: choice
@@ -8,15 +9,12 @@ general:
     - authentifié
     - aucun
   mode_conteneur_actif:
-    type: string
     description: No change
     default: aucun
   mode_conteneur_actif2:
-    type: string
     description: No change
     default: non
     disabled:
       type: jinja
       jinja: '{% if rougail.general.condition == rougail.general.mode_conteneur_actif
         %}disabled{% endif %}'
-version: '1.1'
diff --git a/tests/dictionaries_old/10load_disabled_if_not_in_fallback/result/rougail/00-base.yml b/tests/dictionaries_old/10load_disabled_if_not_in_fallback/result/rougail/00-base.yml
index 7155f28fb..af17989d8 100644
--- a/tests/dictionaries_old/10load_disabled_if_not_in_fallback/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10load_disabled_if_not_in_fallback/result/rougail/00-base.yml
@@ -1,13 +1,11 @@
+version: 1.1
 general:
   condition:
-    type: string
     description: No change
     default: no
   disable_variable:
-    type: string
     description: No change
     default: no
     disabled:
       type: jinja
-      jinja: '{% if __unknown == "no" %}{% else %}disabled{% endif %}'
-version: '1.1'
+      jinja: '{% if unknown == "no" %}{% else %}disabled{% endif %}'
diff --git a/tests/dictionaries_old/10load_disabled_if_not_in_fallback/result/services/00-base.yml b/tests/dictionaries_old/10load_disabled_if_not_in_fallback/result/services/00-base.yml
deleted file mode 100644
index 4801ddf43..000000000
--- a/tests/dictionaries_old/10load_disabled_if_not_in_fallback/result/services/00-base.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-test.service:
-  files:
-    /tmp/file1:
-      disabled:
-        type: jinja
-        jinja: '{% if __unknown == "no" %}{% else %}disabled{% endif %}'
-version: '1.1'
diff --git a/tests/dictionaries_old/10load_disabled_if_not_in_fallback_force/result/rougail/00-base.yml b/tests/dictionaries_old/10load_disabled_if_not_in_fallback_force/result/rougail/00-base.yml
index 8745285ec..336c9ab21 100644
--- a/tests/dictionaries_old/10load_disabled_if_not_in_fallback_force/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10load_disabled_if_not_in_fallback_force/result/rougail/00-base.yml
@@ -1,18 +1,15 @@
+version: 1.1
 general:
   condition:
-    type: string
     description: No change
     default: non
   mode_conteneur_actif:
-    type: string
     description: No change
     default: non
     disabled:
       type: jinja
-      jinja: '{% if __activer_client_ldap == "non" %}{% else %}disabled{% endif %}'
+      jinja: '{% if activer_client_ldap == "non" %}{% else %}disabled{% endif %}'
   mode_conteneur_actif2:
-    type: string
     description: No change
     default: non
     disabled: true
-version: '1.1'
diff --git a/tests/dictionaries_old/10load_disabledifin_fallback/result/rougail/00-base.yml b/tests/dictionaries_old/10load_disabledifin_fallback/result/rougail/00-base.yml
index 7b63111b3..8808d900e 100644
--- a/tests/dictionaries_old/10load_disabledifin_fallback/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10load_disabledifin_fallback/result/rougail/00-base.yml
@@ -1,20 +1,17 @@
+version: 1.1
 general:
   condition:
-    type: string
     description: No change
     default: non
   mode_conteneur_actif:
-    type: string
     description: No change
     default: non
     disabled:
       type: jinja
-      jinja: '{% if __activer_client_ldap == "non" %}disabled{% endif %}'
+      jinja: '{% if activer_client_ldap == "non" %}disabled{% endif %}'
   mode_conteneur_actif2:
-    type: string
     description: No change
     default: non
     disabled:
       type: jinja
       jinja: '{% if rougail.general.condition == "oui" %}disabled{% endif %}'
-version: '1.1'
diff --git a/tests/dictionaries_old/10load_disabledifin_fallback_force/result/rougail/00-base.yml b/tests/dictionaries_old/10load_disabledifin_fallback_force/result/rougail/00-base.yml
index 7b63111b3..8808d900e 100644
--- a/tests/dictionaries_old/10load_disabledifin_fallback_force/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10load_disabledifin_fallback_force/result/rougail/00-base.yml
@@ -1,20 +1,17 @@
+version: 1.1
 general:
   condition:
-    type: string
     description: No change
     default: non
   mode_conteneur_actif:
-    type: string
     description: No change
     default: non
     disabled:
       type: jinja
-      jinja: '{% if __activer_client_ldap == "non" %}disabled{% endif %}'
+      jinja: '{% if activer_client_ldap == "non" %}disabled{% endif %}'
   mode_conteneur_actif2:
-    type: string
     description: No change
     default: non
     disabled:
       type: jinja
       jinja: '{% if rougail.general.condition == "oui" %}disabled{% endif %}'
-version: '1.1'
diff --git a/tests/dictionaries_old/10load_disabledifin_whithouttype/result/rougail/00-base.yml b/tests/dictionaries_old/10load_disabledifin_whithouttype/result/rougail/00-base.yml
index 892a333df..6eaec6e64 100644
--- a/tests/dictionaries_old/10load_disabledifin_whithouttype/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10load_disabledifin_whithouttype/result/rougail/00-base.yml
@@ -1,18 +1,15 @@
+version: 1.1
 general:
   condition:
-    type: string
     description: No change
     default: non
   mode_conteneur_actif:
-    type: string
     description: No change
     default: non
     disabled: &id001
       type: jinja
       jinja: '{% if rougail.general.condition == "oui" %}disabled{% endif %}'
   mode_conteneur_actif2:
-    type: string
     description: No change
     default: non
     disabled: *id001
-version: '1.1'
diff --git a/tests/dictionaries_old/10load_frozenifin/result/rougail/00-base.yml b/tests/dictionaries_old/10load_frozenifin/result/rougail/00-base.yml
index 6ecdf3637..07f26a602 100644
--- a/tests/dictionaries_old/10load_frozenifin/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10load_frozenifin/result/rougail/00-base.yml
@@ -1,18 +1,15 @@
+version: 1.1
 general:
   condition:
-    type: string
     description: No change
     default: non
   mode_conteneur_actif:
-    type: string
     description: No change
     default: non
     hidden: &id001
       type: jinja
       jinja: '{% if rougail.general.condition == "oui" %}hidden{% endif %}'
   mode_conteneur_actif2:
-    type: string
     description: No change
     default: non
     hidden: *id001
-version: '1.1'
diff --git a/tests/dictionaries_old/10load_frozenifin_auto/result/rougail/00-base.yml b/tests/dictionaries_old/10load_frozenifin_auto/result/rougail/00-base.yml
index efdd9fd4b..1448dd66a 100644
--- a/tests/dictionaries_old/10load_frozenifin_auto/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10load_frozenifin_auto/result/rougail/00-base.yml
@@ -1,6 +1,6 @@
+version: 1.1
 general:
   condition:
-    type: string
     description: No change
     default: non
   mode_conteneur_actif:
@@ -13,8 +13,6 @@ general:
       type: jinja
       jinja: '{% if rougail.general.condition == "oui" %}hidden{% endif %}'
   mode_conteneur_actif2:
-    type: string
     description: No change
     default: non
     hidden: *id001
-version: '1.1'
diff --git a/tests/dictionaries_old/10load_frozenifin_multiparam/result/rougail/00-base.yml b/tests/dictionaries_old/10load_frozenifin_multiparam/result/rougail/00-base.yml
index 7f656e1ed..f02e2f612 100644
--- a/tests/dictionaries_old/10load_frozenifin_multiparam/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10load_frozenifin_multiparam/result/rougail/00-base.yml
@@ -1,3 +1,4 @@
+version: 1.1
 general:
   condition:
     type: choice
@@ -8,7 +9,6 @@ general:
     - authentifié
     - aucun
   mode_conteneur_actif:
-    type: string
     description: No change
     default: non
     hidden: &id001
@@ -16,8 +16,6 @@ general:
       jinja: '{% if rougail.general.condition == "tous" or rougail.general.condition
         == "authentifié" %}hidden{% endif %}'
   mode_conteneur_actif2:
-    type: string
     description: No change
     default: non
     hidden: *id001
-version: '1.1'
diff --git a/tests/dictionaries_old/10load_frozenifin_noexist/result/rougail/00-base.yml b/tests/dictionaries_old/10load_frozenifin_noexist/result/rougail/00-base.yml
index 2e105db05..a2fa9726b 100644
--- a/tests/dictionaries_old/10load_frozenifin_noexist/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10load_frozenifin_noexist/result/rougail/00-base.yml
@@ -1,3 +1,4 @@
+version: 1.1
 general:
   condition:
     type: choice
@@ -8,7 +9,6 @@ general:
     - authentifié
     - aucun
   mode_conteneur_actif:
-    type: string
     description: No change
     hidden: &id001
       type: jinja
@@ -16,8 +16,6 @@ general:
         == "non" %}hidden{% endif %}'
     default: non
   mode_conteneur_actif2:
-    type: string
     description: No change
     hidden: *id001
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/10load_frozenifin_variable/result/rougail/00-base.yml b/tests/dictionaries_old/10load_frozenifin_variable/result/rougail/00-base.yml
index 2ebcd513c..79ab2a7f5 100644
--- a/tests/dictionaries_old/10load_frozenifin_variable/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10load_frozenifin_variable/result/rougail/00-base.yml
@@ -1,3 +1,4 @@
+version: 1.1
 general:
   condition:
     type: choice
@@ -8,15 +9,12 @@ general:
     - authentifié
     - aucun
   mode_conteneur_actif:
-    type: string
     description: No change
     default: tous
   mode_conteneur_actif2:
-    type: string
     description: No change
     default: non
     hidden:
       type: jinja
       jinja: '{% if rougail.general.condition == rougail.general.mode_conteneur_actif
         %}hidden{% endif %}'
-version: '1.1'
diff --git a/tests/dictionaries_old/10load_frozenifnotin/result/rougail/00-base.yml b/tests/dictionaries_old/10load_frozenifnotin/result/rougail/00-base.yml
index 6f341e1a6..00f9bcbb1 100644
--- a/tests/dictionaries_old/10load_frozenifnotin/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10load_frozenifnotin/result/rougail/00-base.yml
@@ -1,10 +1,9 @@
+version: 1.1
 general:
   condition:
-    type: string
     description: No change
     default: non
   mode_conteneur_actif:
-    type: string
     description: No change
     default: non
     hidden: &id001
@@ -12,8 +11,6 @@ general:
       jinja: '{% if rougail.general.condition == "oui" %}{% else %}hidden{% endif
         %}'
   mode_conteneur_actif2:
-    type: string
     description: No change
     default: non
     hidden: *id001
-version: '1.1'
diff --git a/tests/dictionaries_old/10load_frozenifnotin_noexist/result/rougail/00-base.yml b/tests/dictionaries_old/10load_frozenifnotin_noexist/result/rougail/00-base.yml
index c487d29a2..13b4db5c0 100644
--- a/tests/dictionaries_old/10load_frozenifnotin_noexist/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10load_frozenifnotin_noexist/result/rougail/00-base.yml
@@ -1,3 +1,4 @@
+version: 1.1
 general:
   condition:
     type: choice
@@ -8,7 +9,6 @@ general:
     - authentifié
     - aucun
   mode_conteneur_actif:
-    type: string
     description: No change
     default: non
     hidden: &id001
@@ -16,8 +16,6 @@ general:
       jinja: '{% if rougail.general.condition == "oui" or rougail.general.condition
         == "non" %}{% else %}hidden{% endif %}'
   mode_conteneur_actif2:
-    type: string
     description: No change
     default: non
     hidden: *id001
-version: '1.1'
diff --git a/tests/dictionaries_old/10load_hidden_if_empty_family/result/rougail/00-base.yml b/tests/dictionaries_old/10load_hidden_if_empty_family/result/rougail/00-base.yml
index 9caeded82..e33db4609 100644
--- a/tests/dictionaries_old/10load_hidden_if_empty_family/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10load_hidden_if_empty_family/result/rougail/00-base.yml
@@ -1,22 +1,19 @@
+version: 1.1
 general:
   description: Général
   condition:
-    type: string
     description: No change
     default: non
   mode_conteneur_actif:
-    type: string
     description: No change
     default: non
     hidden: &id001
       type: jinja
       jinja: '{% if rougail.general.condition == "oui" %}hidden{% endif %}'
   mode_conteneur_actif2:
-    type: string
     description: No change
     default: non
     hidden: *id001
 general2:
   description: Général2
   hidden: *id001
-version: '1.1'
diff --git a/tests/dictionaries_old/10load_hidden_if_family/result/rougail/00-base.yml b/tests/dictionaries_old/10load_hidden_if_family/result/rougail/00-base.yml
index 3de9a6595..a9a3176be 100644
--- a/tests/dictionaries_old/10load_hidden_if_family/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10load_hidden_if_family/result/rougail/00-base.yml
@@ -1,27 +1,23 @@
+version: 1.1
 general:
   description: Général
   condition:
-    type: string
     description: No change
     default: non
   mode_conteneur_actif:
-    type: string
     description: No change
     default: non
     hidden: &id001
       type: jinja
       jinja: '{% if rougail.general.condition == "oui" %}hidden{% endif %}'
   mode_conteneur_actif2:
-    type: string
     description: No change
     default: non
     hidden: *id001
 general2:
   description: Général2
   mode_conteneur_actif3:
-    type: string
     description: No change
     hidden: true
     default: non
   hidden: *id001
-version: '1.1'
diff --git a/tests/dictionaries_old/10load_leadership/result/rougail/00-base.yml b/tests/dictionaries_old/10load_leadership/result/rougail/00-base.yml
index cd1d19335..b1ccc74b9 100644
--- a/tests/dictionaries_old/10load_leadership/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10load_leadership/result/rougail/00-base.yml
@@ -1,6 +1,6 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: No change
     default: non
 general1:
@@ -15,15 +15,12 @@ general1:
     follower1:
       type: string
       description: follower1
-      mandatory: false
       default:
         type: jinja
         jinja: '{{ "valfill" | calc_val }}'
     follower2:
       type: string
       description: follower2
-      mandatory: false
       default:
         type: jinja
         jinja: '{{ rougail.general1.leader.follower1 | calc_val }}'
-version: '1.1'
diff --git a/tests/dictionaries_old/10load_leadership_default_multi/result/rougail/00-base.yml b/tests/dictionaries_old/10load_leadership_default_multi/result/rougail/00-base.yml
index 66fcca4dc..0a470b9e2 100644
--- a/tests/dictionaries_old/10load_leadership_default_multi/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10load_leadership_default_multi/result/rougail/00-base.yml
@@ -1,8 +1,7 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: leader
-    multi: true
     default:
     - non
   leader:
@@ -14,11 +13,9 @@ general:
       multi: true
       mandatory: false
     follower1:
-      type: string
       description: follower1
       default: value
     follower2:
       type: string
       description: follower2
       mandatory: false
-version: '1.1'
diff --git a/tests/dictionaries_old/10load_leadership_default_submulti/result/rougail/00-base.yml b/tests/dictionaries_old/10load_leadership_default_submulti/result/rougail/00-base.yml
index 1b9225826..085ddb2d2 100644
--- a/tests/dictionaries_old/10load_leadership_default_submulti/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10load_leadership_default_submulti/result/rougail/00-base.yml
@@ -1,30 +1,22 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: leader
-    multi: true
     default:
     - non
   leader:
     description: leader
     type: leadership
     leader:
-      type: string
       description: leader
-      multi: true
       default:
       - leader
     follower1:
-      type: string
       description: follower1
-      multi: true
       default:
       - value
     follower2:
-      type: string
       description: follower2
-      multi: true
       default:
       - value1
       - value2
-version: '1.1'
diff --git a/tests/dictionaries_old/10load_leadership_defaultmulti_leader/result/rougail/00-base.yml b/tests/dictionaries_old/10load_leadership_defaultmulti_leader/result/rougail/00-base.yml
index b89f984b1..cb7536054 100644
--- a/tests/dictionaries_old/10load_leadership_defaultmulti_leader/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10load_leadership_defaultmulti_leader/result/rougail/00-base.yml
@@ -1,17 +1,14 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: leader
-    multi: true
     default:
     - non
   leader:
     description: leader
     type: leadership
     leader:
-      type: string
       description: leader
-      multi: true
       default:
       - value
     follower1:
@@ -22,4 +19,3 @@ general:
       type: string
       description: follower2
       mandatory: false
-version: '1.1'
diff --git a/tests/dictionaries_old/10load_leadership_description/result/rougail/00-base.yml b/tests/dictionaries_old/10load_leadership_description/result/rougail/00-base.yml
index 80cc4e357..f16bdbb75 100644
--- a/tests/dictionaries_old/10load_leadership_description/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10load_leadership_description/result/rougail/00-base.yml
@@ -1,6 +1,6 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: No change
     default: non
 general1:
@@ -15,15 +15,12 @@ general1:
     follower1:
       type: string
       description: follower1
-      mandatory: false
       default:
         type: jinja
         jinja: '{{ "valfill" | calc_val }}'
     follower2:
       type: string
       description: follower2
-      mandatory: false
       default:
         type: jinja
         jinja: '{{ rougail.general1.leader.follower1 | calc_val }}'
-version: '1.1'
diff --git a/tests/dictionaries_old/10load_leadership_name/result/rougail/00-base.yml b/tests/dictionaries_old/10load_leadership_name/result/rougail/00-base.yml
index 24f1a3a88..88c2d1beb 100644
--- a/tests/dictionaries_old/10load_leadership_name/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10load_leadership_name/result/rougail/00-base.yml
@@ -1,6 +1,6 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: No change
     default: non
 general1:
@@ -15,15 +15,12 @@ general1:
     follower1:
       type: string
       description: follower1
-      mandatory: false
       default:
         type: jinja
         jinja: '{{ "valfill" | calc_val }}'
     follower2:
       type: string
       description: follower2
-      mandatory: false
       default:
         type: jinja
         jinja: '{{ rougail.general1.other_name.follower1 | calc_val }}'
-version: '1.1'
diff --git a/tests/dictionaries_old/10load_leadership_submulti/result/rougail/00-base.yml b/tests/dictionaries_old/10load_leadership_submulti/result/rougail/00-base.yml
index ca9b69116..fec76e9d7 100644
--- a/tests/dictionaries_old/10load_leadership_submulti/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10load_leadership_submulti/result/rougail/00-base.yml
@@ -1,6 +1,6 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: No change
     default: non
 general1:
@@ -15,7 +15,6 @@ general1:
     follower1:
       type: string
       description: follower1
-      mandatory: false
       default:
         type: jinja
         jinja: '{{ "valfill" | calc_val }}'
@@ -23,8 +22,7 @@ general1:
       type: string
       description: follower2
       multi: true
-      mandatory: false
       default:
         type: jinja
-        jinja: '{{ rougail.general1.leader.follower1 | calc_val }}'
-version: '1.1'
+        jinja: "{% for __variable in rougail.general1.leader.follower1 | calc_val
+          %}\n{{ __variable }}\n{% endfor %}"
diff --git a/tests/dictionaries_old/10load_mandatoryifin/result/rougail/00-base.yml b/tests/dictionaries_old/10load_mandatoryifin/result/rougail/00-base.yml
index 7bb67b25d..84e22b7d4 100644
--- a/tests/dictionaries_old/10load_mandatoryifin/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10load_mandatoryifin/result/rougail/00-base.yml
@@ -1,18 +1,15 @@
+version: 1.1
 general:
   condition:
-    type: string
     description: No change
     default: non
   mode_conteneur_actif:
-    type: string
     description: No change
     default: non
     mandatory: &id001
       type: jinja
       jinja: '{% if rougail.general.condition == "oui" %}mandatory{% endif %}'
   mode_conteneur_actif2:
-    type: string
     description: No change
     default: non
     mandatory: *id001
-version: '1.1'
diff --git a/tests/dictionaries_old/10load_mandatoryifnotin_noexist/result/rougail/00-base.yml b/tests/dictionaries_old/10load_mandatoryifnotin_noexist/result/rougail/00-base.yml
index 7b50e948b..46489a19b 100644
--- a/tests/dictionaries_old/10load_mandatoryifnotin_noexist/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10load_mandatoryifnotin_noexist/result/rougail/00-base.yml
@@ -1,3 +1,4 @@
+version: 1.1
 general:
   condition:
     type: choice
@@ -8,7 +9,6 @@ general:
     - authentifié
     - aucun
   mode_conteneur_actif:
-    type: string
     description: No change
     hidden: true
     default: non
@@ -17,9 +17,7 @@ general:
       jinja: '{% if rougail.general.condition == "oui" or rougail.general.condition
         == "non" %}{% else %}mandatory{% endif %}'
   mode_conteneur_actif2:
-    type: string
     description: No change
     hidden: true
     default: non
     mandatory: *id001
-version: '1.1'
diff --git a/tests/dictionaries_old/10load_multivalue/result/rougail/00-base.yml b/tests/dictionaries_old/10load_multivalue/result/rougail/00-base.yml
index caf2ccf23..74e46fad9 100644
--- a/tests/dictionaries_old/10load_multivalue/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10load_multivalue/result/rougail/00-base.yml
@@ -1,10 +1,8 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: No change
     hidden: true
-    multi: true
     default:
     - non
     - oui
-version: '1.1'
diff --git a/tests/dictionaries_old/10valid_enum_accent/result/rougail/00-base.yml b/tests/dictionaries_old/10valid_enum_accent/result/rougail/00-base.yml
index 6af4d94bd..4aca8e62a 100644
--- a/tests/dictionaries_old/10valid_enum_accent/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10valid_enum_accent/result/rougail/00-base.yml
@@ -1,7 +1,7 @@
+version: 1.1
 general:
   mode: advanced
   mode_conteneur_actif:
-    type: string
     description: No change
     default: non
 enumfam:
@@ -16,4 +16,3 @@ enumfam:
     - b
     - c
     - é
-version: '1.1'
diff --git a/tests/dictionaries_old/10valid_enum_append/result/rougail/00-base.yml b/tests/dictionaries_old/10valid_enum_append/result/rougail/00-base.yml
index 392dcd930..bf71badf8 100644
--- a/tests/dictionaries_old/10valid_enum_append/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10valid_enum_append/result/rougail/00-base.yml
@@ -1,7 +1,7 @@
+version: 1.1
 general:
   mode: advanced
   mode_conteneur_actif:
-    type: string
     description: No change
     default: non
 enumfam:
@@ -14,4 +14,3 @@ enumfam:
     choices:
     - a
     - b
-version: '1.1'
diff --git a/tests/dictionaries_old/10valid_enum_append/result/rougail/01-base.yml b/tests/dictionaries_old/10valid_enum_append/result/rougail/01-base.yml
index f08dd017e..002d3fbf9 100644
--- a/tests/dictionaries_old/10valid_enum_append/result/rougail/01-base.yml
+++ b/tests/dictionaries_old/10valid_enum_append/result/rougail/01-base.yml
@@ -1,7 +1,7 @@
+version: 1.1
 enumfam:
   enumvar:
     redefine: true
     default: c
     choices:
     - c
-version: '1.1'
diff --git a/tests/dictionaries_old/10valid_enum_base/result/rougail/00-base.yml b/tests/dictionaries_old/10valid_enum_base/result/rougail/00-base.yml
index 5c5fb35cd..47fd9af47 100644
--- a/tests/dictionaries_old/10valid_enum_base/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10valid_enum_base/result/rougail/00-base.yml
@@ -1,7 +1,7 @@
+version: 1.1
 general:
   mode: advanced
   mode_conteneur_actif:
-    type: string
     description: No change
     default: non
 enumfam:
@@ -15,4 +15,3 @@ enumfam:
     - a
     - b
     - c
-version: '1.1'
diff --git a/tests/dictionaries_old/10valid_enum_base_no_mandatory/result/rougail/00-base.yml b/tests/dictionaries_old/10valid_enum_base_no_mandatory/result/rougail/00-base.yml
index a33a4027d..2c0144332 100644
--- a/tests/dictionaries_old/10valid_enum_base_no_mandatory/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10valid_enum_base_no_mandatory/result/rougail/00-base.yml
@@ -1,7 +1,7 @@
+version: 1.1
 general:
   mode: advanced
   mode_conteneur_actif:
-    type: string
     description: No change
     default: non
 enumfam:
@@ -14,4 +14,3 @@ enumfam:
     - a
     - b
     - c
-version: '1.1'
diff --git a/tests/dictionaries_old/10valid_enum_base_redefine/result/rougail/00-base.yml b/tests/dictionaries_old/10valid_enum_base_redefine/result/rougail/00-base.yml
index a28eb31b9..e0c719899 100644
--- a/tests/dictionaries_old/10valid_enum_base_redefine/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10valid_enum_base_redefine/result/rougail/00-base.yml
@@ -1,7 +1,7 @@
+version: 1.1
 general:
   mode: advanced
   mode_conteneur_actif:
-    type: string
     description: No change
     default: non
 enumfam:
@@ -23,4 +23,3 @@ enumfam:
     - a
     - b
     - c
-version: '1.1'
diff --git a/tests/dictionaries_old/10valid_enum_base_redefine/result/rougail/01-base.yml b/tests/dictionaries_old/10valid_enum_base_redefine/result/rougail/01-base.yml
index 7d97f75d4..6d43346ae 100644
--- a/tests/dictionaries_old/10valid_enum_base_redefine/result/rougail/01-base.yml
+++ b/tests/dictionaries_old/10valid_enum_base_redefine/result/rougail/01-base.yml
@@ -1,3 +1,4 @@
+version: 1.1
 enumfam:
   enumvar:
     redefine: true
@@ -6,4 +7,3 @@ enumfam:
     choices:
     - a
     - c
-version: '1.1'
diff --git a/tests/dictionaries_old/10valid_enum_leader/result/rougail/00-base.yml b/tests/dictionaries_old/10valid_enum_leader/result/rougail/00-base.yml
index 074b10951..447d41197 100644
--- a/tests/dictionaries_old/10valid_enum_leader/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10valid_enum_leader/result/rougail/00-base.yml
@@ -1,6 +1,6 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: No change
     default: non
   leader:
@@ -23,4 +23,3 @@ general:
       type: string
       description: follower2
       mandatory: false
-version: '1.1'
diff --git a/tests/dictionaries_old/10valid_enum_mandatory/result/rougail/00-base.yml b/tests/dictionaries_old/10valid_enum_mandatory/result/rougail/00-base.yml
index df8abe0db..9dfb32478 100644
--- a/tests/dictionaries_old/10valid_enum_mandatory/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10valid_enum_mandatory/result/rougail/00-base.yml
@@ -1,7 +1,7 @@
+version: 1.1
 general:
   mode: advanced
   mode_conteneur_actif:
-    type: string
     description: No change
     default: non
 enumfam:
@@ -9,10 +9,8 @@ enumfam:
   enumvar:
     type: choice
     description: multi
-    mandatory: true
     default: a
     choices:
     - a
     - b
     - c
-version: '1.1'
diff --git a/tests/dictionaries_old/10valid_enum_multi/result/rougail/00-base.yml b/tests/dictionaries_old/10valid_enum_multi/result/rougail/00-base.yml
index 836e9fe7c..491a94b4e 100644
--- a/tests/dictionaries_old/10valid_enum_multi/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10valid_enum_multi/result/rougail/00-base.yml
@@ -1,16 +1,14 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: No change
     default: non
   multi:
     type: choice
     description: multi
-    multi: true
     default:
     - a
     choices:
     - a
     - b
     - c
-version: '1.1'
diff --git a/tests/dictionaries_old/10valid_enum_none/result/rougail/00-base.yml b/tests/dictionaries_old/10valid_enum_none/result/rougail/00-base.yml
index 998c5274e..27a286e79 100644
--- a/tests/dictionaries_old/10valid_enum_none/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10valid_enum_none/result/rougail/00-base.yml
@@ -1,7 +1,7 @@
+version: 1.1
 general:
   mode: advanced
   mode_conteneur_actif:
-    type: string
     description: No change
     default: non
 enumfam:
@@ -16,4 +16,3 @@ enumfam:
     - a
     - b
     - 
-version: '1.1'
diff --git a/tests/dictionaries_old/10valid_enum_number/result/rougail/00-base.yml b/tests/dictionaries_old/10valid_enum_number/result/rougail/00-base.yml
index 2a7864be6..f3909936a 100644
--- a/tests/dictionaries_old/10valid_enum_number/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10valid_enum_number/result/rougail/00-base.yml
@@ -1,7 +1,7 @@
+version: 1.1
 general:
   mode: advanced
   mode_conteneur_actif:
-    type: string
     description: No change
     default: non
 enumfam:
@@ -15,4 +15,3 @@ enumfam:
     - 1
     - 2
     - 3
-version: '1.1'
diff --git a/tests/dictionaries_old/10valid_enum_numberdefault/result/rougail/00-base.yml b/tests/dictionaries_old/10valid_enum_numberdefault/result/rougail/00-base.yml
index 3148c4093..56d655e66 100644
--- a/tests/dictionaries_old/10valid_enum_numberdefault/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10valid_enum_numberdefault/result/rougail/00-base.yml
@@ -1,7 +1,7 @@
+version: 1.1
 general:
   mode: advanced
   mode_conteneur_actif:
-    type: string
     description: No change
     default: non
 enumfam:
@@ -15,4 +15,3 @@ enumfam:
     - 1
     - 2
     - 3
-version: '1.1'
diff --git a/tests/dictionaries_old/10valid_enum_param_empty/result/rougail/00-base.yml b/tests/dictionaries_old/10valid_enum_param_empty/result/rougail/00-base.yml
index b5ce91769..656c1b726 100644
--- a/tests/dictionaries_old/10valid_enum_param_empty/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10valid_enum_param_empty/result/rougail/00-base.yml
@@ -1,3 +1,4 @@
+version: 1.1
 enumfam:
   mode: advanced
   enumvar:
@@ -7,4 +8,3 @@ enumfam:
     default:
     choices:
     - 
-version: '1.1'
diff --git a/tests/dictionaries_old/10valid_enum_param_empty2/result/rougail/00-base.yml b/tests/dictionaries_old/10valid_enum_param_empty2/result/rougail/00-base.yml
index 36f1b7e71..a15412ff5 100644
--- a/tests/dictionaries_old/10valid_enum_param_empty2/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10valid_enum_param_empty2/result/rougail/00-base.yml
@@ -1,7 +1,7 @@
+version: 1.1
 general:
   mode: advanced
   mode_conteneur_actif:
-    type: string
     description: No change
     default: non
 enumfam:
@@ -13,4 +13,3 @@ enumfam:
     default:
     choices:
     - 
-version: '1.1'
diff --git a/tests/dictionaries_old/10valid_enum_quote/result/rougail/00-base.yml b/tests/dictionaries_old/10valid_enum_quote/result/rougail/00-base.yml
index aa000e50d..813981f66 100644
--- a/tests/dictionaries_old/10valid_enum_quote/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10valid_enum_quote/result/rougail/00-base.yml
@@ -1,7 +1,7 @@
+version: 1.1
 general:
   mode: advanced
   mode_conteneur_actif:
-    type: string
     description: No change
     default: non
 enumfam:
@@ -15,4 +15,3 @@ enumfam:
     - quote'
     - quote"
     - quote"'
-version: '1.1'
diff --git a/tests/dictionaries_old/10valid_enum_value/result/rougail/00-base.yml b/tests/dictionaries_old/10valid_enum_value/result/rougail/00-base.yml
index cb50bac36..4cd4b371d 100644
--- a/tests/dictionaries_old/10valid_enum_value/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/10valid_enum_value/result/rougail/00-base.yml
@@ -1,3 +1,4 @@
+version: 1.1
 general:
   mode_conteneur_actif:
     type: choice
@@ -7,4 +8,3 @@ general:
     - a
     - b
     - c
-version: '1.1'
diff --git a/tests/dictionaries_old/11disabled_if_in_filelist/result/rougail/00-base.yml b/tests/dictionaries_old/11disabled_if_in_filelist/result/rougail/00-base.yml
index 584dabddc..5bde6e176 100644
--- a/tests/dictionaries_old/11disabled_if_in_filelist/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/11disabled_if_in_filelist/result/rougail/00-base.yml
@@ -1,10 +1,9 @@
+version: 1.1
 general:
   condition:
-    type: string
     description: No change
     default: non
   mode_conteneur_actif:
-    type: string
     description: No change
     default: non
     disabled: &id001
@@ -14,4 +13,3 @@ general:
     type: boolean
     description: No change
     disabled: *id001
-version: '1.1'
diff --git a/tests/dictionaries_old/11disabled_if_in_filelist/result/services/00-base.yml b/tests/dictionaries_old/11disabled_if_in_filelist/result/services/00-base.yml
deleted file mode 100644
index 0981730b1..000000000
--- a/tests/dictionaries_old/11disabled_if_in_filelist/result/services/00-base.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-test.service:
-  files:
-    /etc/file:
-      disabled:
-        type: jinja
-        jinja: '{% if rougail.general.condition == "oui" %}disabled{% endif %}'
-version: '1.1'
diff --git a/tests/dictionaries_old/11disabled_if_in_filelist_boolean/result/rougail/00-base.yml b/tests/dictionaries_old/11disabled_if_in_filelist_boolean/result/rougail/00-base.yml
index 03ff18ec8..e47ed1a63 100644
--- a/tests/dictionaries_old/11disabled_if_in_filelist_boolean/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/11disabled_if_in_filelist_boolean/result/rougail/00-base.yml
@@ -1,4 +1,4 @@
+version: 1.1
 general:
   condition:
     type: boolean
-version: '1.1'
diff --git a/tests/dictionaries_old/11disabled_if_in_filelist_boolean/result/services/00-base.yml b/tests/dictionaries_old/11disabled_if_in_filelist_boolean/result/services/00-base.yml
deleted file mode 100644
index 593a50256..000000000
--- a/tests/dictionaries_old/11disabled_if_in_filelist_boolean/result/services/00-base.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-test.service:
-  files:
-    /tmp/file1:
-      disabled:
-        type: jinja
-        jinja: '{% if rougail.general.condition == true %}disabled{% endif %}'
-version: '1.1'
diff --git a/tests/dictionaries_old/11disabled_if_in_filelist_boolean2/result/rougail/00-base.yml b/tests/dictionaries_old/11disabled_if_in_filelist_boolean2/result/rougail/00-base.yml
index ee584da37..ad2c13d6f 100644
--- a/tests/dictionaries_old/11disabled_if_in_filelist_boolean2/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/11disabled_if_in_filelist_boolean2/result/rougail/00-base.yml
@@ -1,5 +1,4 @@
+version: 1.1
 general:
   condition:
-    type: boolean
     default: false
-version: '1.1'
diff --git a/tests/dictionaries_old/11disabled_if_in_filelist_boolean2/result/services/00-base.yml b/tests/dictionaries_old/11disabled_if_in_filelist_boolean2/result/services/00-base.yml
deleted file mode 100644
index 593a50256..000000000
--- a/tests/dictionaries_old/11disabled_if_in_filelist_boolean2/result/services/00-base.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-test.service:
-  files:
-    /tmp/file1:
-      disabled:
-        type: jinja
-        jinja: '{% if rougail.general.condition == true %}disabled{% endif %}'
-version: '1.1'
diff --git a/tests/dictionaries_old/11disabled_if_in_filelist_disabled/result/rougail/00-base.yml b/tests/dictionaries_old/11disabled_if_in_filelist_disabled/result/rougail/00-base.yml
index 9f6ef14e9..798caf264 100644
--- a/tests/dictionaries_old/11disabled_if_in_filelist_disabled/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/11disabled_if_in_filelist_disabled/result/rougail/00-base.yml
@@ -1,18 +1,15 @@
+version: 1.1
 general:
   condition:
-    type: string
     description: No change
     default: oui
   mode_conteneur_actif:
-    type: string
     description: No change
     default: non
     disabled: &id001
       type: jinja
       jinja: '{% if rougail.general.condition == "oui" %}disabled{% endif %}'
   mode_conteneur_actif2:
-    type: string
     description: No change
     default: non
     disabled: *id001
-version: '1.1'
diff --git a/tests/dictionaries_old/11disabled_if_in_filelist_disabled/result/services/00-base.yml b/tests/dictionaries_old/11disabled_if_in_filelist_disabled/result/services/00-base.yml
deleted file mode 100644
index 0981730b1..000000000
--- a/tests/dictionaries_old/11disabled_if_in_filelist_disabled/result/services/00-base.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-test.service:
-  files:
-    /etc/file:
-      disabled:
-        type: jinja
-        jinja: '{% if rougail.general.condition == "oui" %}disabled{% endif %}'
-version: '1.1'
diff --git a/tests/dictionaries_old/11disabled_if_in_filelist_multi/result/rougail/00-base.yml b/tests/dictionaries_old/11disabled_if_in_filelist_multi/result/rougail/00-base.yml
index 892a333df..6eaec6e64 100644
--- a/tests/dictionaries_old/11disabled_if_in_filelist_multi/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/11disabled_if_in_filelist_multi/result/rougail/00-base.yml
@@ -1,18 +1,15 @@
+version: 1.1
 general:
   condition:
-    type: string
     description: No change
     default: non
   mode_conteneur_actif:
-    type: string
     description: No change
     default: non
     disabled: &id001
       type: jinja
       jinja: '{% if rougail.general.condition == "oui" %}disabled{% endif %}'
   mode_conteneur_actif2:
-    type: string
     description: No change
     default: non
     disabled: *id001
-version: '1.1'
diff --git a/tests/dictionaries_old/11disabled_if_in_filelist_multi/result/services/00-base.yml b/tests/dictionaries_old/11disabled_if_in_filelist_multi/result/services/00-base.yml
deleted file mode 100644
index c551ae202..000000000
--- a/tests/dictionaries_old/11disabled_if_in_filelist_multi/result/services/00-base.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-test.service:
-  files:
-    /tmp/file1:
-      disabled: &id001
-        type: jinja
-        jinja: '{% if rougail.general.condition == "oui" %}disabled{% endif %}'
-    /tmp/file2:
-      disabled: *id001
-version: '1.1'
diff --git a/tests/dictionaries_old/11disabled_if_in_filelist_same_name/result/rougail/00-base.yml b/tests/dictionaries_old/11disabled_if_in_filelist_same_name/result/rougail/00-base.yml
index 584dabddc..5bde6e176 100644
--- a/tests/dictionaries_old/11disabled_if_in_filelist_same_name/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/11disabled_if_in_filelist_same_name/result/rougail/00-base.yml
@@ -1,10 +1,9 @@
+version: 1.1
 general:
   condition:
-    type: string
     description: No change
     default: non
   mode_conteneur_actif:
-    type: string
     description: No change
     default: non
     disabled: &id001
@@ -14,4 +13,3 @@ general:
     type: boolean
     description: No change
     disabled: *id001
-version: '1.1'
diff --git a/tests/dictionaries_old/11disabled_if_in_filelist_same_name/result/services/00-base.yml b/tests/dictionaries_old/11disabled_if_in_filelist_same_name/result/services/00-base.yml
deleted file mode 100644
index 0981730b1..000000000
--- a/tests/dictionaries_old/11disabled_if_in_filelist_same_name/result/services/00-base.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-test.service:
-  files:
-    /etc/file:
-      disabled:
-        type: jinja
-        jinja: '{% if rougail.general.condition == "oui" %}disabled{% endif %}'
-version: '1.1'
diff --git a/tests/dictionaries_old/11disabledifin_filelist_notexist/result/rougail/00-base.yml b/tests/dictionaries_old/11disabledifin_filelist_notexist/result/rougail/00-base.yml
index 08c43bb38..383b99b3c 100644
--- a/tests/dictionaries_old/11disabledifin_filelist_notexist/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/11disabledifin_filelist_notexist/result/rougail/00-base.yml
@@ -1,16 +1,13 @@
+version: 1.1
 general:
   condition:
-    type: string
     description: No change
     default: non
   mode_conteneur_actif:
-    type: string
     description: No change
     hidden: true
     default: non
   mode_conteneur_actif2:
-    type: string
     description: No change
     hidden: true
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/11disabledifin_filelist_notexist/result/services/00-base.yml b/tests/dictionaries_old/11disabledifin_filelist_notexist/result/services/00-base.yml
deleted file mode 100644
index 33fda7fcf..000000000
--- a/tests/dictionaries_old/11disabledifin_filelist_notexist/result/services/00-base.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-test.service:
-  files:
-    /tmp/file:
-      disabled:
-        type: jinja
-        jinja: '{% if rougail.general.condition == "unpossible" %}{% else %}disabled{%
-          endif %}'
-version: '1.1'
diff --git a/tests/dictionaries_old/11disabledifnotin_filelist_notexist/result/rougail/00-base.yml b/tests/dictionaries_old/11disabledifnotin_filelist_notexist/result/rougail/00-base.yml
index 08c43bb38..383b99b3c 100644
--- a/tests/dictionaries_old/11disabledifnotin_filelist_notexist/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/11disabledifnotin_filelist_notexist/result/rougail/00-base.yml
@@ -1,16 +1,13 @@
+version: 1.1
 general:
   condition:
-    type: string
     description: No change
     default: non
   mode_conteneur_actif:
-    type: string
     description: No change
     hidden: true
     default: non
   mode_conteneur_actif2:
-    type: string
     description: No change
     hidden: true
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/11disabledifnotin_filelist_notexist/result/services/00-base.yml b/tests/dictionaries_old/11disabledifnotin_filelist_notexist/result/services/00-base.yml
deleted file mode 100644
index 33fda7fcf..000000000
--- a/tests/dictionaries_old/11disabledifnotin_filelist_notexist/result/services/00-base.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-test.service:
-  files:
-    /tmp/file:
-      disabled:
-        type: jinja
-        jinja: '{% if rougail.general.condition == "unpossible" %}{% else %}disabled{%
-          endif %}'
-version: '1.1'
diff --git a/tests/dictionaries_old/11disabledifnotin_filelist_notexist_multi/result/rougail/00-base.yml b/tests/dictionaries_old/11disabledifnotin_filelist_notexist_multi/result/rougail/00-base.yml
index 08c43bb38..383b99b3c 100644
--- a/tests/dictionaries_old/11disabledifnotin_filelist_notexist_multi/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/11disabledifnotin_filelist_notexist_multi/result/rougail/00-base.yml
@@ -1,16 +1,13 @@
+version: 1.1
 general:
   condition:
-    type: string
     description: No change
     default: non
   mode_conteneur_actif:
-    type: string
     description: No change
     hidden: true
     default: non
   mode_conteneur_actif2:
-    type: string
     description: No change
     hidden: true
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/11disabledifnotin_filelist_notexist_multi/result/services/00-base.yml b/tests/dictionaries_old/11disabledifnotin_filelist_notexist_multi/result/services/00-base.yml
deleted file mode 100644
index 33fda7fcf..000000000
--- a/tests/dictionaries_old/11disabledifnotin_filelist_notexist_multi/result/services/00-base.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-test.service:
-  files:
-    /tmp/file:
-      disabled:
-        type: jinja
-        jinja: '{% if rougail.general.condition == "unpossible" %}{% else %}disabled{%
-          endif %}'
-version: '1.1'
diff --git a/tests/dictionaries_old/11disabledifnotin_filelist_notexist_validenum/result/rougail/00-base.yml b/tests/dictionaries_old/11disabledifnotin_filelist_notexist_validenum/result/rougail/00-base.yml
index 94380ef7a..bba74637b 100644
--- a/tests/dictionaries_old/11disabledifnotin_filelist_notexist_validenum/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/11disabledifnotin_filelist_notexist_validenum/result/rougail/00-base.yml
@@ -1,3 +1,4 @@
+version: 1.1
 general:
   condition:
     type: choice
@@ -7,13 +8,10 @@ general:
     - non
     - statique
   mode_conteneur_actif:
-    type: string
     description: No change
     hidden: true
     default: non
   mode_conteneur_actif2:
-    type: string
     description: No change
     hidden: true
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/11disabledifnotin_filelist_notexist_validenum/result/services/00-base.yml b/tests/dictionaries_old/11disabledifnotin_filelist_notexist_validenum/result/services/00-base.yml
deleted file mode 100644
index 06cee9eff..000000000
--- a/tests/dictionaries_old/11disabledifnotin_filelist_notexist_validenum/result/services/00-base.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-test.service:
-  files:
-    /tmp/file:
-      disabled:
-        type: jinja
-        jinja: '{% if rougail.general.condition == "statique" %}{% else %}disabled{%
-          endif %}'
-version: '1.1'
diff --git a/tests/dictionaries_old/11multi_disabled_if_in_filelist/result/rougail/00-base.yml b/tests/dictionaries_old/11multi_disabled_if_in_filelist/result/rougail/00-base.yml
index efaa95b83..7829f3766 100644
--- a/tests/dictionaries_old/11multi_disabled_if_in_filelist/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/11multi_disabled_if_in_filelist/result/rougail/00-base.yml
@@ -1,11 +1,9 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: No change
     hidden: true
     default: non
   condition:
-    type: string
     description: No change
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/11multi_disabled_if_in_filelist/result/services/00-base.yml b/tests/dictionaries_old/11multi_disabled_if_in_filelist/result/services/00-base.yml
deleted file mode 100644
index 3ef03ffbf..000000000
--- a/tests/dictionaries_old/11multi_disabled_if_in_filelist/result/services/00-base.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-test.service:
-  files:
-    /tmp/file1:
-      disabled:
-        type: jinja
-        jinja: '{% if __activer_clam == "non" %}disabled{% endif %}'
-version: '1.1'
diff --git a/tests/dictionaries_old/11valid_enum_function/result/rougail/00-base.yml b/tests/dictionaries_old/11valid_enum_function/result/rougail/00-base.yml
index fbc2bc952..d483170d9 100644
--- a/tests/dictionaries_old/11valid_enum_function/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/11valid_enum_function/result/rougail/00-base.yml
@@ -1,3 +1,4 @@
+version: 1.1
 general:
   var:
     type: choice
@@ -6,4 +7,3 @@ general:
     choices:
     - type: jinja
       jinja: '{{ 0 | trange(10) }}'
-version: '1.1'
diff --git a/tests/dictionaries_old/11valid_enum_variable/result/rougail/00-base.yml b/tests/dictionaries_old/11valid_enum_variable/result/rougail/00-base.yml
index 0625674b1..7af14b3c9 100644
--- a/tests/dictionaries_old/11valid_enum_variable/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/11valid_enum_variable/result/rougail/00-base.yml
@@ -1,3 +1,4 @@
+version: 1.1
 general:
   mode_conteneur_actif:
     type: choice
@@ -7,11 +8,8 @@ general:
     - type: variable
       variable: rougail.general.var
   var:
-    type: string
     description: New variable
-    multi: true
     default:
     - a
     - b
     - c
-version: '1.1'
diff --git a/tests/dictionaries_old/20family_append/result/rougail/00-base.yml b/tests/dictionaries_old/20family_append/result/rougail/00-base.yml
index 3f5e4a739..8e18217b5 100644
--- a/tests/dictionaries_old/20family_append/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/20family_append/result/rougail/00-base.yml
@@ -1,7 +1,6 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: No change
     hidden: true
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/20family_append/result/rougail/01-base.yml b/tests/dictionaries_old/20family_append/result/rougail/01-base.yml
index b50350d01..23c57abd8 100644
--- a/tests/dictionaries_old/20family_append/result/rougail/01-base.yml
+++ b/tests/dictionaries_old/20family_append/result/rougail/01-base.yml
@@ -1,7 +1,6 @@
+version: 1.1
 general:
   mode_conteneur_actif1:
-    type: string
     description: No change
     hidden: true
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/20family_disabled/result/rougail/00-base.yml b/tests/dictionaries_old/20family_disabled/result/rougail/00-base.yml
index 15dc657a7..580372688 100644
--- a/tests/dictionaries_old/20family_disabled/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/20family_disabled/result/rougail/00-base.yml
@@ -1,8 +1,7 @@
+version: 1.1
 general:
   disabled: true
   mode_conteneur_actif:
-    type: string
     description: No change
     disabled: true
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/20family_dynamic/result/rougail/00-base.yml b/tests/dictionaries_old/20family_dynamic/result/rougail/00-base.yml
index 7454465d1..c2dc43d73 100644
--- a/tests/dictionaries_old/20family_dynamic/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/20family_dynamic/result/rougail/00-base.yml
@@ -1,14 +1,13 @@
+version: 1.1
 general:
   varname:
-    type: string
     description: No change
-    multi: true
     default:
     - val1
     - val2
-dyn:
+dyn{{ suffix }}:
   type: dynamic
-  vardyn:
+  vardyn{{ suffix }}:
     type: string
     description: No change
     mandatory: false
@@ -16,4 +15,3 @@ dyn:
     type: variable
     variable: rougail.general.varname
     propertyerror: false
-version: '1.1'
diff --git a/tests/dictionaries_old/20family_dynamic_calc/result/rougail/00-base.yml b/tests/dictionaries_old/20family_dynamic_calc/result/rougail/00-base.yml
index a72e68395..ef348ca8c 100644
--- a/tests/dictionaries_old/20family_dynamic_calc/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/20family_dynamic_calc/result/rougail/00-base.yml
@@ -1,15 +1,13 @@
+version: 1.1
 general:
   varname:
-    type: string
     description: No change
-    multi: true
     default:
     - val1
     - val2
-dyn:
+dyn{{ suffix }}:
   type: dynamic
-  vardyn:
-    type: string
+  vardyn{{ suffix }}:
     description: No change
     default: val
   dynamic:
@@ -20,8 +18,6 @@ new:
   newvar:
     type: string
     description: No change
-    mandatory: false
     default:
       type: jinja
-      jinja: '{{ __vardynval1 | calc_val }}'
-version: '1.1'
+      jinja: '{{ vardynval1 | calc_val }}'
diff --git a/tests/dictionaries_old/20family_dynamic_calc2/result/rougail/00-base.yml b/tests/dictionaries_old/20family_dynamic_calc2/result/rougail/00-base.yml
index d7d96a383..78f82eb6b 100644
--- a/tests/dictionaries_old/20family_dynamic_calc2/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/20family_dynamic_calc2/result/rougail/00-base.yml
@@ -1,20 +1,15 @@
+version: 1.1
 general:
   varname:
-    type: string
     description: No change
-    multi: true
     default:
     - val1
     - val2
-dyn:
+dyn{{ suffix }}:
   type: dynamic
-  vardyn:
-    type: string
+  vardyn{{ suffix }}:
     description: No change
     default: val
-  hidden:
-    type: jinja
-    jinja: '{% if rougail.new.newvar == "non" %}hidden{% endif %}'
   dynamic:
     type: variable
     variable: rougail.general.varname
@@ -24,4 +19,3 @@ new:
     type: string
     description: No change
     mandatory: false
-version: '1.1'
diff --git a/tests/dictionaries_old/20family_dynamic_calc_suffix/result/rougail/00-base.yml b/tests/dictionaries_old/20family_dynamic_calc_suffix/result/rougail/00-base.yml
index bd119fa40..1140f557c 100644
--- a/tests/dictionaries_old/20family_dynamic_calc_suffix/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/20family_dynamic_calc_suffix/result/rougail/00-base.yml
@@ -1,14 +1,13 @@
+version: 1.1
 general:
   varname:
-    type: string
     description: No change
-    multi: true
     default:
     - val1
     - val2
-dyn:
+dyn{{ suffix }}:
   type: dynamic
-  vardyn:
+  vardyn{{ suffix }}:
     type: string
     description: No change
     default:
@@ -26,4 +25,3 @@ new:
     type: string
     description: No change
     mandatory: false
-version: '1.1'
diff --git a/tests/dictionaries_old/20family_dynamic_description/result/rougail/00-base.yml b/tests/dictionaries_old/20family_dynamic_description/result/rougail/00-base.yml
index a304a4f61..4d1c340c9 100644
--- a/tests/dictionaries_old/20family_dynamic_description/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/20family_dynamic_description/result/rougail/00-base.yml
@@ -1,15 +1,14 @@
+version: 1.1
 general:
   varname:
-    type: string
     description: No change
-    multi: true
     default:
     - val1
     - val2
-dyn:
+dyn{{ suffix }}:
   description: 'Dyn '
   type: dynamic
-  vardyn:
+  vardyn{{ suffix }}:
     type: string
     description: No change
     mandatory: false
@@ -17,4 +16,3 @@ dyn:
     type: variable
     variable: rougail.general.varname
     propertyerror: false
-version: '1.1'
diff --git a/tests/dictionaries_old/20family_dynamic_jinja_fill/result/rougail/00-base.yml b/tests/dictionaries_old/20family_dynamic_jinja_fill/result/rougail/00-base.yml
index fd0cc9558..1389b5616 100644
--- a/tests/dictionaries_old/20family_dynamic_jinja_fill/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/20family_dynamic_jinja_fill/result/rougail/00-base.yml
@@ -1,15 +1,13 @@
+version: 1.1
 general:
   varname:
-    type: string
     description: No change
-    multi: true
     default:
     - val1
     - val2
-dyn:
+dyn{{ suffix }}:
   type: dynamic
-  vardyn:
-    type: string
+  vardyn{{ suffix }}:
     description: No change
     default: val
   dynamic:
@@ -20,8 +18,6 @@ new:
   newvar:
     type: string
     description: No change
-    mandatory: false
     default:
       type: jinja
       jinja: '{{ vardynval1 }}'
-version: '1.1'
diff --git a/tests/dictionaries_old/20family_dynamic_leadership/result/rougail/00-base.yml b/tests/dictionaries_old/20family_dynamic_leadership/result/rougail/00-base.yml
index 0a9873471..4a11c4a1b 100644
--- a/tests/dictionaries_old/20family_dynamic_leadership/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/20family_dynamic_leadership/result/rougail/00-base.yml
@@ -1,29 +1,28 @@
+version: 1.1
 general:
   varname:
-    type: string
     description: No change
-    multi: true
     default:
     - val1
     - val2
-dyn:
+dyn{{ suffix }}:
   type: dynamic
-  vardyn:
+  vardyn{{ suffix }}:
     type: string
     description: No change
     mandatory: false
-  leadership:
+  leadership{{ suffix }}:
     type: leadership
-    leader:
+    leader{{ suffix }}:
       type: string
       description: leader
       multi: true
       mandatory: false
-    follower1:
+    follower1{{ suffix }}:
       type: string
       description: follower1
       mandatory: false
-    follower2:
+    follower2{{ suffix }}:
       type: string
       description: follower2
       mandatory: false
@@ -31,4 +30,3 @@ dyn:
     type: variable
     variable: rougail.general.varname
     propertyerror: false
-version: '1.1'
diff --git a/tests/dictionaries_old/20family_dynamic_number/result/rougail/00-base.yml b/tests/dictionaries_old/20family_dynamic_number/result/rougail/00-base.yml
index ba614626b..78446056a 100644
--- a/tests/dictionaries_old/20family_dynamic_number/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/20family_dynamic_number/result/rougail/00-base.yml
@@ -1,15 +1,13 @@
+version: 1.1
 general:
   varname:
-    type: number
     description: No change
-    multi: true
     default:
     - 1
     - 2
-dyn:
+dyn{{ suffix }}:
   type: dynamic
-  vardyn:
-    type: string
+  vardyn{{ suffix }}:
     description: No change
     default: val
   dynamic:
@@ -20,8 +18,6 @@ new:
   newvar:
     type: string
     description: No change
-    mandatory: false
     default:
       type: jinja
-      jinja: '{{ __vardyn1 | calc_val }}'
-version: '1.1'
+      jinja: '{{ vardyn1 | calc_val }}'
diff --git a/tests/dictionaries_old/20family_empty/result/rougail/00-base.yml b/tests/dictionaries_old/20family_empty/result/rougail/00-base.yml
index 8fc693cc7..930923f1f 100644
--- a/tests/dictionaries_old/20family_empty/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/20family_empty/result/rougail/00-base.yml
@@ -1,9 +1,8 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: No change
     mode: basic
     default: non
 general2:
   help: family
-version: '1.1'
diff --git a/tests/dictionaries_old/20family_hidden/result/rougail/00-base.yml b/tests/dictionaries_old/20family_hidden/result/rougail/00-base.yml
index 3f5e4a739..8e18217b5 100644
--- a/tests/dictionaries_old/20family_hidden/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/20family_hidden/result/rougail/00-base.yml
@@ -1,7 +1,6 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: No change
     hidden: true
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/20family_hidden/result/rougail/01-base.yml b/tests/dictionaries_old/20family_hidden/result/rougail/01-base.yml
index b6cdabd56..b3cc4f6b7 100644
--- a/tests/dictionaries_old/20family_hidden/result/rougail/01-base.yml
+++ b/tests/dictionaries_old/20family_hidden/result/rougail/01-base.yml
@@ -1,4 +1,4 @@
+version: 1.1
 general:
   hidden: true
   redefine: true
-version: '1.1'
diff --git a/tests/dictionaries_old/20family_mode/result/rougail/00-base.yml b/tests/dictionaries_old/20family_mode/result/rougail/00-base.yml
index 14809ccef..a3fb4660a 100644
--- a/tests/dictionaries_old/20family_mode/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/20family_mode/result/rougail/00-base.yml
@@ -1,7 +1,6 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: No change
     mode: basic
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/20family_modeleadership/result/rougail/00-base.yml b/tests/dictionaries_old/20family_modeleadership/result/rougail/00-base.yml
index b72dc28ef..00db829d0 100644
--- a/tests/dictionaries_old/20family_modeleadership/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/20family_modeleadership/result/rougail/00-base.yml
@@ -1,6 +1,6 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: No change
     default: non
   leader:
@@ -20,4 +20,3 @@ general:
       description: follower2
       mode: basic
       mandatory: false
-version: '1.1'
diff --git a/tests/dictionaries_old/20notemplating/result/rougail/00-base.yml b/tests/dictionaries_old/20notemplating/result/rougail/00-base.yml
index 96887c594..fc1963b55 100644
--- a/tests/dictionaries_old/20notemplating/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/20notemplating/result/rougail/00-base.yml
@@ -1,6 +1,5 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: No change
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/20notemplating/result/services/00-base.yml b/tests/dictionaries_old/20notemplating/result/services/00-base.yml
deleted file mode 100644
index 09bed7e83..000000000
--- a/tests/dictionaries_old/20notemplating/result/services/00-base.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-test.service:
-  files:
-    /etc/file:
-      engine: none
-version: '1.1'
diff --git a/tests/dictionaries_old/20override/result/rougail/00-base.yml b/tests/dictionaries_old/20override/result/rougail/00-base.yml
index 96887c594..fc1963b55 100644
--- a/tests/dictionaries_old/20override/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/20override/result/rougail/00-base.yml
@@ -1,6 +1,5 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: No change
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/20override/result/services/00-base.yml b/tests/dictionaries_old/20override/result/services/00-base.yml
deleted file mode 100644
index 3cd7d74a5..000000000
--- a/tests/dictionaries_old/20override/result/services/00-base.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-test.service:
-  override:
-test2.service:
-  override:
-    engine: jinja
-version: '1.1'
diff --git a/tests/dictionaries_old/20override_no_templating/result/rougail/00-base.yml b/tests/dictionaries_old/20override_no_templating/result/rougail/00-base.yml
index 96887c594..fc1963b55 100644
--- a/tests/dictionaries_old/20override_no_templating/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/20override_no_templating/result/rougail/00-base.yml
@@ -1,6 +1,5 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: No change
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/20override_no_templating/result/services/00-base.yml b/tests/dictionaries_old/20override_no_templating/result/services/00-base.yml
deleted file mode 100644
index 416a016a4..000000000
--- a/tests/dictionaries_old/20override_no_templating/result/services/00-base.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-test.service:
-  override:
-    engine: none
-version: '1.1'
diff --git a/tests/dictionaries_old/20override_source/result/rougail/00-base.yml b/tests/dictionaries_old/20override_source/result/rougail/00-base.yml
index 96887c594..fc1963b55 100644
--- a/tests/dictionaries_old/20override_source/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/20override_source/result/rougail/00-base.yml
@@ -1,6 +1,5 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: No change
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/20override_source/result/services/00-base.yml b/tests/dictionaries_old/20override_source/result/services/00-base.yml
deleted file mode 100644
index a5808168e..000000000
--- a/tests/dictionaries_old/20override_source/result/services/00-base.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-test.service:
-  override:
-    source: test2.service
-version: '1.1'
diff --git a/tests/dictionaries_old/21family_empty/result/rougail/00-base.yml b/tests/dictionaries_old/21family_empty/result/rougail/00-base.yml
index 51b265397..55a2a0435 100644
--- a/tests/dictionaries_old/21family_empty/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/21family_empty/result/rougail/00-base.yml
@@ -1,7 +1,6 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: No change
     default: non
 general1: {}
-version: '1.1'
diff --git a/tests/dictionaries_old/21family_empty_sub/result/rougail/00-base.yml b/tests/dictionaries_old/21family_empty_sub/result/rougail/00-base.yml
index c0cecd478..c2d8ba10e 100644
--- a/tests/dictionaries_old/21family_empty_sub/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/21family_empty_sub/result/rougail/00-base.yml
@@ -1,8 +1,7 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: No change
     default: non
 general1:
   general2: {}
-version: '1.1'
diff --git a/tests/dictionaries_old/22provider_dynamic/result/rougail/00-base.yml b/tests/dictionaries_old/22provider_dynamic/result/rougail/00-base.yml
index 869e6e72a..abb494b0c 100644
--- a/tests/dictionaries_old/22provider_dynamic/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/22provider_dynamic/result/rougail/00-base.yml
@@ -1,14 +1,13 @@
+version: 1.1
 general:
   varname:
-    type: string
     description: No change
-    multi: true
     default:
     - val1
     - val2
-dyn:
+dyn{{ suffix }}:
   type: dynamic
-  vardyn:
+  vardyn{{ suffix }}:
     type: string
     description: No change
     provider: dyn
@@ -17,4 +16,3 @@ dyn:
     type: variable
     variable: rougail.general.varname
     propertyerror: false
-version: '1.1'
diff --git a/tests/dictionaries_old/22provider_dynamic_2/result/rougail/00-base.yml b/tests/dictionaries_old/22provider_dynamic_2/result/rougail/00-base.yml
index a426cb237..e208e97a2 100644
--- a/tests/dictionaries_old/22provider_dynamic_2/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/22provider_dynamic_2/result/rougail/00-base.yml
@@ -1,14 +1,13 @@
+version: 1.1
 varname:
-  type: string
   description: No change
-  multi: true
   default:
   - val1
   - val2
 general:
-  dyn:
+  dyn{{ suffix }}:
     type: dynamic
-    vardyn:
+    vardyn{{ suffix }}:
       type: string
       description: No change
       provider: dyn
@@ -17,4 +16,3 @@ general:
       type: variable
       variable: rougail.varname
       propertyerror: false
-version: '1.1'
diff --git a/tests/dictionaries_old/30mandatory_withoutvalue/result/rougail/00-base.yml b/tests/dictionaries_old/30mandatory_withoutvalue/result/rougail/00-base.yml
index 5251c3144..fd54c4711 100644
--- a/tests/dictionaries_old/30mandatory_withoutvalue/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/30mandatory_withoutvalue/result/rougail/00-base.yml
@@ -1,6 +1,5 @@
+version: 1.1
 general:
   mode_conteneur_actif:
     type: string
     description: No change
-    mandatory: true
-version: '1.1'
diff --git a/tests/dictionaries_old/30mandatory_withoutvaluecalc/result/rougail/00-base.yml b/tests/dictionaries_old/30mandatory_withoutvaluecalc/result/rougail/00-base.yml
index 0a2487604..13c354c5a 100644
--- a/tests/dictionaries_old/30mandatory_withoutvaluecalc/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/30mandatory_withoutvaluecalc/result/rougail/00-base.yml
@@ -1,10 +1,9 @@
+version: 1.1
 general:
   mode_conteneur_actif:
     type: string
     description: No change
     hidden: true
-    mandatory: false
     default:
       type: jinja
       jinja: '{{ "value" | calc_val }}'
-version: '1.1'
diff --git a/tests/dictionaries_old/30mandatory_withvalue/result/rougail/00-base.yml b/tests/dictionaries_old/30mandatory_withvalue/result/rougail/00-base.yml
index c1501c3c4..1a49748ff 100644
--- a/tests/dictionaries_old/30mandatory_withvalue/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/30mandatory_withvalue/result/rougail/00-base.yml
@@ -1,6 +1,5 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: No change
     default: value
-version: '1.1'
diff --git a/tests/dictionaries_old/30mandatory_withvaluecalc/result/rougail/00-base.yml b/tests/dictionaries_old/30mandatory_withvaluecalc/result/rougail/00-base.yml
index ecb194655..eaa9f2c61 100644
--- a/tests/dictionaries_old/30mandatory_withvaluecalc/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/30mandatory_withvaluecalc/result/rougail/00-base.yml
@@ -1,9 +1,8 @@
+version: 1.1
 general:
   mode_conteneur_actif:
     type: string
     description: No change
-    mandatory: false
     default:
       type: jinja
       jinja: '{{ "value" | calc_val }}'
-version: '1.1'
diff --git a/tests/dictionaries_old/40condition_base/result/rougail/00-base.yml b/tests/dictionaries_old/40condition_base/result/rougail/00-base.yml
index 7cb155ef2..2f66135fc 100644
--- a/tests/dictionaries_old/40condition_base/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/40condition_base/result/rougail/00-base.yml
@@ -1,22 +1,18 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: No change
     default: non
   condition:
-    type: string
     description: No change
     default: non
   mode_conteneur_actif1:
-    type: string
     description: No change
     default: non
     disabled: &id001
       type: jinja
       jinja: '{% if rougail.general.condition == "oui" %}disabled{% endif %}'
   mode_conteneur_actif2:
-    type: string
     description: No change
     default: non
     disabled: *id001
-version: '1.1'
diff --git a/tests/dictionaries_old/40condition_base_add/__init__.py b/tests/dictionaries_old/40condition_base_add/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/dictionaries_old/40condition_base_add/makedict/after.json b/tests/dictionaries_old/40condition_base_add/makedict/after.json
deleted file mode 100644
index c1303c5d0..000000000
--- a/tests/dictionaries_old/40condition_base_add/makedict/after.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "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
deleted file mode 100644
index e21c64e6f..000000000
--- a/tests/dictionaries_old/40condition_base_add/makedict/base.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "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
deleted file mode 100644
index c1303c5d0..000000000
--- a/tests/dictionaries_old/40condition_base_add/makedict/before.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "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/result/rougail/00-base.yml b/tests/dictionaries_old/40condition_base_add/result/rougail/00-base.yml
deleted file mode 100644
index 7cb155ef2..000000000
--- a/tests/dictionaries_old/40condition_base_add/result/rougail/00-base.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-general:
-  mode_conteneur_actif:
-    type: string
-    description: No change
-    default: non
-  condition:
-    type: string
-    description: No change
-    default: non
-  mode_conteneur_actif1:
-    type: string
-    description: No change
-    default: non
-    disabled: &id001
-      type: jinja
-      jinja: '{% if rougail.general.condition == "oui" %}disabled{% endif %}'
-  mode_conteneur_actif2:
-    type: string
-    description: No change
-    default: non
-    disabled: *id001
-version: '1.1'
diff --git a/tests/dictionaries_old/40condition_base_add/result/rougail/01-base.yml b/tests/dictionaries_old/40condition_base_add/result/rougail/01-base.yml
deleted file mode 100644
index fe288f974..000000000
--- a/tests/dictionaries_old/40condition_base_add/result/rougail/01-base.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-general:
-  condition:
-    redefine: true
-    hidden: false
-    disabled: false
-    mandatory: false
-version: '1.1'
diff --git a/tests/dictionaries_old/40condition_base_add/tiramisu/base.py b/tests/dictionaries_old/40condition_base_add/tiramisu/base.py
deleted file mode 100644
index eb60798ee..000000000
--- a/tests/dictionaries_old/40condition_base_add/tiramisu/base.py
+++ /dev/null
@@ -1,32 +0,0 @@
-from importlib.machinery import SourceFileLoader as _SourceFileLoader
-from importlib.util import spec_from_loader as _spec_from_loader, module_from_spec as _module_from_spec
-class func:
-    pass
-
-def _load_functions(path):
-    global _SourceFileLoader, _spec_from_loader, _module_from_spec, func
-    loader = _SourceFileLoader('func', path)
-    spec = _spec_from_loader(loader.name, loader)
-    func_ = _module_from_spec(spec)
-    loader.exec_module(func_)
-    for function in dir(func_):
-        if function.startswith('_'):
-            continue
-        setattr(func, function, getattr(func_, function))
-_load_functions('tests/dictionaries_old/../eosfunc/test.py')
-try:
-    from tiramisu4 import *
-    from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES
-except:
-    from tiramisu import *
-    from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
-ALLOWED_LEADER_PROPERTIES.add("basic")
-ALLOWED_LEADER_PROPERTIES.add("normal")
-ALLOWED_LEADER_PROPERTIES.add("expert")
-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({"normal"}))
-option_5 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
-option_6 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
-optiondescription_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5, option_6], properties=frozenset({"normal"}))
-optiondescription_1 = OptionDescription(name="rougail", doc="rougail", children=[optiondescription_2], properties=frozenset({"normal"}))
-option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1])
diff --git a/tests/dictionaries_old/40condition_base_add/tiramisu/multi.py b/tests/dictionaries_old/40condition_base_add/tiramisu/multi.py
deleted file mode 100644
index e8a67e8bf..000000000
--- a/tests/dictionaries_old/40condition_base_add/tiramisu/multi.py
+++ /dev/null
@@ -1,40 +0,0 @@
-from importlib.machinery import SourceFileLoader as _SourceFileLoader
-from importlib.util import spec_from_loader as _spec_from_loader, module_from_spec as _module_from_spec
-class func:
-    pass
-
-def _load_functions(path):
-    global _SourceFileLoader, _spec_from_loader, _module_from_spec, func
-    loader = _SourceFileLoader('func', path)
-    spec = _spec_from_loader(loader.name, loader)
-    func_ = _module_from_spec(spec)
-    loader.exec_module(func_)
-    for function in dir(func_):
-        if function.startswith('_'):
-            continue
-        setattr(func, function, getattr(func_, function))
-_load_functions('tests/dictionaries/../eosfunc/test.py')
-try:
-    from tiramisu4 import *
-    from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES
-except:
-    from tiramisu import *
-    from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
-ALLOWED_LEADER_PROPERTIES.add("basic")
-ALLOWED_LEADER_PROPERTIES.add("normal")
-ALLOWED_LEADER_PROPERTIES.add("expert")
-option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
-option_3 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
-option_4 = 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_3, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)}))
-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, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)}))
-optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4, option_5], properties=frozenset({"normal"}))
-optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"}))
-optiondescription_11 = OptionDescription(name="1", doc="1", children=[optiondescription_12])
-option_7 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
-option_8 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
-option_9 = 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_8, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)}))
-option_10 = 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_8, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)}))
-optiondescription_6 = OptionDescription(name="general", doc="general", children=[option_7, option_8, option_9, option_10], properties=frozenset({"normal"}))
-optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_6], properties=frozenset({"normal"}))
-optiondescription_13 = OptionDescription(name="2", doc="2", children=[optiondescription_14])
-option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_11, optiondescription_13])
diff --git a/tests/dictionaries_old/40condition_base_add/xml/00-base.xml b/tests/dictionaries_old/40condition_base_add/xml/00-base.xml
deleted file mode 100644
index 5116ca99a..000000000
--- a/tests/dictionaries_old/40condition_base_add/xml/00-base.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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>
-      <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/xml/01-base.xml b/tests/dictionaries_old/40condition_base_add/xml/01-base.xml
deleted file mode 100644
index c7b3c65ec..000000000
--- a/tests/dictionaries_old/40condition_base_add/xml/01-base.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<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>
diff --git a/tests/dictionaries_old/40condition_base_add/yml/00-base.yml b/tests/dictionaries_old/40condition_base_add/yml/00-base.yml
deleted file mode 100644
index fbb661e20..000000000
--- a/tests/dictionaries_old/40condition_base_add/yml/00-base.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-version: '0.10'
-variables:
-- family:
-  - name: general
-    variables:
-    - variable:
-      - name: mode_conteneur_actif
-        type: string
-        description: No change
-        value:
-        - text: non
-      - name: condition
-        type: string
-        description: No change
-        value:
-        - text: non
-      - name: mode_conteneur_actif1
-        type: string
-        description: No change
-        value:
-        - text: non
-      - name: mode_conteneur_actif2
-        type: string
-        description: No change
-        value:
-        - text: non
-constraints:
-- condition:
-  - optional: true
-    name: disabled_if_in
-    source: condition
-    param:
-    - text: oui
-    target:
-    - type: variable
-      text: mode_conteneur_actif1
-    - type: variable
-      optional: true
-      text: mode_conteneur_actif2
diff --git a/tests/dictionaries_old/40condition_base_add/yml/01-base.yml b/tests/dictionaries_old/40condition_base_add/yml/01-base.yml
deleted file mode 100644
index 15d413f0f..000000000
--- a/tests/dictionaries_old/40condition_base_add/yml/01-base.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-version: '0.10'
-variables:
-- family:
-  - name: general
-    variables:
-    - variable:
-      - name: condition
-        redefine: true
-        remove_condition: true
-constraints:
-- condition:
-  - optional: true
-    name: disabled_if_in
-    source: condition
-    param:
-    - text: oui
-    target:
-    - type: variable
-      text: mode_conteneur_actif1
-    - type: variable
-      optional: true
-      text: mode_conteneur_actif2
diff --git a/tests/dictionaries_old/40condition_fallback/result/rougail/00-base.yml b/tests/dictionaries_old/40condition_fallback/result/rougail/00-base.yml
index 9ef28773e..84af600eb 100644
--- a/tests/dictionaries_old/40condition_fallback/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/40condition_fallback/result/rougail/00-base.yml
@@ -1,24 +1,20 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: No change
     default: non
   mode_conteneur_actif1:
-    type: string
     description: No change
     default: non
     disabled: &id001
       type: jinja
-      jinja: '{% if __condition == "oui" %}disabled{% endif %}'
+      jinja: '{% if condition == "oui" %}disabled{% endif %}'
   mode_conteneur_actif2:
-    type: string
     description: No change
     default: non
     disabled: *id001
 disabled_family:
   mode_conteneur_actif3:
-    type: string
     description: No change
     default: non
   disabled: *id001
-version: '1.1'
diff --git a/tests/dictionaries_old/40condition_optional/__init__.py b/tests/dictionaries_old/40condition_optional/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/dictionaries_old/40condition_optional/makedict/after.json b/tests/dictionaries_old/40condition_optional/makedict/after.json
deleted file mode 100644
index e29e8d8e0..000000000
--- a/tests/dictionaries_old/40condition_optional/makedict/after.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "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
deleted file mode 100644
index 0858ba1bc..000000000
--- a/tests/dictionaries_old/40condition_optional/makedict/base.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "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
deleted file mode 100644
index e29e8d8e0..000000000
--- a/tests/dictionaries_old/40condition_optional/makedict/before.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "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/result/rougail/00-base.yml b/tests/dictionaries_old/40condition_optional/result/rougail/00-base.yml
deleted file mode 100644
index 73ca5c34e..000000000
--- a/tests/dictionaries_old/40condition_optional/result/rougail/00-base.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-general:
-  mode_conteneur_actif:
-    type: string
-    description: No change
-    default: non
-  condition:
-    type: string
-    description: No change
-    default: non
-  mode_conteneur_actif1:
-    type: string
-    description: No change
-    default: non
-    disabled:
-      type: jinja
-      jinja: '{% if rougail.general.condition == "oui" %}disabled{% endif %}'
-version: '1.1'
diff --git a/tests/dictionaries_old/40condition_optional/tiramisu/base.py b/tests/dictionaries_old/40condition_optional/tiramisu/base.py
deleted file mode 100644
index 0653f1ee9..000000000
--- a/tests/dictionaries_old/40condition_optional/tiramisu/base.py
+++ /dev/null
@@ -1,31 +0,0 @@
-from importlib.machinery import SourceFileLoader as _SourceFileLoader
-from importlib.util import spec_from_loader as _spec_from_loader, module_from_spec as _module_from_spec
-class func:
-    pass
-
-def _load_functions(path):
-    global _SourceFileLoader, _spec_from_loader, _module_from_spec, func
-    loader = _SourceFileLoader('func', path)
-    spec = _spec_from_loader(loader.name, loader)
-    func_ = _module_from_spec(spec)
-    loader.exec_module(func_)
-    for function in dir(func_):
-        if function.startswith('_'):
-            continue
-        setattr(func, function, getattr(func_, function))
-_load_functions('tests/dictionaries_old/../eosfunc/test.py')
-try:
-    from tiramisu4 import *
-    from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES
-except:
-    from tiramisu import *
-    from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
-ALLOWED_LEADER_PROPERTIES.add("basic")
-ALLOWED_LEADER_PROPERTIES.add("normal")
-ALLOWED_LEADER_PROPERTIES.add("expert")
-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"}))
-optiondescription_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
-optiondescription_1 = OptionDescription(name="rougail", doc="rougail", children=[optiondescription_2], properties=frozenset({"normal"}))
-option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1])
diff --git a/tests/dictionaries_old/40condition_optional/tiramisu/multi.py b/tests/dictionaries_old/40condition_optional/tiramisu/multi.py
deleted file mode 100644
index 90b10c198..000000000
--- a/tests/dictionaries_old/40condition_optional/tiramisu/multi.py
+++ /dev/null
@@ -1,38 +0,0 @@
-from importlib.machinery import SourceFileLoader as _SourceFileLoader
-from importlib.util import spec_from_loader as _spec_from_loader, module_from_spec as _module_from_spec
-class func:
-    pass
-
-def _load_functions(path):
-    global _SourceFileLoader, _spec_from_loader, _module_from_spec, func
-    loader = _SourceFileLoader('func', path)
-    spec = _spec_from_loader(loader.name, loader)
-    func_ = _module_from_spec(spec)
-    loader.exec_module(func_)
-    for function in dir(func_):
-        if function.startswith('_'):
-            continue
-        setattr(func, function, getattr(func_, function))
-_load_functions('tests/dictionaries/../eosfunc/test.py')
-try:
-    from tiramisu4 import *
-    from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES
-except:
-    from tiramisu import *
-    from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
-ALLOWED_LEADER_PROPERTIES.add("basic")
-ALLOWED_LEADER_PROPERTIES.add("normal")
-ALLOWED_LEADER_PROPERTIES.add("expert")
-option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
-option_3 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
-option_4 = 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_3, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)}))
-optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4], properties=frozenset({"normal"}))
-optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"}))
-optiondescription_9 = OptionDescription(name="1", doc="1", children=[optiondescription_10])
-option_6 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
-option_7 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
-option_8 = 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_7, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)}))
-optiondescription_5 = OptionDescription(name="general", doc="general", children=[option_6, option_7, option_8], properties=frozenset({"normal"}))
-optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5], properties=frozenset({"normal"}))
-optiondescription_11 = OptionDescription(name="2", doc="2", children=[optiondescription_12])
-option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_9, optiondescription_11])
diff --git a/tests/dictionaries_old/40condition_optional/xml/00-base.xml b/tests/dictionaries_old/40condition_optional/xml/00-base.xml
deleted file mode 100644
index ed408f6a2..000000000
--- a/tests/dictionaries_old/40condition_optional/xml/00-base.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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>
-      <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/yml/00-base.yml b/tests/dictionaries_old/40condition_optional/yml/00-base.yml
deleted file mode 100644
index 77d3db6df..000000000
--- a/tests/dictionaries_old/40condition_optional/yml/00-base.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-version: '0.10'
-variables:
-- family:
-  - name: general
-    variables:
-    - variable:
-      - name: mode_conteneur_actif
-        type: string
-        description: No change
-        value:
-        - text: non
-      - name: condition
-        type: string
-        description: No change
-        value:
-        - text: non
-      - name: mode_conteneur_actif1
-        type: string
-        description: No change
-        value:
-        - text: non
-constraints:
-- condition:
-  - optional: true
-    name: disabled_if_in
-    source: condition
-    param:
-    - text: oui
-    target:
-    - type: variable
-      text: mode_conteneur_actif1
-    - type: variable
-      optional: true
-      text: mode_conteneur_actif2
diff --git a/tests/dictionaries_old/40condition_optional_empty/__init__.py b/tests/dictionaries_old/40condition_optional_empty/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/dictionaries_old/40condition_optional_empty/makedict/after.json b/tests/dictionaries_old/40condition_optional_empty/makedict/after.json
deleted file mode 100644
index e29e8d8e0..000000000
--- a/tests/dictionaries_old/40condition_optional_empty/makedict/after.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "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
deleted file mode 100644
index 0858ba1bc..000000000
--- a/tests/dictionaries_old/40condition_optional_empty/makedict/base.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "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
deleted file mode 100644
index e29e8d8e0..000000000
--- a/tests/dictionaries_old/40condition_optional_empty/makedict/before.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "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/result/rougail/00-base.yml b/tests/dictionaries_old/40condition_optional_empty/result/rougail/00-base.yml
deleted file mode 100644
index d7e350ef6..000000000
--- a/tests/dictionaries_old/40condition_optional_empty/result/rougail/00-base.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-general:
-  mode_conteneur_actif:
-    type: string
-    description: No change
-    default: non
-  condition:
-    type: string
-    description: No change
-    default: non
-  mode_conteneur_actif1:
-    type: string
-    description: No change
-    default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/40condition_optional_empty/tiramisu/base.py b/tests/dictionaries_old/40condition_optional_empty/tiramisu/base.py
deleted file mode 100644
index 0653f1ee9..000000000
--- a/tests/dictionaries_old/40condition_optional_empty/tiramisu/base.py
+++ /dev/null
@@ -1,31 +0,0 @@
-from importlib.machinery import SourceFileLoader as _SourceFileLoader
-from importlib.util import spec_from_loader as _spec_from_loader, module_from_spec as _module_from_spec
-class func:
-    pass
-
-def _load_functions(path):
-    global _SourceFileLoader, _spec_from_loader, _module_from_spec, func
-    loader = _SourceFileLoader('func', path)
-    spec = _spec_from_loader(loader.name, loader)
-    func_ = _module_from_spec(spec)
-    loader.exec_module(func_)
-    for function in dir(func_):
-        if function.startswith('_'):
-            continue
-        setattr(func, function, getattr(func_, function))
-_load_functions('tests/dictionaries_old/../eosfunc/test.py')
-try:
-    from tiramisu4 import *
-    from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES
-except:
-    from tiramisu import *
-    from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
-ALLOWED_LEADER_PROPERTIES.add("basic")
-ALLOWED_LEADER_PROPERTIES.add("normal")
-ALLOWED_LEADER_PROPERTIES.add("expert")
-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"}))
-optiondescription_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
-optiondescription_1 = OptionDescription(name="rougail", doc="rougail", children=[optiondescription_2], properties=frozenset({"normal"}))
-option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1])
diff --git a/tests/dictionaries_old/40condition_optional_empty/tiramisu/multi.py b/tests/dictionaries_old/40condition_optional_empty/tiramisu/multi.py
deleted file mode 100644
index 77b1954e0..000000000
--- a/tests/dictionaries_old/40condition_optional_empty/tiramisu/multi.py
+++ /dev/null
@@ -1,38 +0,0 @@
-from importlib.machinery import SourceFileLoader as _SourceFileLoader
-from importlib.util import spec_from_loader as _spec_from_loader, module_from_spec as _module_from_spec
-class func:
-    pass
-
-def _load_functions(path):
-    global _SourceFileLoader, _spec_from_loader, _module_from_spec, func
-    loader = _SourceFileLoader('func', path)
-    spec = _spec_from_loader(loader.name, loader)
-    func_ = _module_from_spec(spec)
-    loader.exec_module(func_)
-    for function in dir(func_):
-        if function.startswith('_'):
-            continue
-        setattr(func, function, getattr(func_, function))
-_load_functions('tests/dictionaries/../eosfunc/test.py')
-try:
-    from tiramisu4 import *
-    from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES
-except:
-    from tiramisu import *
-    from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
-ALLOWED_LEADER_PROPERTIES.add("basic")
-ALLOWED_LEADER_PROPERTIES.add("normal")
-ALLOWED_LEADER_PROPERTIES.add("expert")
-option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
-option_3 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
-option_4 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
-optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4], properties=frozenset({"normal"}))
-optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"}))
-optiondescription_9 = OptionDescription(name="1", doc="1", children=[optiondescription_10])
-option_6 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
-option_7 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
-option_8 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
-optiondescription_5 = OptionDescription(name="general", doc="general", children=[option_6, option_7, option_8], properties=frozenset({"normal"}))
-optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5], properties=frozenset({"normal"}))
-optiondescription_11 = OptionDescription(name="2", doc="2", children=[optiondescription_12])
-option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_9, optiondescription_11])
diff --git a/tests/dictionaries_old/40condition_optional_empty/xml/00-base.xml b/tests/dictionaries_old/40condition_optional_empty/xml/00-base.xml
deleted file mode 100644
index 99c10ad6b..000000000
--- a/tests/dictionaries_old/40condition_optional_empty/xml/00-base.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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>
-      <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/yml/00-base.yml b/tests/dictionaries_old/40condition_optional_empty/yml/00-base.yml
deleted file mode 100644
index 6a113b30e..000000000
--- a/tests/dictionaries_old/40condition_optional_empty/yml/00-base.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-version: '0.10'
-variables:
-- family:
-  - name: general
-    variables:
-    - variable:
-      - name: mode_conteneur_actif
-        type: string
-        description: No change
-        value:
-        - text: non
-      - name: condition
-        type: string
-        description: No change
-        value:
-        - text: non
-      - name: mode_conteneur_actif1
-        type: string
-        description: No change
-        value:
-        - text: non
-constraints:
-- condition:
-  - optional: true
-    name: disabled_if_in
-    source: condition
-    param:
-    - text: oui
-    target:
-    - type: variable
-      optional: true
-      text: mode_conteneur_actif2
diff --git a/tests/dictionaries_old/40condition_optional_family/result/rougail/00-base.yml b/tests/dictionaries_old/40condition_optional_family/result/rougail/00-base.yml
index e82011933..601e41e6b 100644
--- a/tests/dictionaries_old/40condition_optional_family/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/40condition_optional_family/result/rougail/00-base.yml
@@ -1,3 +1,4 @@
+version: 1.1
 condition:
   type: boolean
 general:
@@ -6,4 +7,3 @@ general:
   disabled:
     type: jinja
     jinja: '{% if rougail.condition == true %}disabled{% endif %}'
-version: '1.1'
diff --git a/tests/dictionaries_old/40empty_param/result/rougail/00_base.yml b/tests/dictionaries_old/40empty_param/result/rougail/00_base.yml
index 13018afb3..f26cb8ea1 100644
--- a/tests/dictionaries_old/40empty_param/result/rougail/00_base.yml
+++ b/tests/dictionaries_old/40empty_param/result/rougail/00_base.yml
@@ -1,10 +1,10 @@
+version: 1.1
 proxy_authentifie:
   description: proxy authentifié
   toto1:
     type: port
     description: Port d'écoute du proxy
     mode: advanced
-    mandatory: false
     default:
       type: jinja
       jinja: '{{ null | calc_multi_condition }}'
@@ -13,4 +13,3 @@ proxy_authentifie:
     description: Port d'écoute du proxy NTLM
     mode: advanced
     default: '3127'
-version: '1.1'
diff --git a/tests/dictionaries_old/40empty_param2/result/rougail/00_base.yml b/tests/dictionaries_old/40empty_param2/result/rougail/00_base.yml
index 13018afb3..f26cb8ea1 100644
--- a/tests/dictionaries_old/40empty_param2/result/rougail/00_base.yml
+++ b/tests/dictionaries_old/40empty_param2/result/rougail/00_base.yml
@@ -1,10 +1,10 @@
+version: 1.1
 proxy_authentifie:
   description: proxy authentifié
   toto1:
     type: port
     description: Port d'écoute du proxy
     mode: advanced
-    mandatory: false
     default:
       type: jinja
       jinja: '{{ null | calc_multi_condition }}'
@@ -13,4 +13,3 @@ proxy_authentifie:
     description: Port d'écoute du proxy NTLM
     mode: advanced
     default: '3127'
-version: '1.1'
diff --git a/tests/dictionaries_old/40hidden_if_in_leadership_fallback/result/rougail/00-base.yml b/tests/dictionaries_old/40hidden_if_in_leadership_fallback/result/rougail/00-base.yml
index 523e4301a..e5d7f4255 100644
--- a/tests/dictionaries_old/40hidden_if_in_leadership_fallback/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/40hidden_if_in_leadership_fallback/result/rougail/00-base.yml
@@ -1,22 +1,18 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: No change
     default: non
   mode_conteneur_actif1:
     description: No change
     type: leadership
     mode_conteneur_actif1:
-      type: string
       description: No change
-      multi: true
       default:
       - non
       hidden:
         type: jinja
-        jinja: '{% if __condition == "oui" %}hidden{% endif %}'
+        jinja: '{% if condition == "oui" %}hidden{% endif %}'
     mode_conteneur_actif2:
-      type: string
       description: No change
       default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/40ifin_leadership/result/rougail/00-base.yml b/tests/dictionaries_old/40ifin_leadership/result/rougail/00-base.yml
index 2427e2ced..cb417e0ff 100644
--- a/tests/dictionaries_old/40ifin_leadership/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/40ifin_leadership/result/rougail/00-base.yml
@@ -1,10 +1,9 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: No change
     default: non
   condition:
-    type: string
     description: condition
     default: oui
   leader:
@@ -26,4 +25,3 @@ general:
       type: string
       description: follower2
       mandatory: false
-version: '1.1'
diff --git a/tests/dictionaries_old/40ifin_leadershipauto/result/rougail/00-base.yml b/tests/dictionaries_old/40ifin_leadershipauto/result/rougail/00-base.yml
index 8a28f7bc5..f7b243e1d 100644
--- a/tests/dictionaries_old/40ifin_leadershipauto/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/40ifin_leadershipauto/result/rougail/00-base.yml
@@ -1,26 +1,22 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: No change
     default: non
   condition:
-    type: string
     description: condition
     default: oui
   leader:
     description: leader
     type: leadership
     leader:
-      type: string
       description: leader
-      multi: true
       default:
       - a
     follower1:
       type: string
       description: follower1
       hidden: true
-      mandatory: false
       disabled:
         type: jinja
         jinja: '{% if rougail.general.condition == "oui" %}disabled{% endif %}'
@@ -31,4 +27,3 @@ general:
       type: string
       description: follower2
       mandatory: false
-version: '1.1'
diff --git a/tests/dictionaries_old/40ifin_leadershipauto/result/services/00-base.yml b/tests/dictionaries_old/40ifin_leadershipauto/result/services/00-base.yml
deleted file mode 100644
index 39c1202b2..000000000
--- a/tests/dictionaries_old/40ifin_leadershipauto/result/services/00-base.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-test.service:
-  files:
-    /etc/mailname: {}
-version: '1.1'
diff --git a/tests/dictionaries_old/40ifin_leadershipauto_follower/result/rougail/00-base.yml b/tests/dictionaries_old/40ifin_leadershipauto_follower/result/rougail/00-base.yml
index 6c5628c7c..cb7a2292e 100644
--- a/tests/dictionaries_old/40ifin_leadershipauto_follower/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/40ifin_leadershipauto_follower/result/rougail/00-base.yml
@@ -1,26 +1,22 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: No change
     default: non
   condition:
-    type: string
     description: condition
     default: oui
   leader:
     description: leader
     type: leadership
     leader:
-      type: string
       description: leader
-      multi: true
       default:
       - a
       - b
     follower1:
       type: string
       description: follower1
-      mandatory: false
       disabled:
         type: jinja
         jinja: '{% if rougail.general.leader.leader == "a" %}disabled{% endif %}'
@@ -31,4 +27,3 @@ general:
       type: string
       description: follower2
       mandatory: false
-version: '1.1'
diff --git a/tests/dictionaries_old/40ifin_leadershipauto_follower/result/services/00-base.yml b/tests/dictionaries_old/40ifin_leadershipauto_follower/result/services/00-base.yml
deleted file mode 100644
index e5c757d5f..000000000
--- a/tests/dictionaries_old/40ifin_leadershipauto_follower/result/services/00-base.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-test.service:
-  files:
-    /etc/mailname: {}
-    /etc/mailname2:
-      engine: jinja
-version: '1.1'
diff --git a/tests/dictionaries_old/40ifin_multi/result/rougail/00-base.yml b/tests/dictionaries_old/40ifin_multi/result/rougail/00-base.yml
index 370cf4d5a..cb1ec1862 100644
--- a/tests/dictionaries_old/40ifin_multi/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/40ifin_multi/result/rougail/00-base.yml
@@ -1,22 +1,19 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: No change
     hidden: true
     default: non
 general2:
   hidden: true
   mode_conteneur_actif2:
-    type: string
     description: No change
     hidden: true
     default: non
   mode_conteneur_actif3:
-    type: string
     description: No change
     default: non
     disabled:
       type: jinja
       jinja: '{% if rougail.general2.mode_conteneur_actif2 == "oui" %}disabled{% endif
         %}'
-version: '1.1'
diff --git a/tests/dictionaries_old/40ifin_multi2/result/rougail/00-base.yml b/tests/dictionaries_old/40ifin_multi2/result/rougail/00-base.yml
index b5dd7ec89..f236fd782 100644
--- a/tests/dictionaries_old/40ifin_multi2/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/40ifin_multi2/result/rougail/00-base.yml
@@ -1,22 +1,19 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: No change
     hidden: true
     default: non
 general2:
   hidden: true
   mode_conteneur_actif2:
-    type: string
     description: No change
     hidden: true
     default: oui
   mode_conteneur_actif3:
-    type: string
     description: No change
     default: non
     disabled:
       type: jinja
       jinja: '{% if rougail.general2.mode_conteneur_actif2 == "oui" %}disabled{% endif
         %}'
-version: '1.1'
diff --git a/tests/dictionaries_old/40ifin_validenum/result/rougail/00-base.yml b/tests/dictionaries_old/40ifin_validenum/result/rougail/00-base.yml
index 326b78452..c6aecc156 100644
--- a/tests/dictionaries_old/40ifin_validenum/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/40ifin_validenum/result/rougail/00-base.yml
@@ -1,6 +1,6 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: No change
     default: non
     disabled:
@@ -10,7 +10,6 @@ general:
 general2:
   hidden: true
   mode_conteneur_actif2:
-    type: string
     description: No change
     default: non
     disabled:
@@ -25,4 +24,3 @@ general2:
     - a
     - b
     - c
-version: '1.1'
diff --git a/tests/dictionaries_old/40space_param/result/rougail/00_base.yml b/tests/dictionaries_old/40space_param/result/rougail/00_base.yml
index 12fb3a826..4f9dc143b 100644
--- a/tests/dictionaries_old/40space_param/result/rougail/00_base.yml
+++ b/tests/dictionaries_old/40space_param/result/rougail/00_base.yml
@@ -1,10 +1,10 @@
+version: 1.1
 proxy_authentifie:
   description: proxy authentifié
   toto1:
     type: port
     description: Port d'écoute du proxy
     mode: advanced
-    mandatory: false
     default:
       type: jinja
       jinja: '{{ " " | calc_multi_condition }}'
@@ -13,4 +13,3 @@ proxy_authentifie:
     description: Port d'écoute du proxy NTLM
     mode: advanced
     default: '3127'
-version: '1.1'
diff --git a/tests/dictionaries_old/45extra_without_family/result/extra/00-base.yml b/tests/dictionaries_old/45extra_without_family/result/extra/extra/00-base.yml
similarity index 74%
rename from tests/dictionaries_old/45extra_without_family/result/extra/00-base.yml
rename to tests/dictionaries_old/45extra_without_family/result/extra/extra/00-base.yml
index b4813db63..905c98825 100644
--- a/tests/dictionaries_old/45extra_without_family/result/extra/00-base.yml
+++ b/tests/dictionaries_old/45extra_without_family/result/extra/extra/00-base.yml
@@ -1,7 +1,6 @@
+version: 1.1
 my_var:
   type: string
-  mandatory: false
   default:
     type: jinja
     jinja: '{{ "non" | calc_multi_condition }}'
-version: '1.1'
diff --git a/tests/dictionaries_old/45extra_without_family/result/rougail/00-base.yml b/tests/dictionaries_old/45extra_without_family/result/rougail/00-base.yml
index 7c437bd54..93f7a7ce9 100644
--- a/tests/dictionaries_old/45extra_without_family/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/45extra_without_family/result/rougail/00-base.yml
@@ -1,3 +1,3 @@
+version: 1.1
 my_var:
   default: rougail
-version: '1.1'
diff --git a/tests/dictionaries_old/45extra_without_family/result/services/00-base.yml b/tests/dictionaries_old/45extra_without_family/result/services/00-base.yml
deleted file mode 100644
index e6c55cbb1..000000000
--- a/tests/dictionaries_old/45extra_without_family/result/services/00-base.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-test.service:
-  files:
-    /etc/file: {}
-version: '1.1'
diff --git a/tests/dictionaries_old/45multi_family/result/rougail/00-base.yml b/tests/dictionaries_old/45multi_family/result/rougail/00-base.yml
index 21729dc0c..c8a3a8018 100644
--- a/tests/dictionaries_old/45multi_family/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/45multi_family/result/rougail/00-base.yml
@@ -1,5 +1,5 @@
+version: 1.1
 base:
   subfamily:
     variable:
       mandatory: false
-version: '1.1'
diff --git a/tests/dictionaries_old/45multi_family_basic/result/rougail/00-base.yml b/tests/dictionaries_old/45multi_family_basic/result/rougail/00-base.yml
index 27cb1b9d5..0654dddfc 100644
--- a/tests/dictionaries_old/45multi_family_basic/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/45multi_family_basic/result/rougail/00-base.yml
@@ -1,6 +1,6 @@
+version: 1.1
 base:
   subfamily:
     variable:
       mode: basic
       mandatory: false
-version: '1.1'
diff --git a/tests/dictionaries_old/45multi_family_expert/result/rougail/00-base.yml b/tests/dictionaries_old/45multi_family_expert/result/rougail/00-base.yml
index 6fa19ef72..b03ee2453 100644
--- a/tests/dictionaries_old/45multi_family_expert/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/45multi_family_expert/result/rougail/00-base.yml
@@ -1,6 +1,6 @@
+version: 1.1
 base:
   mode: advanced
   subfamily:
     variable:
       mandatory: false
-version: '1.1'
diff --git a/tests/dictionaries_old/45multi_family_order/result/rougail/00-base.yml b/tests/dictionaries_old/45multi_family_order/result/rougail/00-base.yml
index b99b8ae88..aa05e315f 100644
--- a/tests/dictionaries_old/45multi_family_order/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/45multi_family_order/result/rougail/00-base.yml
@@ -1,3 +1,4 @@
+version: 1.1
 variable1:
   mandatory: false
 base:
@@ -8,4 +9,3 @@ base:
       mandatory: false
   variable4:
     mandatory: false
-version: '1.1'
diff --git a/tests/dictionaries_old/45without_family/result/rougail/00-base.yml b/tests/dictionaries_old/45without_family/result/rougail/00-base.yml
index 061246208..6d2ace5a9 100644
--- a/tests/dictionaries_old/45without_family/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/45without_family/result/rougail/00-base.yml
@@ -1,3 +1,3 @@
+version: 1.1
 variable:
   mandatory: false
-version: '1.1'
diff --git a/tests/dictionaries_old/50exists_exists/result/rougail/00-base.yml b/tests/dictionaries_old/50exists_exists/result/rougail/00-base.yml
index 69551e928..dd2c7a593 100644
--- a/tests/dictionaries_old/50exists_exists/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/50exists_exists/result/rougail/00-base.yml
@@ -1,7 +1,6 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: Description
     hidden: true
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/50exists_exists/result/rougail/01-base.yml b/tests/dictionaries_old/50exists_exists/result/rougail/01-base.yml
index e367e62c4..80894918b 100644
--- a/tests/dictionaries_old/50exists_exists/result/rougail/01-base.yml
+++ b/tests/dictionaries_old/50exists_exists/result/rougail/01-base.yml
@@ -1,7 +1,6 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: New description
     exists: false
     default: oui
-version: '1.1'
diff --git a/tests/dictionaries_old/50redefine_description/result/rougail/00-base.yml b/tests/dictionaries_old/50redefine_description/result/rougail/00-base.yml
index afada5552..3942839b2 100644
--- a/tests/dictionaries_old/50redefine_description/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/50redefine_description/result/rougail/00-base.yml
@@ -1,7 +1,6 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: Redefine description
     hidden: true
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/50redefine_description/result/rougail/01-redefine.yml b/tests/dictionaries_old/50redefine_description/result/rougail/01-redefine.yml
index 57bed7d3b..044c3ea44 100644
--- a/tests/dictionaries_old/50redefine_description/result/rougail/01-redefine.yml
+++ b/tests/dictionaries_old/50redefine_description/result/rougail/01-redefine.yml
@@ -1,5 +1,5 @@
+version: 1.1
 general:
   mode_conteneur_actif:
     redefine: true
     description: Redefined
-version: '1.1'
diff --git a/tests/dictionaries_old/51exists_nonexists/result/rougail/00-base.yml b/tests/dictionaries_old/51exists_nonexists/result/rougail/00-base.yml
index 166911aef..dd345afa3 100644
--- a/tests/dictionaries_old/51exists_nonexists/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/51exists_nonexists/result/rougail/00-base.yml
@@ -1,11 +1,9 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: Description
     default: non
   mode_conteneur_actif1:
-    type: string
     description: Description
     hidden: true
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/51exists_nonexists/result/rougail/01-base.yml b/tests/dictionaries_old/51exists_nonexists/result/rougail/01-base.yml
index 7737eec74..c402eda03 100644
--- a/tests/dictionaries_old/51exists_nonexists/result/rougail/01-base.yml
+++ b/tests/dictionaries_old/51exists_nonexists/result/rougail/01-base.yml
@@ -1,7 +1,6 @@
+version: 1.1
 general:
   mode_conteneur_actif2:
-    type: string
     description: New description
     exists: false
     default: oui
-version: '1.1'
diff --git a/tests/dictionaries_old/51exists_redefine/result/rougail/00-base.yml b/tests/dictionaries_old/51exists_redefine/result/rougail/00-base.yml
index 69551e928..dd2c7a593 100644
--- a/tests/dictionaries_old/51exists_redefine/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/51exists_redefine/result/rougail/00-base.yml
@@ -1,7 +1,6 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: Description
     hidden: true
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/51exists_redefine/result/rougail/01-base.yml b/tests/dictionaries_old/51exists_redefine/result/rougail/01-base.yml
index f53e5ac9e..1c4a81e8e 100644
--- a/tests/dictionaries_old/51exists_redefine/result/rougail/01-base.yml
+++ b/tests/dictionaries_old/51exists_redefine/result/rougail/01-base.yml
@@ -1,3 +1,4 @@
+version: 1.1
 general:
   mode_conteneur_actif:
     redefine: true
@@ -7,4 +8,3 @@ general:
     redefine: true
     exists: true
     default: oui
-version: '1.1'
diff --git a/tests/dictionaries_old/51redefine_auto/result/rougail/00-base.yml b/tests/dictionaries_old/51redefine_auto/result/rougail/00-base.yml
index 8a5afe519..c87a6593c 100644
--- a/tests/dictionaries_old/51redefine_auto/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/51redefine_auto/result/rougail/00-base.yml
@@ -1,3 +1,4 @@
+version: 1.1
 general:
   mode_conteneur_actif:
     type: string
@@ -6,4 +7,3 @@ general:
     default:
       type: jinja
       jinja: '{{ "non" | calc_val }}'
-version: '1.1'
diff --git a/tests/dictionaries_old/51redefine_auto/result/rougail/01-base.yml b/tests/dictionaries_old/51redefine_auto/result/rougail/01-base.yml
index e4e0d1638..ff2979098 100644
--- a/tests/dictionaries_old/51redefine_auto/result/rougail/01-base.yml
+++ b/tests/dictionaries_old/51redefine_auto/result/rougail/01-base.yml
@@ -1,7 +1,7 @@
+version: 1.1
 general:
   mode_conteneur_actif:
     redefine: true
     default:
       type: jinja
       jinja: '{{ "non" | concat }}'
-version: '1.1'
diff --git a/tests/dictionaries_old/51redefine_autofill/result/rougail/00-base.yml b/tests/dictionaries_old/51redefine_autofill/result/rougail/00-base.yml
index dc894c589..8f433410d 100644
--- a/tests/dictionaries_old/51redefine_autofill/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/51redefine_autofill/result/rougail/00-base.yml
@@ -1,3 +1,4 @@
+version: 1.1
 general:
   mode_conteneur_actif:
     type: string
@@ -6,4 +7,3 @@ general:
     default:
       type: jinja
       jinja: '{{ "oui" | calc_val }}'
-version: '1.1'
diff --git a/tests/dictionaries_old/51redefine_autofill/result/rougail/01-base.yml b/tests/dictionaries_old/51redefine_autofill/result/rougail/01-base.yml
index a8447c859..eb2422262 100644
--- a/tests/dictionaries_old/51redefine_autofill/result/rougail/01-base.yml
+++ b/tests/dictionaries_old/51redefine_autofill/result/rougail/01-base.yml
@@ -1,3 +1,4 @@
+version: 1.1
 general:
   mode_conteneur_actif:
     redefine: true
@@ -5,4 +6,3 @@ general:
     default:
       type: jinja
       jinja: '{{ "non" | concat }}'
-version: '1.1'
diff --git a/tests/dictionaries_old/51redefine_family/result/rougail/00-base.yml b/tests/dictionaries_old/51redefine_family/result/rougail/00-base.yml
index 06c28ff1b..010ba3204 100644
--- a/tests/dictionaries_old/51redefine_family/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/51redefine_family/result/rougail/00-base.yml
@@ -1,13 +1,12 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: No change
     hidden: true
     default: non
 general2:
   hidden: true
   mode_conteneur_actif2:
-    type: string
     description: No change
     hidden: true
     default: non
@@ -15,4 +14,3 @@ general2:
     type: jinja
     jinja: '{% if rougail.general.mode_conteneur_actif == "oui" %}disabled{% endif
       %}'
-version: '1.1'
diff --git a/tests/dictionaries_old/51redefine_family/result/rougail/01-base.yml b/tests/dictionaries_old/51redefine_family/result/rougail/01-base.yml
index 584239f38..a241ae4b6 100644
--- a/tests/dictionaries_old/51redefine_family/result/rougail/01-base.yml
+++ b/tests/dictionaries_old/51redefine_family/result/rougail/01-base.yml
@@ -1,5 +1,5 @@
+version: 1.1
 general:
   mode_conteneur_actif:
     redefine: true
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/51redefine_fill/result/rougail/00-base.yml b/tests/dictionaries_old/51redefine_fill/result/rougail/00-base.yml
index dc894c589..8f433410d 100644
--- a/tests/dictionaries_old/51redefine_fill/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/51redefine_fill/result/rougail/00-base.yml
@@ -1,3 +1,4 @@
+version: 1.1
 general:
   mode_conteneur_actif:
     type: string
@@ -6,4 +7,3 @@ general:
     default:
       type: jinja
       jinja: '{{ "oui" | calc_val }}'
-version: '1.1'
diff --git a/tests/dictionaries_old/51redefine_fill/result/rougail/01-base.yml b/tests/dictionaries_old/51redefine_fill/result/rougail/01-base.yml
index e4e0d1638..ff2979098 100644
--- a/tests/dictionaries_old/51redefine_fill/result/rougail/01-base.yml
+++ b/tests/dictionaries_old/51redefine_fill/result/rougail/01-base.yml
@@ -1,7 +1,7 @@
+version: 1.1
 general:
   mode_conteneur_actif:
     redefine: true
     default:
       type: jinja
       jinja: '{{ "non" | concat }}'
-version: '1.1'
diff --git a/tests/dictionaries_old/51redefine_fillauto/result/rougail/00-base.yml b/tests/dictionaries_old/51redefine_fillauto/result/rougail/00-base.yml
index bd5b136e3..d6390b017 100644
--- a/tests/dictionaries_old/51redefine_fillauto/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/51redefine_fillauto/result/rougail/00-base.yml
@@ -1,3 +1,4 @@
+version: 1.1
 general:
   mode_conteneur_actif:
     type: string
@@ -5,4 +6,3 @@ general:
     default:
       type: jinja
       jinja: '{{ "oui" | calc_val }}'
-version: '1.1'
diff --git a/tests/dictionaries_old/51redefine_fillauto/result/rougail/01-base.yml b/tests/dictionaries_old/51redefine_fillauto/result/rougail/01-base.yml
index eb5d3828e..40b73f8fc 100644
--- a/tests/dictionaries_old/51redefine_fillauto/result/rougail/01-base.yml
+++ b/tests/dictionaries_old/51redefine_fillauto/result/rougail/01-base.yml
@@ -1,3 +1,4 @@
+version: 1.1
 general:
   mode_conteneur_actif:
     redefine: true
@@ -5,4 +6,3 @@ general:
     default:
       type: jinja
       jinja: '{{ "non" | concat }}'
-version: '1.1'
diff --git a/tests/dictionaries_old/51redefine_help/result/rougail/00-base.yml b/tests/dictionaries_old/51redefine_help/result/rougail/00-base.yml
index 7e702d417..9d65c053c 100644
--- a/tests/dictionaries_old/51redefine_help/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/51redefine_help/result/rougail/00-base.yml
@@ -1,9 +1,8 @@
+version: 1.1
 general:
   help: redefine help family
   mode_conteneur_actif:
-    type: string
     description: redefine help
     hidden: true
     help: redefine help
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/51redefine_help/result/rougail/01-base.yml b/tests/dictionaries_old/51redefine_help/result/rougail/01-base.yml
index 3eb540d1a..1738b44a2 100644
--- a/tests/dictionaries_old/51redefine_help/result/rougail/01-base.yml
+++ b/tests/dictionaries_old/51redefine_help/result/rougail/01-base.yml
@@ -1,3 +1,4 @@
+version: 1.1
 general:
   redefine: true
   help: redefine help family ok
@@ -6,4 +7,3 @@ general:
     hidden: true
     help: redefine help ok
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/51redefine_hidden/result/rougail/00-base.yml b/tests/dictionaries_old/51redefine_hidden/result/rougail/00-base.yml
index 983d0945e..7474f4abc 100644
--- a/tests/dictionaries_old/51redefine_hidden/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/51redefine_hidden/result/rougail/00-base.yml
@@ -1,6 +1,5 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: Redefine hidden
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/51redefine_hidden/result/rougail/01-redefine.yml b/tests/dictionaries_old/51redefine_hidden/result/rougail/01-redefine.yml
index d96d15eda..ecdfb3d02 100644
--- a/tests/dictionaries_old/51redefine_hidden/result/rougail/01-redefine.yml
+++ b/tests/dictionaries_old/51redefine_hidden/result/rougail/01-redefine.yml
@@ -1,5 +1,5 @@
+version: 1.1
 general:
   mode_conteneur_actif:
     redefine: true
     hidden: true
-version: '1.1'
diff --git a/tests/dictionaries_old/51redefine_hidden_inverse/result/rougail/00-base.yml b/tests/dictionaries_old/51redefine_hidden_inverse/result/rougail/00-base.yml
index 95c2fb04d..2ef675275 100644
--- a/tests/dictionaries_old/51redefine_hidden_inverse/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/51redefine_hidden_inverse/result/rougail/00-base.yml
@@ -1,7 +1,6 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: Redefine hidden
     hidden: true
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/51redefine_hidden_inverse/result/rougail/01-redefine.yml b/tests/dictionaries_old/51redefine_hidden_inverse/result/rougail/01-redefine.yml
index 41e3af061..83e02f60f 100644
--- a/tests/dictionaries_old/51redefine_hidden_inverse/result/rougail/01-redefine.yml
+++ b/tests/dictionaries_old/51redefine_hidden_inverse/result/rougail/01-redefine.yml
@@ -1,5 +1,5 @@
+version: 1.1
 general:
   mode_conteneur_actif:
     redefine: true
     hidden: false
-version: '1.1'
diff --git a/tests/dictionaries_old/51redefine_multi/result/rougail/00-base.yml b/tests/dictionaries_old/51redefine_multi/result/rougail/00-base.yml
index afada5552..3942839b2 100644
--- a/tests/dictionaries_old/51redefine_multi/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/51redefine_multi/result/rougail/00-base.yml
@@ -1,7 +1,6 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: Redefine description
     hidden: true
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/51redefine_multi/result/rougail/01-redefine.yml b/tests/dictionaries_old/51redefine_multi/result/rougail/01-redefine.yml
index f7f1fd36a..1139bf4cc 100644
--- a/tests/dictionaries_old/51redefine_multi/result/rougail/01-redefine.yml
+++ b/tests/dictionaries_old/51redefine_multi/result/rougail/01-redefine.yml
@@ -1,7 +1,6 @@
+version: 1.1
 general:
   mode_conteneur_actif:
     redefine: true
-    multi: true
     default:
     - non
-version: '1.1'
diff --git a/tests/dictionaries_old/51redefine_remove_condition/result/rougail/00-base.yml b/tests/dictionaries_old/51redefine_remove_condition/result/rougail/00-base.yml
index 6c9d47b20..2dd3995da 100644
--- a/tests/dictionaries_old/51redefine_remove_condition/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/51redefine_remove_condition/result/rougail/00-base.yml
@@ -1,14 +1,12 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: No change
     default: non
   condition:
-    type: string
     description: No change
     default: non
   mode_conteneur_actif1:
-    type: string
     description: No change
     hidden: true
     default: non
@@ -16,8 +14,6 @@ general:
       type: jinja
       jinja: '{% if rougail.general.condition == "oui" %}disabled{% endif %}'
   mode_conteneur_actif2:
-    type: string
     description: No change
     default: non
     disabled: *id001
-version: '1.1'
diff --git a/tests/dictionaries_old/51redefine_remove_condition/result/rougail/01-base.yml b/tests/dictionaries_old/51redefine_remove_condition/result/rougail/01-base.yml
index fe288f974..5c7650448 100644
--- a/tests/dictionaries_old/51redefine_remove_condition/result/rougail/01-base.yml
+++ b/tests/dictionaries_old/51redefine_remove_condition/result/rougail/01-base.yml
@@ -1,7 +1,7 @@
+version: 1.1
 general:
   condition:
     redefine: true
     hidden: false
     disabled: false
     mandatory: false
-version: '1.1'
diff --git a/tests/dictionaries_old/51redefine_remove_condition_filelist/result/rougail/00-base.yml b/tests/dictionaries_old/51redefine_remove_condition_filelist/result/rougail/00-base.yml
index 6c9d47b20..2dd3995da 100644
--- a/tests/dictionaries_old/51redefine_remove_condition_filelist/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/51redefine_remove_condition_filelist/result/rougail/00-base.yml
@@ -1,14 +1,12 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: No change
     default: non
   condition:
-    type: string
     description: No change
     default: non
   mode_conteneur_actif1:
-    type: string
     description: No change
     hidden: true
     default: non
@@ -16,8 +14,6 @@ general:
       type: jinja
       jinja: '{% if rougail.general.condition == "oui" %}disabled{% endif %}'
   mode_conteneur_actif2:
-    type: string
     description: No change
     default: non
     disabled: *id001
-version: '1.1'
diff --git a/tests/dictionaries_old/51redefine_remove_condition_filelist/result/rougail/01-base.yml b/tests/dictionaries_old/51redefine_remove_condition_filelist/result/rougail/01-base.yml
index fe288f974..5c7650448 100644
--- a/tests/dictionaries_old/51redefine_remove_condition_filelist/result/rougail/01-base.yml
+++ b/tests/dictionaries_old/51redefine_remove_condition_filelist/result/rougail/01-base.yml
@@ -1,7 +1,7 @@
+version: 1.1
 general:
   condition:
     redefine: true
     hidden: false
     disabled: false
     mandatory: false
-version: '1.1'
diff --git a/tests/dictionaries_old/51redefine_remove_condition_filelist/result/services/00-base.yml b/tests/dictionaries_old/51redefine_remove_condition_filelist/result/services/00-base.yml
deleted file mode 100644
index 0981730b1..000000000
--- a/tests/dictionaries_old/51redefine_remove_condition_filelist/result/services/00-base.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-test.service:
-  files:
-    /etc/file:
-      disabled:
-        type: jinja
-        jinja: '{% if rougail.general.condition == "oui" %}disabled{% endif %}'
-version: '1.1'
diff --git a/tests/dictionaries_old/51redefine_removecondition_nonautofreeze/result/rougail/00-base.yml b/tests/dictionaries_old/51redefine_removecondition_nonautofreeze/result/rougail/00-base.yml
index 2ec86086c..ef72c09a1 100644
--- a/tests/dictionaries_old/51redefine_removecondition_nonautofreeze/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/51redefine_removecondition_nonautofreeze/result/rougail/00-base.yml
@@ -1,3 +1,4 @@
+version: 1.1
 my_var:
   default: no
 condition:
@@ -12,7 +13,5 @@ my_var2:
   default: no
   disabled: *id001
 server_deployed:
-  type: boolean
   hidden: true
   default: false
-version: '1.1'
diff --git a/tests/dictionaries_old/51redefine_removecondition_nonautofreeze/result/rougail/01-base.yml b/tests/dictionaries_old/51redefine_removecondition_nonautofreeze/result/rougail/01-base.yml
index ed714999d..d1c29527c 100644
--- a/tests/dictionaries_old/51redefine_removecondition_nonautofreeze/result/rougail/01-base.yml
+++ b/tests/dictionaries_old/51redefine_removecondition_nonautofreeze/result/rougail/01-base.yml
@@ -1,6 +1,6 @@
+version: 1.1
 condition:
   redefine: true
   hidden: false
   disabled: false
   mandatory: false
-version: '1.1'
diff --git a/tests/dictionaries_old/51redefine_validenum/result/rougail/00-base.yml b/tests/dictionaries_old/51redefine_validenum/result/rougail/00-base.yml
index ff07e42ec..3769b5b0b 100644
--- a/tests/dictionaries_old/51redefine_validenum/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/51redefine_validenum/result/rougail/00-base.yml
@@ -1,3 +1,4 @@
+version: 1.1
 general:
   mode_conteneur_actif:
     type: choice
@@ -8,4 +9,3 @@ general:
     - a
     - b
     - c
-version: '1.1'
diff --git a/tests/dictionaries_old/51redefine_validenum/result/rougail/01-redefine.yml b/tests/dictionaries_old/51redefine_validenum/result/rougail/01-redefine.yml
index eb205c1ef..43594e34a 100644
--- a/tests/dictionaries_old/51redefine_validenum/result/rougail/01-redefine.yml
+++ b/tests/dictionaries_old/51redefine_validenum/result/rougail/01-redefine.yml
@@ -1,3 +1,4 @@
+version: 1.1
 general:
   mode_conteneur_actif:
     redefine: true
@@ -6,4 +7,3 @@ general:
     choices:
     - a
     - b
-version: '1.1'
diff --git a/tests/dictionaries_old/51redefine_value/result/rougail/00-base.yml b/tests/dictionaries_old/51redefine_value/result/rougail/00-base.yml
index dac0d3b68..b780ac0e7 100644
--- a/tests/dictionaries_old/51redefine_value/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/51redefine_value/result/rougail/00-base.yml
@@ -1,11 +1,9 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: Redefine value
     default: non
   mode_conteneur_actif1:
-    type: string
     description: Redefine value
     hidden: true
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/51redefine_value/result/rougail/01-redefine.yml b/tests/dictionaries_old/51redefine_value/result/rougail/01-redefine.yml
index 7f8159433..c4fcdb49d 100644
--- a/tests/dictionaries_old/51redefine_value/result/rougail/01-redefine.yml
+++ b/tests/dictionaries_old/51redefine_value/result/rougail/01-redefine.yml
@@ -1,5 +1,5 @@
+version: 1.1
 general:
   mode_conteneur_actif1:
     redefine: true
     default: oui
-version: '1.1'
diff --git a/tests/dictionaries_old/51redefine_without_hidden/result/rougail/00-base.yml b/tests/dictionaries_old/51redefine_without_hidden/result/rougail/00-base.yml
index 95c2fb04d..2ef675275 100644
--- a/tests/dictionaries_old/51redefine_without_hidden/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/51redefine_without_hidden/result/rougail/00-base.yml
@@ -1,7 +1,6 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: Redefine hidden
     hidden: true
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/51redefine_without_hidden/result/rougail/01-redefine.yml b/tests/dictionaries_old/51redefine_without_hidden/result/rougail/01-redefine.yml
index 46f96ad17..bdc3f51f7 100644
--- a/tests/dictionaries_old/51redefine_without_hidden/result/rougail/01-redefine.yml
+++ b/tests/dictionaries_old/51redefine_without_hidden/result/rougail/01-redefine.yml
@@ -1,4 +1,4 @@
+version: 1.1
 general:
   mode_conteneur_actif:
     redefine: true
-version: '1.1'
diff --git a/tests/dictionaries_old/51remove_fill/result/rougail/00-base.yml b/tests/dictionaries_old/51remove_fill/result/rougail/00-base.yml
index 1dd8bb935..0a82418b1 100644
--- a/tests/dictionaries_old/51remove_fill/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/51remove_fill/result/rougail/00-base.yml
@@ -1,3 +1,4 @@
+version: 1.1
 general:
   mode_conteneur_actif:
     type: string
@@ -6,7 +7,5 @@ general:
       type: jinja
       jinja: '{{ rougail.general.mode_conteneur_actif1 | calc_val }}'
   mode_conteneur_actif1:
-    type: string
     description: No change
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/51remove_fill/result/rougail/01-base.yml b/tests/dictionaries_old/51remove_fill/result/rougail/01-base.yml
index 46f96ad17..bdc3f51f7 100644
--- a/tests/dictionaries_old/51remove_fill/result/rougail/01-base.yml
+++ b/tests/dictionaries_old/51remove_fill/result/rougail/01-base.yml
@@ -1,4 +1,4 @@
+version: 1.1
 general:
   mode_conteneur_actif:
     redefine: true
-version: '1.1'
diff --git a/tests/dictionaries_old/52exists_redefine/result/rougail/00-base.yml b/tests/dictionaries_old/52exists_redefine/result/rougail/00-base.yml
index c933faf3c..98e2a4dd0 100644
--- a/tests/dictionaries_old/52exists_redefine/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/52exists_redefine/result/rougail/00-base.yml
@@ -1,7 +1,6 @@
+version: 1.1
 general:
   mode_conteneur_actif:
-    type: string
     description: Description
     hidden: true
     default: oui
-version: '1.1'
diff --git a/tests/dictionaries_old/52exists_redefine/result/rougail/01-base.yml b/tests/dictionaries_old/52exists_redefine/result/rougail/01-base.yml
index 1c7a6eb72..dc28a4ff3 100644
--- a/tests/dictionaries_old/52exists_redefine/result/rougail/01-base.yml
+++ b/tests/dictionaries_old/52exists_redefine/result/rougail/01-base.yml
@@ -1,7 +1,7 @@
+version: 1.1
 general:
   mode_conteneur_actif:
     description: New description
     exists: false
     redefine: true
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/60action_external/result/extra/00-base.yml b/tests/dictionaries_old/60action_external/result/extra/extra/00-base.yml
similarity index 88%
rename from tests/dictionaries_old/60action_external/result/extra/00-base.yml
rename to tests/dictionaries_old/60action_external/result/extra/extra/00-base.yml
index 46806e9c1..0762c8c0a 100644
--- a/tests/dictionaries_old/60action_external/result/extra/00-base.yml
+++ b/tests/dictionaries_old/60action_external/result/extra/extra/00-base.yml
@@ -1,6 +1,6 @@
+version: 1.1
 test:
   delay:
-    type: number
     description: délai en minutes avant lancement
     default: 0
   calc_url:
@@ -10,4 +10,3 @@ test:
     default:
       type: jinja
       jinja: '{{ "http://localhost/" | calc_val }}'
-version: '1.1'
diff --git a/tests/dictionaries_old/60action_external/result/rougail/00-base.yml b/tests/dictionaries_old/60action_external/result/rougail/00-base.yml
index efac7c360..0777084bf 100644
--- a/tests/dictionaries_old/60action_external/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/60action_external/result/rougail/00-base.yml
@@ -1,8 +1,7 @@
+version: 1.1
 general:
   description: général
   mode_conteneur_actif:
-    type: string
     description: No change
     hidden: true
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/60extra_basic/result/extra/00-base.yml b/tests/dictionaries_old/60extra_basic/result/extra/extra/00-base.yml
similarity index 62%
rename from tests/dictionaries_old/60extra_basic/result/extra/00-base.yml
rename to tests/dictionaries_old/60extra_basic/result/extra/extra/00-base.yml
index 9bd356524..406a65104 100644
--- a/tests/dictionaries_old/60extra_basic/result/extra/00-base.yml
+++ b/tests/dictionaries_old/60extra_basic/result/extra/extra/00-base.yml
@@ -1,19 +1,18 @@
+version: 1.1
 ejabberd:
   description:
-    type: string
     mode: basic
     default: Exportation de la base de ejabberd
   day:
     type: choice
-    mandatory: true
     default:
       type: jinja
-      jinja: '{{ "non" | calc_multi_condition(condition_1=__activer_ejabberd, match="none",
+      jinja: '{{ "non" | calc_multi_condition(condition_1=activer_ejabberd, match="none",
         mismatch="daily") }}'
       params:
-        __activer_ejabberd:
+        activer_ejabberd:
           type: variable
-          variable: __activer_ejabberd
+          variable: activer_ejabberd
           propertyerror: false
     choices:
     - none
@@ -22,9 +21,7 @@ ejabberd:
     - monthly
   mode:
     type: choice
-    mandatory: true
     default: pre
     choices:
     - pre
     - post
-version: '1.1'
diff --git a/tests/dictionaries_old/60extra_basic/result/rougail/00-base.yml b/tests/dictionaries_old/60extra_basic/result/rougail/00-base.yml
index 21111e913..193ba45ac 100644
--- a/tests/dictionaries_old/60extra_basic/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/60extra_basic/result/rougail/00-base.yml
@@ -1,13 +1,11 @@
+version: 1.1
 general:
   description: général
   mode_conteneur_actif:
-    type: string
     description: No change
     hidden: true
     default: non
   activer_ejabberd:
-    type: string
     description: No change
     hidden: true
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/60extra_externalspacecondition/result/extra/00-base.yml b/tests/dictionaries_old/60extra_externalspacecondition/result/extra/extra/00-base.yml
similarity index 77%
rename from tests/dictionaries_old/60extra_externalspacecondition/result/extra/00-base.yml
rename to tests/dictionaries_old/60extra_externalspacecondition/result/extra/extra/00-base.yml
index d6b6ccc5e..7d8a3e120 100644
--- a/tests/dictionaries_old/60extra_externalspacecondition/result/extra/00-base.yml
+++ b/tests/dictionaries_old/60extra_externalspacecondition/result/extra/extra/00-base.yml
@@ -1,10 +1,9 @@
+version: 1.1
 ejabberd:
   description:
-    type: string
     default: Exportation de la base de ejabberd
   day:
     type: choice
-    mandatory: true
     default: none
     choices:
     - none
@@ -13,9 +12,7 @@ ejabberd:
     - monthly
   mode:
     type: choice
-    mandatory: true
     default: pre
     choices:
     - pre
     - post
-version: '1.1'
diff --git a/tests/dictionaries_old/60extra_externalspacecondition/result/extra/extra1/00-base.yml b/tests/dictionaries_old/60extra_externalspacecondition/result/extra/extra1/00-base.yml
new file mode 100644
index 000000000..0b7a8212c
--- /dev/null
+++ b/tests/dictionaries_old/60extra_externalspacecondition/result/extra/extra1/00-base.yml
@@ -0,0 +1,7 @@
+version: 1.1
+external:
+  description:
+    default: test
+  disabled:
+    type: jinja
+    jinja: '{% if extra.ejabberd.description == "non" %}disabled{% endif %}'
diff --git a/tests/dictionaries_old/60extra_externalspacecondition/result/extra1/00-base.yml b/tests/dictionaries_old/60extra_externalspacecondition/result/extra1/00-base.yml
deleted file mode 100644
index 1d3478169..000000000
--- a/tests/dictionaries_old/60extra_externalspacecondition/result/extra1/00-base.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-external:
-  description:
-    type: string
-    default: test
-  disabled:
-    type: jinja
-    jinja: '{% if __extra.ejabberd.description == "non" %}disabled{% endif %}'
-version: '1.1'
diff --git a/tests/dictionaries_old/60extra_externalspacecondition/result/rougail/00-base.yml b/tests/dictionaries_old/60extra_externalspacecondition/result/rougail/00-base.yml
index 617dd1f31..eaf7b29fd 100644
--- a/tests/dictionaries_old/60extra_externalspacecondition/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/60extra_externalspacecondition/result/rougail/00-base.yml
@@ -1,3 +1,4 @@
+version: 1.1
 general:
   description: général
   my_var:
@@ -6,7 +7,5 @@ general:
     hidden: true
     default: no
   server_deployed:
-    type: boolean
     hidden: true
     default: false
-version: '1.1'
diff --git a/tests/dictionaries_old/60extra_help/result/extra/00-base.yml b/tests/dictionaries_old/60extra_help/result/extra/extra/00-base.yml
similarity index 62%
rename from tests/dictionaries_old/60extra_help/result/extra/00-base.yml
rename to tests/dictionaries_old/60extra_help/result/extra/extra/00-base.yml
index acb8c5f32..40731357a 100644
--- a/tests/dictionaries_old/60extra_help/result/extra/00-base.yml
+++ b/tests/dictionaries_old/60extra_help/result/extra/extra/00-base.yml
@@ -1,19 +1,18 @@
+version: 1.1
 ejabberd:
   description:
-    type: string
     default: Exportation de la base de ejabberd
   day:
     type: choice
     help: Test help
-    mandatory: true
     default:
       type: jinja
-      jinja: '{{ "non" | calc_multi_condition(condition_1=__activer_ejabberd, match="none",
+      jinja: '{{ "non" | calc_multi_condition(condition_1=activer_ejabberd, match="none",
         mismatch="daily") }}'
       params:
-        __activer_ejabberd:
+        activer_ejabberd:
           type: variable
-          variable: __activer_ejabberd
+          variable: activer_ejabberd
           propertyerror: false
     choices:
     - none
@@ -22,9 +21,7 @@ ejabberd:
     - monthly
   mode:
     type: choice
-    mandatory: true
     default: pre
     choices:
     - pre
     - post
-version: '1.1'
diff --git a/tests/dictionaries_old/60extra_help/result/rougail/00-base.yml b/tests/dictionaries_old/60extra_help/result/rougail/00-base.yml
index 21111e913..193ba45ac 100644
--- a/tests/dictionaries_old/60extra_help/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/60extra_help/result/rougail/00-base.yml
@@ -1,13 +1,11 @@
+version: 1.1
 general:
   description: général
   mode_conteneur_actif:
-    type: string
     description: No change
     hidden: true
     default: non
   activer_ejabberd:
-    type: string
     description: No change
     hidden: true
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/60extra_help/result/services/00-base.yml b/tests/dictionaries_old/60extra_help/result/services/00-base.yml
deleted file mode 100644
index 39c1202b2..000000000
--- a/tests/dictionaries_old/60extra_help/result/services/00-base.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-test.service:
-  files:
-    /etc/mailname: {}
-version: '1.1'
diff --git a/tests/dictionaries_old/60extra_leadership/result/extra/00-base.yml b/tests/dictionaries_old/60extra_leadership/result/extra/extra/00-base.yml
similarity index 67%
rename from tests/dictionaries_old/60extra_leadership/result/extra/00-base.yml
rename to tests/dictionaries_old/60extra_leadership/result/extra/extra/00-base.yml
index 95cac7133..857682add 100644
--- a/tests/dictionaries_old/60extra_leadership/result/extra/00-base.yml
+++ b/tests/dictionaries_old/60extra_leadership/result/extra/extra/00-base.yml
@@ -1,13 +1,10 @@
+version: 1.1
 ejabberd:
   leadership:
     type: leadership
     _description: description
     description:
-      type: string
-      multi: true
       default:
       - test
     mode:
-      type: string
       default: pre
-version: '1.1'
diff --git a/tests/dictionaries_old/60extra_leadership/result/rougail/00-base.yml b/tests/dictionaries_old/60extra_leadership/result/rougail/00-base.yml
index 21111e913..193ba45ac 100644
--- a/tests/dictionaries_old/60extra_leadership/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/60extra_leadership/result/rougail/00-base.yml
@@ -1,13 +1,11 @@
+version: 1.1
 general:
   description: général
   mode_conteneur_actif:
-    type: string
     description: No change
     hidden: true
     default: non
   activer_ejabberd:
-    type: string
     description: No change
     hidden: true
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/60extra_leadership/result/services/00-base.yml b/tests/dictionaries_old/60extra_leadership/result/services/00-base.yml
deleted file mode 100644
index e5c757d5f..000000000
--- a/tests/dictionaries_old/60extra_leadership/result/services/00-base.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-test.service:
-  files:
-    /etc/mailname: {}
-    /etc/mailname2:
-      engine: jinja
-version: '1.1'
diff --git a/tests/dictionaries_old/60extra_leadership_name/result/extra/00-base.yml b/tests/dictionaries_old/60extra_leadership_name/result/extra/extra/00-base.yml
similarity index 66%
rename from tests/dictionaries_old/60extra_leadership_name/result/extra/00-base.yml
rename to tests/dictionaries_old/60extra_leadership_name/result/extra/extra/00-base.yml
index 96527595f..f9b466010 100644
--- a/tests/dictionaries_old/60extra_leadership_name/result/extra/00-base.yml
+++ b/tests/dictionaries_old/60extra_leadership_name/result/extra/extra/00-base.yml
@@ -1,13 +1,10 @@
+version: 1.1
 ejabberd:
   new_name:
     type: leadership
     _description: new_name
     description:
-      type: string
-      multi: true
       default:
       - test
     mode:
-      type: string
       default: pre
-version: '1.1'
diff --git a/tests/dictionaries_old/60extra_leadership_name/result/rougail/00-base.yml b/tests/dictionaries_old/60extra_leadership_name/result/rougail/00-base.yml
index 21111e913..193ba45ac 100644
--- a/tests/dictionaries_old/60extra_leadership_name/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/60extra_leadership_name/result/rougail/00-base.yml
@@ -1,13 +1,11 @@
+version: 1.1
 general:
   description: général
   mode_conteneur_actif:
-    type: string
     description: No change
     hidden: true
     default: non
   activer_ejabberd:
-    type: string
     description: No change
     hidden: true
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/60extra_leadership_name/result/services/00-base.yml b/tests/dictionaries_old/60extra_leadership_name/result/services/00-base.yml
deleted file mode 100644
index e5c757d5f..000000000
--- a/tests/dictionaries_old/60extra_leadership_name/result/services/00-base.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-test.service:
-  files:
-    /etc/mailname: {}
-    /etc/mailname2:
-      engine: jinja
-version: '1.1'
diff --git a/tests/dictionaries_old/60extra_leadership_name_item/result/extra/00-base.yml b/tests/dictionaries_old/60extra_leadership_name_item/result/extra/extra/00-base.yml
similarity index 66%
rename from tests/dictionaries_old/60extra_leadership_name_item/result/extra/00-base.yml
rename to tests/dictionaries_old/60extra_leadership_name_item/result/extra/extra/00-base.yml
index 96527595f..f9b466010 100644
--- a/tests/dictionaries_old/60extra_leadership_name_item/result/extra/00-base.yml
+++ b/tests/dictionaries_old/60extra_leadership_name_item/result/extra/extra/00-base.yml
@@ -1,13 +1,10 @@
+version: 1.1
 ejabberd:
   new_name:
     type: leadership
     _description: new_name
     description:
-      type: string
-      multi: true
       default:
       - test
     mode:
-      type: string
       default: pre
-version: '1.1'
diff --git a/tests/dictionaries_old/60extra_leadership_name_item/result/rougail/00-base.yml b/tests/dictionaries_old/60extra_leadership_name_item/result/rougail/00-base.yml
index 21111e913..193ba45ac 100644
--- a/tests/dictionaries_old/60extra_leadership_name_item/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/60extra_leadership_name_item/result/rougail/00-base.yml
@@ -1,13 +1,11 @@
+version: 1.1
 general:
   description: général
   mode_conteneur_actif:
-    type: string
     description: No change
     hidden: true
     default: non
   activer_ejabberd:
-    type: string
     description: No change
     hidden: true
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/60extra_leadership_name_item/result/services/00-base.yml b/tests/dictionaries_old/60extra_leadership_name_item/result/services/00-base.yml
deleted file mode 100644
index e5c757d5f..000000000
--- a/tests/dictionaries_old/60extra_leadership_name_item/result/services/00-base.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-test.service:
-  files:
-    /etc/mailname: {}
-    /etc/mailname2:
-      engine: jinja
-version: '1.1'
diff --git a/tests/dictionaries_old/60extra_leadership_valid_enum/result/extra/00-base.yml b/tests/dictionaries_old/60extra_leadership_valid_enum/result/extra/extra/00-base.yml
similarity index 80%
rename from tests/dictionaries_old/60extra_leadership_valid_enum/result/extra/00-base.yml
rename to tests/dictionaries_old/60extra_leadership_valid_enum/result/extra/extra/00-base.yml
index 2cfda2bf3..1f643f088 100644
--- a/tests/dictionaries_old/60extra_leadership_valid_enum/result/extra/00-base.yml
+++ b/tests/dictionaries_old/60extra_leadership_valid_enum/result/extra/extra/00-base.yml
@@ -1,10 +1,9 @@
+version: 1.1
 ejabberd:
   description:
     type: leadership
     _description: description
     description:
-      type: string
-      multi: true
       default:
       - test
     mode:
@@ -13,4 +12,3 @@ ejabberd:
       choices:
       - pre
       - post
-version: '1.1'
diff --git a/tests/dictionaries_old/60extra_leadership_valid_enum/result/rougail/00-base.yml b/tests/dictionaries_old/60extra_leadership_valid_enum/result/rougail/00-base.yml
index 21111e913..193ba45ac 100644
--- a/tests/dictionaries_old/60extra_leadership_valid_enum/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/60extra_leadership_valid_enum/result/rougail/00-base.yml
@@ -1,13 +1,11 @@
+version: 1.1
 general:
   description: général
   mode_conteneur_actif:
-    type: string
     description: No change
     hidden: true
     default: non
   activer_ejabberd:
-    type: string
     description: No change
     hidden: true
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/60extra_leadership_valid_enum/result/services/00-base.yml b/tests/dictionaries_old/60extra_leadership_valid_enum/result/services/00-base.yml
deleted file mode 100644
index e5c757d5f..000000000
--- a/tests/dictionaries_old/60extra_leadership_valid_enum/result/services/00-base.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-test.service:
-  files:
-    /etc/mailname: {}
-    /etc/mailname2:
-      engine: jinja
-version: '1.1'
diff --git a/tests/dictionaries_old/60extra_name_family/result/extra/00-base.yml b/tests/dictionaries_old/60extra_load/result/extra/extra/00-base.yml
similarity index 61%
rename from tests/dictionaries_old/60extra_name_family/result/extra/00-base.yml
rename to tests/dictionaries_old/60extra_load/result/extra/extra/00-base.yml
index 8b59e0c07..d55ab2c81 100644
--- a/tests/dictionaries_old/60extra_name_family/result/extra/00-base.yml
+++ b/tests/dictionaries_old/60extra_load/result/extra/extra/00-base.yml
@@ -1,18 +1,17 @@
+version: 1.1
 ejabberd:
   description:
-    type: string
     default: Exportation de la base de ejabberd
   day:
     type: choice
-    mandatory: true
     default:
       type: jinja
-      jinja: '{{ "non" | calc_multi_condition(condition_1=__activer_ejabberd, match="none",
+      jinja: '{{ "non" | calc_multi_condition(condition_1=activer_ejabberd, match="none",
         mismatch="daily") }}'
       params:
-        __activer_ejabberd:
+        activer_ejabberd:
           type: variable
-          variable: __activer_ejabberd
+          variable: activer_ejabberd
           propertyerror: false
     choices:
     - none
@@ -21,9 +20,7 @@ ejabberd:
     - monthly
   mode:
     type: choice
-    mandatory: true
     default: pre
     choices:
     - pre
     - post
-version: '1.1'
diff --git a/tests/dictionaries_old/60extra_load/result/rougail/00-base.yml b/tests/dictionaries_old/60extra_load/result/rougail/00-base.yml
index 21111e913..193ba45ac 100644
--- a/tests/dictionaries_old/60extra_load/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/60extra_load/result/rougail/00-base.yml
@@ -1,13 +1,11 @@
+version: 1.1
 general:
   description: général
   mode_conteneur_actif:
-    type: string
     description: No change
     hidden: true
     default: non
   activer_ejabberd:
-    type: string
     description: No change
     hidden: true
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/60extra_mandatory/result/extra/00-base.yml b/tests/dictionaries_old/60extra_mandatory/result/extra/00-base.yml
deleted file mode 100644
index 9f8727d7b..000000000
--- a/tests/dictionaries_old/60extra_mandatory/result/extra/00-base.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-ejabberd:
-  description:
-    type: string
-    default: Exportation de la base de ejabberd
-  day:
-    type: choice
-    mandatory: true
-    default:
-      type: jinja
-      jinja: '{{ "non" | calc_multi_condition(condition_1=__activer_ejabberd, match="none",
-        mismatch="daily") }}'
-      params:
-        __activer_ejabberd:
-          type: variable
-          variable: __activer_ejabberd
-          propertyerror: false
-    choices:
-    - none
-    - daily
-    - weekly
-    - monthly
-  mode:
-    type: choice
-    mandatory: true
-    default: pre
-    choices:
-    - pre
-    - post
-  var1:
-    type: string
-    mandatory: true
-version: '1.1'
diff --git a/tests/dictionaries_old/60extra_redefine/result/extra/00-base.yml b/tests/dictionaries_old/60extra_mandatory/result/extra/extra/00-base.yml
similarity index 64%
rename from tests/dictionaries_old/60extra_redefine/result/extra/00-base.yml
rename to tests/dictionaries_old/60extra_mandatory/result/extra/extra/00-base.yml
index 8b59e0c07..baeaa47f5 100644
--- a/tests/dictionaries_old/60extra_redefine/result/extra/00-base.yml
+++ b/tests/dictionaries_old/60extra_mandatory/result/extra/extra/00-base.yml
@@ -1,18 +1,17 @@
+version: 1.1
 ejabberd:
   description:
-    type: string
     default: Exportation de la base de ejabberd
   day:
     type: choice
-    mandatory: true
     default:
       type: jinja
-      jinja: '{{ "non" | calc_multi_condition(condition_1=__activer_ejabberd, match="none",
+      jinja: '{{ "non" | calc_multi_condition(condition_1=activer_ejabberd, match="none",
         mismatch="daily") }}'
       params:
-        __activer_ejabberd:
+        activer_ejabberd:
           type: variable
-          variable: __activer_ejabberd
+          variable: activer_ejabberd
           propertyerror: false
     choices:
     - none
@@ -21,9 +20,9 @@ ejabberd:
     - monthly
   mode:
     type: choice
-    mandatory: true
     default: pre
     choices:
     - pre
     - post
-version: '1.1'
+  var1:
+    type: string
diff --git a/tests/dictionaries_old/60extra_mandatory/result/rougail/00-base.yml b/tests/dictionaries_old/60extra_mandatory/result/rougail/00-base.yml
index 21111e913..193ba45ac 100644
--- a/tests/dictionaries_old/60extra_mandatory/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/60extra_mandatory/result/rougail/00-base.yml
@@ -1,13 +1,11 @@
+version: 1.1
 general:
   description: général
   mode_conteneur_actif:
-    type: string
     description: No change
     hidden: true
     default: non
   activer_ejabberd:
-    type: string
     description: No change
     hidden: true
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/60extra_load/result/extra/00-base.yml b/tests/dictionaries_old/60extra_name_family/result/extra/extra/00-base.yml
similarity index 61%
rename from tests/dictionaries_old/60extra_load/result/extra/00-base.yml
rename to tests/dictionaries_old/60extra_name_family/result/extra/extra/00-base.yml
index 8b59e0c07..d55ab2c81 100644
--- a/tests/dictionaries_old/60extra_load/result/extra/00-base.yml
+++ b/tests/dictionaries_old/60extra_name_family/result/extra/extra/00-base.yml
@@ -1,18 +1,17 @@
+version: 1.1
 ejabberd:
   description:
-    type: string
     default: Exportation de la base de ejabberd
   day:
     type: choice
-    mandatory: true
     default:
       type: jinja
-      jinja: '{{ "non" | calc_multi_condition(condition_1=__activer_ejabberd, match="none",
+      jinja: '{{ "non" | calc_multi_condition(condition_1=activer_ejabberd, match="none",
         mismatch="daily") }}'
       params:
-        __activer_ejabberd:
+        activer_ejabberd:
           type: variable
-          variable: __activer_ejabberd
+          variable: activer_ejabberd
           propertyerror: false
     choices:
     - none
@@ -21,9 +20,7 @@ ejabberd:
     - monthly
   mode:
     type: choice
-    mandatory: true
     default: pre
     choices:
     - pre
     - post
-version: '1.1'
diff --git a/tests/dictionaries_old/60extra_name_family/result/rougail/00-base.yml b/tests/dictionaries_old/60extra_name_family/result/rougail/00-base.yml
index 52bd58d8b..75f9a945f 100644
--- a/tests/dictionaries_old/60extra_name_family/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/60extra_name_family/result/rougail/00-base.yml
@@ -1,12 +1,10 @@
+version: 1.1
 extra:
   mode_conteneur_actif:
-    type: string
     description: No change
     hidden: true
     default: non
   activer_ejabberd:
-    type: string
     description: No change
     hidden: true
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/60extra_no_condition/result/extra/00-base.yml b/tests/dictionaries_old/60extra_no_condition/result/extra/extra/00-base.yml
similarity index 77%
rename from tests/dictionaries_old/60extra_no_condition/result/extra/00-base.yml
rename to tests/dictionaries_old/60extra_no_condition/result/extra/extra/00-base.yml
index d6b6ccc5e..7d8a3e120 100644
--- a/tests/dictionaries_old/60extra_no_condition/result/extra/00-base.yml
+++ b/tests/dictionaries_old/60extra_no_condition/result/extra/extra/00-base.yml
@@ -1,10 +1,9 @@
+version: 1.1
 ejabberd:
   description:
-    type: string
     default: Exportation de la base de ejabberd
   day:
     type: choice
-    mandatory: true
     default: none
     choices:
     - none
@@ -13,9 +12,7 @@ ejabberd:
     - monthly
   mode:
     type: choice
-    mandatory: true
     default: pre
     choices:
     - pre
     - post
-version: '1.1'
diff --git a/tests/dictionaries_old/60extra_no_condition/result/rougail/00-base.yml b/tests/dictionaries_old/60extra_no_condition/result/rougail/00-base.yml
index 2a59d9b96..9aa59a8f8 100644
--- a/tests/dictionaries_old/60extra_no_condition/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/60extra_no_condition/result/rougail/00-base.yml
@@ -1,17 +1,14 @@
+version: 1.1
 general:
   description: général
   mode_conteneur_actif:
-    type: string
     description: No change
     default: non
   activer_ejabberd:
-    type: string
     description: No change
     hidden: true
     default: non
   module_instancie:
-    type: string
     description: No change
     hidden: true
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/60extra_redefine/result/extra/extra/00-base.yml b/tests/dictionaries_old/60extra_redefine/result/extra/extra/00-base.yml
new file mode 100644
index 000000000..d55ab2c81
--- /dev/null
+++ b/tests/dictionaries_old/60extra_redefine/result/extra/extra/00-base.yml
@@ -0,0 +1,26 @@
+version: 1.1
+ejabberd:
+  description:
+    default: Exportation de la base de ejabberd
+  day:
+    type: choice
+    default:
+      type: jinja
+      jinja: '{{ "non" | calc_multi_condition(condition_1=activer_ejabberd, match="none",
+        mismatch="daily") }}'
+      params:
+        activer_ejabberd:
+          type: variable
+          variable: activer_ejabberd
+          propertyerror: false
+    choices:
+    - none
+    - daily
+    - weekly
+    - monthly
+  mode:
+    type: choice
+    default: pre
+    choices:
+    - pre
+    - post
diff --git a/tests/dictionaries_old/60extra_redefine/result/extra/01-redefine.yml b/tests/dictionaries_old/60extra_redefine/result/extra/extra/01-redefine.yml
similarity index 80%
rename from tests/dictionaries_old/60extra_redefine/result/extra/01-redefine.yml
rename to tests/dictionaries_old/60extra_redefine/result/extra/extra/01-redefine.yml
index 1944e2fcb..082606a9f 100644
--- a/tests/dictionaries_old/60extra_redefine/result/extra/01-redefine.yml
+++ b/tests/dictionaries_old/60extra_redefine/result/extra/extra/01-redefine.yml
@@ -1,5 +1,5 @@
+version: 1.1
 ejabberd:
   description:
     redefine: true
     hidden: true
-version: '1.1'
diff --git a/tests/dictionaries_old/60extra_redefine/result/rougail/00-base.yml b/tests/dictionaries_old/60extra_redefine/result/rougail/00-base.yml
index 21111e913..193ba45ac 100644
--- a/tests/dictionaries_old/60extra_redefine/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/60extra_redefine/result/rougail/00-base.yml
@@ -1,13 +1,11 @@
+version: 1.1
 general:
   description: général
   mode_conteneur_actif:
-    type: string
     description: No change
     hidden: true
     default: non
   activer_ejabberd:
-    type: string
     description: No change
     hidden: true
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/60extra_variable_name_extra/result/extra/00-base.yml b/tests/dictionaries_old/60extra_variable_name_extra/result/extra/extra/00-base.yml
similarity index 63%
rename from tests/dictionaries_old/60extra_variable_name_extra/result/extra/00-base.yml
rename to tests/dictionaries_old/60extra_variable_name_extra/result/extra/extra/00-base.yml
index 5b62b1aee..2bcda9d2b 100644
--- a/tests/dictionaries_old/60extra_variable_name_extra/result/extra/00-base.yml
+++ b/tests/dictionaries_old/60extra_variable_name_extra/result/extra/extra/00-base.yml
@@ -1,3 +1,3 @@
+version: 1.1
 extra:
   mandatory: false
-version: '1.1'
diff --git a/tests/dictionaries_old/60extra_variable_name_extra/result/rougail/00-base.yml b/tests/dictionaries_old/60extra_variable_name_extra/result/rougail/00-base.yml
index 21111e913..193ba45ac 100644
--- a/tests/dictionaries_old/60extra_variable_name_extra/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/60extra_variable_name_extra/result/rougail/00-base.yml
@@ -1,13 +1,11 @@
+version: 1.1
 general:
   description: général
   mode_conteneur_actif:
-    type: string
     description: No change
     hidden: true
     default: non
   activer_ejabberd:
-    type: string
     description: No change
     hidden: true
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/60familyaction/result/extra/00-base.yml b/tests/dictionaries_old/60familyaction/result/extra/extra/00-base.yml
similarity index 71%
rename from tests/dictionaries_old/60familyaction/result/extra/00-base.yml
rename to tests/dictionaries_old/60familyaction/result/extra/extra/00-base.yml
index 323643d47..6550d13dd 100644
--- a/tests/dictionaries_old/60familyaction/result/extra/00-base.yml
+++ b/tests/dictionaries_old/60familyaction/result/extra/extra/00-base.yml
@@ -1,6 +1,5 @@
+version: 1.1
 test:
   delay:
-    type: number
     description: délai en minutes avant lancement
     default: 0
-version: '1.1'
diff --git a/tests/dictionaries_old/60familyaction/result/rougail/00-base.yml b/tests/dictionaries_old/60familyaction/result/rougail/00-base.yml
index efac7c360..0777084bf 100644
--- a/tests/dictionaries_old/60familyaction/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/60familyaction/result/rougail/00-base.yml
@@ -1,8 +1,7 @@
+version: 1.1
 general:
   description: général
   mode_conteneur_actif:
-    type: string
     description: No change
     hidden: true
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/60familyaction_mandatory/result/extra/00-base.yml b/tests/dictionaries_old/60familyaction_mandatory/result/extra/extra/00-base.yml
similarity index 73%
rename from tests/dictionaries_old/60familyaction_mandatory/result/extra/00-base.yml
rename to tests/dictionaries_old/60familyaction_mandatory/result/extra/extra/00-base.yml
index eb56b1414..fda826078 100644
--- a/tests/dictionaries_old/60familyaction_mandatory/result/extra/00-base.yml
+++ b/tests/dictionaries_old/60familyaction_mandatory/result/extra/extra/00-base.yml
@@ -1,10 +1,8 @@
+version: 1.1
 test:
   delay:
-    type: number
     description: délai en minutes avant lancement
     default: 0
   day:
     type: number
     description: day avant lancement
-    mandatory: true
-version: '1.1'
diff --git a/tests/dictionaries_old/60familyaction_mandatory/result/rougail/00-base.yml b/tests/dictionaries_old/60familyaction_mandatory/result/rougail/00-base.yml
index efac7c360..0777084bf 100644
--- a/tests/dictionaries_old/60familyaction_mandatory/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/60familyaction_mandatory/result/rougail/00-base.yml
@@ -1,8 +1,7 @@
+version: 1.1
 general:
   description: général
   mode_conteneur_actif:
-    type: string
     description: No change
     hidden: true
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/61extra_auto_freeze/result/extra/00-base.yml b/tests/dictionaries_old/61extra_auto_freeze/result/extra/extra/00-base.yml
similarity index 52%
rename from tests/dictionaries_old/61extra_auto_freeze/result/extra/00-base.yml
rename to tests/dictionaries_old/61extra_auto_freeze/result/extra/extra/00-base.yml
index 6ff748500..5a5548abc 100644
--- a/tests/dictionaries_old/61extra_auto_freeze/result/extra/00-base.yml
+++ b/tests/dictionaries_old/61extra_auto_freeze/result/extra/extra/00-base.yml
@@ -1,5 +1,4 @@
+version: 1.1
 ejabberd:
   mode:
-    type: string
     default: pre
-version: '1.1'
diff --git a/tests/dictionaries_old/61extra_auto_freeze/result/rougail/00-base.yml b/tests/dictionaries_old/61extra_auto_freeze/result/rougail/00-base.yml
index 706a7cde0..ff393997a 100644
--- a/tests/dictionaries_old/61extra_auto_freeze/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/61extra_auto_freeze/result/rougail/00-base.yml
@@ -1,11 +1,10 @@
+version: 1.1
 general:
   description: général
   server_deployed:
     type: boolean
     description: No change
   activer_ejabberd:
-    type: string
     description: No change
     hidden: true
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/61extra_dyn_extra/result/extra/00-base.yml b/tests/dictionaries_old/61extra_dyn_extra/result/extra/extra/00-base.yml
similarity index 78%
rename from tests/dictionaries_old/61extra_dyn_extra/result/extra/00-base.yml
rename to tests/dictionaries_old/61extra_dyn_extra/result/extra/extra/00-base.yml
index 0a3ed64e0..fe32ca38f 100644
--- a/tests/dictionaries_old/61extra_dyn_extra/result/extra/00-base.yml
+++ b/tests/dictionaries_old/61extra_dyn_extra/result/extra/extra/00-base.yml
@@ -1,18 +1,16 @@
+version: 1.1
 general:
   description: général
   varname:
-    type: string
     description: No change
-    multi: true
     default:
     - a
-ejabberd:
+ejabberd{{ suffix }}:
   type: dynamic
-  mode:
+  mode{{ suffix }}:
     type: string
     mandatory: false
   dynamic:
     type: variable
     variable: extra.general.varname
     propertyerror: false
-version: '1.1'
diff --git a/tests/dictionaries_old/61extra_dyn_extra/result/rougail/00-base.yml b/tests/dictionaries_old/61extra_dyn_extra/result/rougail/00-base.yml
index f7fbd8cd7..c2a5161e7 100644
--- a/tests/dictionaries_old/61extra_dyn_extra/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/61extra_dyn_extra/result/rougail/00-base.yml
@@ -1,9 +1,7 @@
+version: 1.1
 general:
   description: général
   varname:
-    type: string
     description: No change
-    multi: true
     default:
     - a
-version: '1.1'
diff --git a/tests/dictionaries_old/70container_files/result/rougail/00-base.yml b/tests/dictionaries_old/70container_files/result/rougail/00-base.yml
index fb536cdb0..e61060ea2 100644
--- a/tests/dictionaries_old/70container_files/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/70container_files/result/rougail/00-base.yml
@@ -1,8 +1,7 @@
+version: 1.1
 general:
   description: général
   mode_conteneur_actif:
-    type: string
     description: No change
     hidden: true
     default: oui
-version: '1.1'
diff --git a/tests/dictionaries_old/70container_files/result/services/00-base.yml b/tests/dictionaries_old/70container_files/result/services/00-base.yml
deleted file mode 100644
index 35695216c..000000000
--- a/tests/dictionaries_old/70container_files/result/services/00-base.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-test.service:
-  files:
-    /etc/mailname: {}
-    /rougail.conf: {}
-version: '1.1'
diff --git a/tests/dictionaries_old/70container_files_symlink_multi/result/rougail/00-base.yml b/tests/dictionaries_old/70container_files_symlink_multi/result/rougail/00-base.yml
index 06c5b519c..f54ca461c 100644
--- a/tests/dictionaries_old/70container_files_symlink_multi/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/70container_files_symlink_multi/result/rougail/00-base.yml
@@ -1,13 +1,11 @@
+version: 1.1
 file_name:
-  type: filename
-  multi: true
+  type: unix_filename
   default:
   - /etc/mailname
   - /etc/mailname2
 file_name2:
-  type: filename
-  multi: true
+  type: unix_filename
   default:
   - /etc/mailname3
   - /etc/mailname4
-version: '1.1'
diff --git a/tests/dictionaries_old/70container_files_symlink_multi/result/services/00-base.yml b/tests/dictionaries_old/70container_files_symlink_multi/result/services/00-base.yml
deleted file mode 100644
index 51162b2c6..000000000
--- a/tests/dictionaries_old/70container_files_symlink_multi/result/services/00-base.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-test.service:
-  files:
-    rougail.file_name:
-      source: mailname
-      type: variable
-    rougail.file_name2:
-      source: mailname2
-      engine: jinja
-      type: variable
-version: '1.1'
diff --git a/tests/dictionaries_old/70container_files_symlink_multi_variable/result/rougail/00-base.yml b/tests/dictionaries_old/70container_files_symlink_multi_variable/result/rougail/00-base.yml
index 905a345d4..b87d9fe6d 100644
--- a/tests/dictionaries_old/70container_files_symlink_multi_variable/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/70container_files_symlink_multi_variable/result/rougail/00-base.yml
@@ -1,19 +1,15 @@
+version: 1.1
 file_name:
-  type: filename
-  multi: true
+  type: unix_filename
   default:
   - /etc/mailname
   - /etc/mailname2
 file_name2:
-  type: filename
-  multi: true
+  type: unix_filename
   default:
   - /etc/mailname3
   - /etc/mailname4
 var:
-  type: string
-  multi: true
   default:
   - mailname
   - mailname2
-version: '1.1'
diff --git a/tests/dictionaries_old/70container_files_symlink_multi_variable/result/services/00-base.yml b/tests/dictionaries_old/70container_files_symlink_multi_variable/result/services/00-base.yml
deleted file mode 100644
index 15411aa05..000000000
--- a/tests/dictionaries_old/70container_files_symlink_multi_variable/result/services/00-base.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-test.service:
-  files:
-    rougail.file_name:
-      source: mailname
-      variable: rougail.var
-      type: variable
-    rougail.file_name2:
-      source: mailname2
-      variable: rougail.var
-      engine: jinja
-      type: variable
-version: '1.1'
diff --git a/tests/dictionaries_old/70container_files_symlink_variable/result/rougail/00-base.yml b/tests/dictionaries_old/70container_files_symlink_variable/result/rougail/00-base.yml
index 856bceb18..9a7ee85aa 100644
--- a/tests/dictionaries_old/70container_files_symlink_variable/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/70container_files_symlink_variable/result/rougail/00-base.yml
@@ -1,7 +1,6 @@
+version: 1.1
 file_name:
-  type: filename
+  type: unix_filename
   default: /etc/mailname
 var:
-  type: string
   default: mailname
-version: '1.1'
diff --git a/tests/dictionaries_old/70container_files_symlink_variable/result/services/00-base.yml b/tests/dictionaries_old/70container_files_symlink_variable/result/services/00-base.yml
deleted file mode 100644
index 193ecce0f..000000000
--- a/tests/dictionaries_old/70container_files_symlink_variable/result/services/00-base.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-test.service:
-  files:
-    rougail.file_name:
-      source: mailname
-      variable: rougail.var
-      type: variable
-version: '1.1'
diff --git a/tests/dictionaries_old/70container_files_twice/result/rougail/00-base.yml b/tests/dictionaries_old/70container_files_twice/result/rougail/00-base.yml
index fb536cdb0..e61060ea2 100644
--- a/tests/dictionaries_old/70container_files_twice/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/70container_files_twice/result/rougail/00-base.yml
@@ -1,8 +1,7 @@
+version: 1.1
 general:
   description: général
   mode_conteneur_actif:
-    type: string
     description: No change
     hidden: true
     default: oui
-version: '1.1'
diff --git a/tests/dictionaries_old/70container_files_twice/result/services/00-base.yml b/tests/dictionaries_old/70container_files_twice/result/services/00-base.yml
deleted file mode 100644
index 27a24799b..000000000
--- a/tests/dictionaries_old/70container_files_twice/result/services/00-base.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-test.service:
-  files:
-    /etc/mailname: {}
-    /etc/eole/mailname: {}
-    /rougail.conf: {}
-version: '1.1'
diff --git a/tests/dictionaries_old/70container_filesmulti/result/rougail/00-base.yml b/tests/dictionaries_old/70container_filesmulti/result/rougail/00-base.yml
index fb536cdb0..e61060ea2 100644
--- a/tests/dictionaries_old/70container_filesmulti/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/70container_filesmulti/result/rougail/00-base.yml
@@ -1,8 +1,7 @@
+version: 1.1
 general:
   description: général
   mode_conteneur_actif:
-    type: string
     description: No change
     hidden: true
     default: oui
-version: '1.1'
diff --git a/tests/dictionaries_old/70container_filesmulti/result/services/00-base.yml b/tests/dictionaries_old/70container_filesmulti/result/services/00-base.yml
deleted file mode 100644
index 06e6a12e2..000000000
--- a/tests/dictionaries_old/70container_filesmulti/result/services/00-base.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-test.service:
-  files:
-    /etc/mailname: {}
-    /etc/mailname2: {}
-version: '1.1'
diff --git a/tests/dictionaries_old/70container_filesredefine/result/rougail/00-base.yml b/tests/dictionaries_old/70container_filesredefine/result/rougail/00-base.yml
index fb536cdb0..e61060ea2 100644
--- a/tests/dictionaries_old/70container_filesredefine/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/70container_filesredefine/result/rougail/00-base.yml
@@ -1,8 +1,7 @@
+version: 1.1
 general:
   description: général
   mode_conteneur_actif:
-    type: string
     description: No change
     hidden: true
     default: oui
-version: '1.1'
diff --git a/tests/dictionaries_old/70container_filesredefine/result/services/00-base.yml b/tests/dictionaries_old/70container_filesredefine/result/services/00-base.yml
deleted file mode 100644
index 39c1202b2..000000000
--- a/tests/dictionaries_old/70container_filesredefine/result/services/00-base.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-test.service:
-  files:
-    /etc/mailname: {}
-version: '1.1'
diff --git a/tests/dictionaries_old/70container_filesredefine/result/services/01-base.yml b/tests/dictionaries_old/70container_filesredefine/result/services/01-base.yml
deleted file mode 100644
index 7b2f9d665..000000000
--- a/tests/dictionaries_old/70container_filesredefine/result/services/01-base.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-test.service:
-  files:
-    /etc/mailname:
-      source: mailname.new
-      redefine: true
-version: '1.1'
diff --git a/tests/dictionaries_old/70container_new/result/rougail/00-base.yml b/tests/dictionaries_old/70container_new/result/rougail/00-base.yml
index fb536cdb0..e61060ea2 100644
--- a/tests/dictionaries_old/70container_new/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/70container_new/result/rougail/00-base.yml
@@ -1,8 +1,7 @@
+version: 1.1
 general:
   description: général
   mode_conteneur_actif:
-    type: string
     description: No change
     hidden: true
     default: oui
-version: '1.1'
diff --git a/tests/dictionaries_old/70container_new/result/services/00-base.yml b/tests/dictionaries_old/70container_new/result/services/00-base.yml
deleted file mode 100644
index 72456f5ae..000000000
--- a/tests/dictionaries_old/70container_new/result/services/00-base.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-test.service: {}
-version: '1.1'
diff --git a/tests/dictionaries_old/70container_newnocont/result/rougail/00-base.yml b/tests/dictionaries_old/70container_newnocont/result/rougail/00-base.yml
index efac7c360..0777084bf 100644
--- a/tests/dictionaries_old/70container_newnocont/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/70container_newnocont/result/rougail/00-base.yml
@@ -1,8 +1,7 @@
+version: 1.1
 general:
   description: général
   mode_conteneur_actif:
-    type: string
     description: No change
     hidden: true
     default: non
-version: '1.1'
diff --git a/tests/dictionaries_old/70container_newnocont/result/services/00-base.yml b/tests/dictionaries_old/70container_newnocont/result/services/00-base.yml
deleted file mode 100644
index 72456f5ae..000000000
--- a/tests/dictionaries_old/70container_newnocont/result/services/00-base.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-test.service: {}
-version: '1.1'
diff --git a/tests/dictionaries_old/70container_newwithip/result/rougail/00-base.yml b/tests/dictionaries_old/70container_newwithip/result/rougail/00-base.yml
index fae21c256..00568dfc8 100644
--- a/tests/dictionaries_old/70container_newwithip/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/70container_newwithip/result/rougail/00-base.yml
@@ -1,7 +1,7 @@
+version: 1.1
 general:
   description: général
   mode_conteneur_actif:
-    type: string
     description: No change
     hidden: true
     default: oui
@@ -9,4 +9,3 @@ general:
     type: ip
     description: No change
     mandatory: false
-version: '1.1'
diff --git a/tests/dictionaries_old/70container_newwithip/result/services/00-base.yml b/tests/dictionaries_old/70container_newwithip/result/services/00-base.yml
deleted file mode 100644
index 72456f5ae..000000000
--- a/tests/dictionaries_old/70container_newwithip/result/services/00-base.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-test.service: {}
-version: '1.1'
diff --git a/tests/dictionaries_old/70container_save/result/rougail/00-base.yml b/tests/dictionaries_old/70container_save/result/rougail/00-base.yml
index fb536cdb0..e61060ea2 100644
--- a/tests/dictionaries_old/70container_save/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/70container_save/result/rougail/00-base.yml
@@ -1,8 +1,7 @@
+version: 1.1
 general:
   description: général
   mode_conteneur_actif:
-    type: string
     description: No change
     hidden: true
     default: oui
-version: '1.1'
diff --git a/tests/dictionaries_old/70service_base/result/rougail/00-base.yml b/tests/dictionaries_old/70service_base/result/rougail/00-base.yml
index fb536cdb0..e61060ea2 100644
--- a/tests/dictionaries_old/70service_base/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/70service_base/result/rougail/00-base.yml
@@ -1,8 +1,7 @@
+version: 1.1
 general:
   description: général
   mode_conteneur_actif:
-    type: string
     description: No change
     hidden: true
     default: oui
-version: '1.1'
diff --git a/tests/dictionaries_old/70service_base/result/services/00-base.yml b/tests/dictionaries_old/70service_base/result/services/00-base.yml
deleted file mode 100644
index 5e611100d..000000000
--- a/tests/dictionaries_old/70service_base/result/services/00-base.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-testsrv.service: {}
-version: '1.1'
diff --git a/tests/dictionaries_old/70service_disabled/result/rougail/00-base.yml b/tests/dictionaries_old/70service_disabled/result/rougail/00-base.yml
index 8fdf4a7fc..4b22a5cde 100644
--- a/tests/dictionaries_old/70service_disabled/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/70service_disabled/result/rougail/00-base.yml
@@ -1,3 +1,3 @@
+version: 1.1
 condition:
   default: no
-version: '1.1'
diff --git a/tests/dictionaries_old/70service_disabled/result/services/00-base.yml b/tests/dictionaries_old/70service_disabled/result/services/00-base.yml
deleted file mode 100644
index 72456f5ae..000000000
--- a/tests/dictionaries_old/70service_disabled/result/services/00-base.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-test.service: {}
-version: '1.1'
diff --git a/tests/dictionaries_old/70service_disabled_undisable/result/rougail/00-base.yml b/tests/dictionaries_old/70service_disabled_undisable/result/rougail/00-base.yml
index 8fdf4a7fc..4b22a5cde 100644
--- a/tests/dictionaries_old/70service_disabled_undisable/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/70service_disabled_undisable/result/rougail/00-base.yml
@@ -1,3 +1,3 @@
+version: 1.1
 condition:
   default: no
-version: '1.1'
diff --git a/tests/dictionaries_old/70service_disabled_undisable/result/services/00-base.yml b/tests/dictionaries_old/70service_disabled_undisable/result/services/00-base.yml
deleted file mode 100644
index 72456f5ae..000000000
--- a/tests/dictionaries_old/70service_disabled_undisable/result/services/00-base.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-test.service: {}
-version: '1.1'
diff --git a/tests/dictionaries_old/70service_engine/result/rougail/00-base.yml b/tests/dictionaries_old/70service_engine/result/rougail/00-base.yml
index fb536cdb0..e61060ea2 100644
--- a/tests/dictionaries_old/70service_engine/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/70service_engine/result/rougail/00-base.yml
@@ -1,8 +1,7 @@
+version: 1.1
 general:
   description: général
   mode_conteneur_actif:
-    type: string
     description: No change
     hidden: true
     default: oui
-version: '1.1'
diff --git a/tests/dictionaries_old/70service_engine/result/services/00-base.yml b/tests/dictionaries_old/70service_engine/result/services/00-base.yml
deleted file mode 100644
index 5e611100d..000000000
--- a/tests/dictionaries_old/70service_engine/result/services/00-base.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-testsrv.service: {}
-version: '1.1'
diff --git a/tests/dictionaries_old/70service_engine_dash/result/rougail/00-base.yml b/tests/dictionaries_old/70service_engine_dash/result/rougail/00-base.yml
index fb536cdb0..e61060ea2 100644
--- a/tests/dictionaries_old/70service_engine_dash/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/70service_engine_dash/result/rougail/00-base.yml
@@ -1,8 +1,7 @@
+version: 1.1
 general:
   description: général
   mode_conteneur_actif:
-    type: string
     description: No change
     hidden: true
     default: oui
-version: '1.1'
diff --git a/tests/dictionaries_old/70service_engine_dash/result/services/00-base.yml b/tests/dictionaries_old/70service_engine_dash/result/services/00-base.yml
deleted file mode 100644
index bafe02e00..000000000
--- a/tests/dictionaries_old/70service_engine_dash/result/services/00-base.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-test-srv.service: {}
-version: '1.1'
diff --git a/tests/dictionaries_old/70service_mount/result/rougail/00-base.yml b/tests/dictionaries_old/70service_mount/result/rougail/00-base.yml
index fb536cdb0..e61060ea2 100644
--- a/tests/dictionaries_old/70service_mount/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/70service_mount/result/rougail/00-base.yml
@@ -1,8 +1,7 @@
+version: 1.1
 general:
   description: général
   mode_conteneur_actif:
-    type: string
     description: No change
     hidden: true
     default: oui
-version: '1.1'
diff --git a/tests/dictionaries_old/70service_mount/result/services/00-base.yml b/tests/dictionaries_old/70service_mount/result/services/00-base.yml
deleted file mode 100644
index 7ecf7ed8a..000000000
--- a/tests/dictionaries_old/70service_mount/result/services/00-base.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-testsrv.mount: {}
-version: '1.1'
diff --git a/tests/dictionaries_old/70service_not_managed/result/rougail/00-base.yml b/tests/dictionaries_old/70service_not_managed/result/rougail/00-base.yml
index 372eca0dc..fdb139812 100644
--- a/tests/dictionaries_old/70service_not_managed/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/70service_not_managed/result/rougail/00-base.yml
@@ -1,4 +1,3 @@
+version: 1.1
 var:
-  type: string
   default: mailname
-version: '1.1'
diff --git a/tests/dictionaries_old/70service_not_managed/result/services/00-base.yml b/tests/dictionaries_old/70service_not_managed/result/services/00-base.yml
deleted file mode 100644
index a44dea4bb..000000000
--- a/tests/dictionaries_old/70service_not_managed/result/services/00-base.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-test.service:
-  files:
-    /tmp/test: {}
-version: '1.1'
diff --git a/tests/dictionaries_old/70service_servicelist/result/rougail/00-base.yml b/tests/dictionaries_old/70service_servicelist/result/rougail/00-base.yml
index 8fdf4a7fc..4b22a5cde 100644
--- a/tests/dictionaries_old/70service_servicelist/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/70service_servicelist/result/rougail/00-base.yml
@@ -1,3 +1,3 @@
+version: 1.1
 condition:
   default: no
-version: '1.1'
diff --git a/tests/dictionaries_old/70service_servicelist/result/services/00-base.yml b/tests/dictionaries_old/70service_servicelist/result/services/00-base.yml
deleted file mode 100644
index 9cc857dde..000000000
--- a/tests/dictionaries_old/70service_servicelist/result/services/00-base.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-test.service:
-  disabled:
-    type: jinja
-    jinja: '{% if rougail.condition == "yes" %}disabled{% endif %}'
-version: '1.1'
diff --git a/tests/dictionaries_old/70service_servicelist_disabled_if_in/result/rougail/00-base.yml b/tests/dictionaries_old/70service_servicelist_disabled_if_in/result/rougail/00-base.yml
index 5c9bcb348..d086a44c3 100644
--- a/tests/dictionaries_old/70service_servicelist_disabled_if_in/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/70service_servicelist_disabled_if_in/result/rougail/00-base.yml
@@ -1,3 +1,4 @@
+version: 1.1
 condition1:
   default: no
 condition2:
@@ -5,4 +6,3 @@ condition2:
   disabled:
     type: jinja
     jinja: '{% if rougail.condition1 == "no" %}disabled{% endif %}'
-version: '1.1'
diff --git a/tests/dictionaries_old/70service_servicelist_disabled_if_in/result/services/00-base.yml b/tests/dictionaries_old/70service_servicelist_disabled_if_in/result/services/00-base.yml
deleted file mode 100644
index 3d79e0257..000000000
--- a/tests/dictionaries_old/70service_servicelist_disabled_if_in/result/services/00-base.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-test.service:
-  disabled:
-    type: jinja
-    jinja: '{% if rougail.condition2 == "yes" %}disabled{% endif %}'
-version: '1.1'
diff --git a/tests/dictionaries_old/70service_servicelist_extra/result/extra/00-base.yml b/tests/dictionaries_old/70service_servicelist_extra/result/extra/extra/00-base.yml
similarity index 62%
rename from tests/dictionaries_old/70service_servicelist_extra/result/extra/00-base.yml
rename to tests/dictionaries_old/70service_servicelist_extra/result/extra/extra/00-base.yml
index 8fdf4a7fc..4b22a5cde 100644
--- a/tests/dictionaries_old/70service_servicelist_extra/result/extra/00-base.yml
+++ b/tests/dictionaries_old/70service_servicelist_extra/result/extra/extra/00-base.yml
@@ -1,3 +1,3 @@
+version: 1.1
 condition:
   default: no
-version: '1.1'
diff --git a/tests/dictionaries_old/70service_servicelist_extra/result/services/00-base.yml b/tests/dictionaries_old/70service_servicelist_extra/result/services/00-base.yml
deleted file mode 100644
index 72456f5ae..000000000
--- a/tests/dictionaries_old/70service_servicelist_extra/result/services/00-base.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-test.service: {}
-version: '1.1'
diff --git a/tests/dictionaries_old/70service_servicelist_file/result/rougail/00-base.yml b/tests/dictionaries_old/70service_servicelist_file/result/rougail/00-base.yml
index b2658fc51..b84f7f8c3 100644
--- a/tests/dictionaries_old/70service_servicelist_file/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/70service_servicelist_file/result/rougail/00-base.yml
@@ -1,7 +1,6 @@
+version: 1.1
 condition:
   default: no
 nut_monitor_host:
   type: ip
-  mandatory: true
   default: 192.168.0.1
-version: '1.1'
diff --git a/tests/dictionaries_old/70service_servicelist_file/result/services/00-base.yml b/tests/dictionaries_old/70service_servicelist_file/result/services/00-base.yml
deleted file mode 100644
index c488e87de..000000000
--- a/tests/dictionaries_old/70service_servicelist_file/result/services/00-base.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-test.service:
-  files:
-    /etc/file: {}
-  disabled:
-    type: jinja
-    jinja: '{% if rougail.condition == "no" %}disabled{% endif %}'
-version: '1.1'
diff --git a/tests/dictionaries_old/70service_servicelist_ip/result/rougail/00-base.yml b/tests/dictionaries_old/70service_servicelist_ip/result/rougail/00-base.yml
index b2658fc51..b84f7f8c3 100644
--- a/tests/dictionaries_old/70service_servicelist_ip/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/70service_servicelist_ip/result/rougail/00-base.yml
@@ -1,7 +1,6 @@
+version: 1.1
 condition:
   default: no
 nut_monitor_host:
   type: ip
-  mandatory: true
   default: 192.168.0.1
-version: '1.1'
diff --git a/tests/dictionaries_old/70service_servicelist_ip/result/services/00-base.yml b/tests/dictionaries_old/70service_servicelist_ip/result/services/00-base.yml
deleted file mode 100644
index 43d8ff131..000000000
--- a/tests/dictionaries_old/70service_servicelist_ip/result/services/00-base.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-test.service:
-  ip:
-    rougail.nut_monitor_host: {}
-  disabled:
-    type: jinja
-    jinja: '{% if rougail.condition == "no" %}disabled{% endif %}'
-version: '1.1'
diff --git a/tests/dictionaries_old/70service_servicelist_not_managed/result/rougail/00-base.yml b/tests/dictionaries_old/70service_servicelist_not_managed/result/rougail/00-base.yml
index 8fdf4a7fc..4b22a5cde 100644
--- a/tests/dictionaries_old/70service_servicelist_not_managed/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/70service_servicelist_not_managed/result/rougail/00-base.yml
@@ -1,3 +1,3 @@
+version: 1.1
 condition:
   default: no
-version: '1.1'
diff --git a/tests/dictionaries_old/70service_servicelist_not_managed/result/services/00-base.yml b/tests/dictionaries_old/70service_servicelist_not_managed/result/services/00-base.yml
deleted file mode 100644
index 9cc857dde..000000000
--- a/tests/dictionaries_old/70service_servicelist_not_managed/result/services/00-base.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-test.service:
-  disabled:
-    type: jinja
-    jinja: '{% if rougail.condition == "yes" %}disabled{% endif %}'
-version: '1.1'
diff --git a/tests/dictionaries_old/70service_target/result/rougail/00-base.yml b/tests/dictionaries_old/70service_target/result/rougail/00-base.yml
index fb536cdb0..e61060ea2 100644
--- a/tests/dictionaries_old/70service_target/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/70service_target/result/rougail/00-base.yml
@@ -1,8 +1,7 @@
+version: 1.1
 general:
   description: général
   mode_conteneur_actif:
-    type: string
     description: No change
     hidden: true
     default: oui
-version: '1.1'
diff --git a/tests/dictionaries_old/70service_target/result/services/00-base.yml b/tests/dictionaries_old/70service_target/result/services/00-base.yml
deleted file mode 100644
index 5e611100d..000000000
--- a/tests/dictionaries_old/70service_target/result/services/00-base.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-testsrv.service: {}
-version: '1.1'
diff --git a/tests/dictionaries_old/70service_target_engine/result/rougail/00-base.yml b/tests/dictionaries_old/70service_target_engine/result/rougail/00-base.yml
index fb536cdb0..e61060ea2 100644
--- a/tests/dictionaries_old/70service_target_engine/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/70service_target_engine/result/rougail/00-base.yml
@@ -1,8 +1,7 @@
+version: 1.1
 general:
   description: général
   mode_conteneur_actif:
-    type: string
     description: No change
     hidden: true
     default: oui
-version: '1.1'
diff --git a/tests/dictionaries_old/70service_target_engine/result/services/00-base.yml b/tests/dictionaries_old/70service_target_engine/result/services/00-base.yml
deleted file mode 100644
index 5e611100d..000000000
--- a/tests/dictionaries_old/70service_target_engine/result/services/00-base.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-testsrv.service: {}
-version: '1.1'
diff --git a/tests/dictionaries_old/70service_timer/result/services/00-base.yml b/tests/dictionaries_old/70service_timer/result/services/00-base.yml
deleted file mode 100644
index 10b058f0b..000000000
--- a/tests/dictionaries_old/70service_timer/result/services/00-base.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-testsrv.service: {}
-testsrv.timer: {}
-version: '1.1'
diff --git a/tests/dictionaries_old/70services_ip/result/rougail/00-base.yml b/tests/dictionaries_old/70services_ip/result/rougail/00-base.yml
index 913c1b939..828a39ada 100644
--- a/tests/dictionaries_old/70services_ip/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/70services_ip/result/rougail/00-base.yml
@@ -1,5 +1,4 @@
+version: 1.1
 nut_monitor_host:
   type: ip
-  mandatory: true
   default: 192.168.0.1
-version: '1.1'
diff --git a/tests/dictionaries_old/70services_ip/result/services/00-base.yml b/tests/dictionaries_old/70services_ip/result/services/00-base.yml
deleted file mode 100644
index 30d492252..000000000
--- a/tests/dictionaries_old/70services_ip/result/services/00-base.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-nut.service:
-  ip:
-    rougail.nut_monitor_host: {}
-version: '1.1'
diff --git a/tests/dictionaries_old/70services_ip_cidr/result/rougail/00-base.yml b/tests/dictionaries_old/70services_ip_cidr/result/rougail/00-base.yml
index 4cabd0d61..8b4ef3118 100644
--- a/tests/dictionaries_old/70services_ip_cidr/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/70services_ip_cidr/result/rougail/00-base.yml
@@ -1,5 +1,4 @@
+version: 1.1
 nut_monitor_host:
   type: network_cidr
-  mandatory: true
   default: 192.168.0.0/24
-version: '1.1'
diff --git a/tests/dictionaries_old/70services_ip_cidr/result/services/00-base.yml b/tests/dictionaries_old/70services_ip_cidr/result/services/00-base.yml
deleted file mode 100644
index 30d492252..000000000
--- a/tests/dictionaries_old/70services_ip_cidr/result/services/00-base.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-nut.service:
-  ip:
-    rougail.nut_monitor_host: {}
-version: '1.1'
diff --git a/tests/dictionaries_old/70services_ip_disabled/result/rougail/00-base.yml b/tests/dictionaries_old/70services_ip_disabled/result/rougail/00-base.yml
index 5bc3170b3..4f0e4e54f 100644
--- a/tests/dictionaries_old/70services_ip_disabled/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/70services_ip_disabled/result/rougail/00-base.yml
@@ -1,6 +1,5 @@
+version: 1.1
 nut_monitor_host:
   type: ip
-  mandatory: true
   disabled: true
   default: 192.168.0.1
-version: '1.1'
diff --git a/tests/dictionaries_old/70services_ip_disabled/result/services/00-base.yml b/tests/dictionaries_old/70services_ip_disabled/result/services/00-base.yml
deleted file mode 100644
index 30d492252..000000000
--- a/tests/dictionaries_old/70services_ip_disabled/result/services/00-base.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-nut.service:
-  ip:
-    rougail.nut_monitor_host: {}
-version: '1.1'
diff --git a/tests/dictionaries_old/70services_ip_iplist/result/rougail/00-base.yml b/tests/dictionaries_old/70services_ip_iplist/result/rougail/00-base.yml
index 4587d7392..14e6925de 100644
--- a/tests/dictionaries_old/70services_ip_iplist/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/70services_ip_iplist/result/rougail/00-base.yml
@@ -1,10 +1,9 @@
+version: 1.1
 condition:
   default: no
 nut_monitor_host:
   type: network_cidr
-  mandatory: true
   default: 192.168.0.0/24
   disabled:
     type: jinja
     jinja: '{% if rougail.condition == "yes" %}disabled{% endif %}'
-version: '1.1'
diff --git a/tests/dictionaries_old/70services_ip_iplist/result/services/00-base.yml b/tests/dictionaries_old/70services_ip_iplist/result/services/00-base.yml
deleted file mode 100644
index 325dad025..000000000
--- a/tests/dictionaries_old/70services_ip_iplist/result/services/00-base.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-nut.service:
-  ip:
-    rougail.nut_monitor_host:
-      disabled:
-        type: jinja
-        jinja: '{% if rougail.condition == "yes" %}disabled{% endif %}'
-version: '1.1'
diff --git a/tests/dictionaries_old/70services_ip_iplist2/result/rougail/00-base.yml b/tests/dictionaries_old/70services_ip_iplist2/result/rougail/00-base.yml
index 4f5e8169a..0808ba693 100644
--- a/tests/dictionaries_old/70services_ip_iplist2/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/70services_ip_iplist2/result/rougail/00-base.yml
@@ -1,7 +1,6 @@
+version: 1.1
 condition:
   default: yes
 nut_monitor_host:
   type: network_cidr
-  mandatory: true
   default: 192.168.0.0/24
-version: '1.1'
diff --git a/tests/dictionaries_old/70services_ip_iplist2/result/services/00-base.yml b/tests/dictionaries_old/70services_ip_iplist2/result/services/00-base.yml
deleted file mode 100644
index 325dad025..000000000
--- a/tests/dictionaries_old/70services_ip_iplist2/result/services/00-base.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-nut.service:
-  ip:
-    rougail.nut_monitor_host:
-      disabled:
-        type: jinja
-        jinja: '{% if rougail.condition == "yes" %}disabled{% endif %}'
-version: '1.1'
diff --git a/tests/dictionaries_old/70services_ip_leadership/result/rougail/00-base.yml b/tests/dictionaries_old/70services_ip_leadership/result/rougail/00-base.yml
index b37aad4e1..905947bf8 100644
--- a/tests/dictionaries_old/70services_ip_leadership/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/70services_ip_leadership/result/rougail/00-base.yml
@@ -1,3 +1,4 @@
+version: 1.1
 general:
   description: général
   nut_monitor_netmask:
@@ -5,12 +6,8 @@ general:
     type: leadership
     nut_monitor_netmask:
       type: netmask
-      mandatory: true
-      multi: true
       default:
       - 255.255.255.0
     nut_monitor_host:
       type: network
-      mandatory: true
       default: 192.168.1.0
-version: '1.1'
diff --git a/tests/dictionaries_old/70services_ip_leadership/result/services/00-base.yml b/tests/dictionaries_old/70services_ip_leadership/result/services/00-base.yml
deleted file mode 100644
index f4798d4de..000000000
--- a/tests/dictionaries_old/70services_ip_leadership/result/services/00-base.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-ntp.service:
-  ip:
-    rougail.general.nut_monitor_netmask.nut_monitor_host:
-      netmask: rougail.general.nut_monitor_netmask.nut_monitor_netmask
-version: '1.1'
diff --git a/tests/dictionaries_old/70services_ip_multi/result/rougail/00-base.yml b/tests/dictionaries_old/70services_ip_multi/result/rougail/00-base.yml
index 44b3365e8..d5ef32108 100644
--- a/tests/dictionaries_old/70services_ip_multi/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/70services_ip_multi/result/rougail/00-base.yml
@@ -1,8 +1,6 @@
+version: 1.1
 nut_monitor_host:
   type: ip
-  mandatory: true
-  multi: true
   default:
   - 192.168.0.1
   - 192.168.0.2
-version: '1.1'
diff --git a/tests/dictionaries_old/70services_ip_multi/result/services/00-base.yml b/tests/dictionaries_old/70services_ip_multi/result/services/00-base.yml
deleted file mode 100644
index 30d492252..000000000
--- a/tests/dictionaries_old/70services_ip_multi/result/services/00-base.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-nut.service:
-  ip:
-    rougail.nut_monitor_host: {}
-version: '1.1'
diff --git a/tests/dictionaries_old/70services_ip_network/result/rougail/00-base.yml b/tests/dictionaries_old/70services_ip_network/result/rougail/00-base.yml
index b9360e16f..44ef1a824 100644
--- a/tests/dictionaries_old/70services_ip_network/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/70services_ip_network/result/rougail/00-base.yml
@@ -1,9 +1,7 @@
+version: 1.1
 nut_monitor_netmask:
   type: netmask
-  mandatory: true
   default: 255.255.255.0
 nut_monitor_host:
   type: network
-  mandatory: true
   default: 192.168.0.0
-version: '1.1'
diff --git a/tests/dictionaries_old/70services_ip_network/result/services/00-base.yml b/tests/dictionaries_old/70services_ip_network/result/services/00-base.yml
deleted file mode 100644
index 8167d25d0..000000000
--- a/tests/dictionaries_old/70services_ip_network/result/services/00-base.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-nut.service:
-  ip:
-    rougail.nut_monitor_host:
-      netmask: rougail.nut_monitor_netmask
-version: '1.1'
diff --git a/tests/dictionaries_old/70services_ip_not_mandatory/result/rougail/00-base.yml b/tests/dictionaries_old/70services_ip_not_mandatory/result/rougail/00-base.yml
index a973636d3..de3e8e0c7 100644
--- a/tests/dictionaries_old/70services_ip_not_mandatory/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/70services_ip_not_mandatory/result/rougail/00-base.yml
@@ -1,4 +1,4 @@
+version: 1.1
 nut_monitor_host:
   type: ip
   mandatory: false
-version: '1.1'
diff --git a/tests/dictionaries_old/70services_ip_not_mandatory/result/services/00-base.yml b/tests/dictionaries_old/70services_ip_not_mandatory/result/services/00-base.yml
deleted file mode 100644
index 30d492252..000000000
--- a/tests/dictionaries_old/70services_ip_not_mandatory/result/services/00-base.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-nut.service:
-  ip:
-    rougail.nut_monitor_host: {}
-version: '1.1'
diff --git a/tests/dictionaries_old/70services_ip_twice/result/rougail/00-base.yml b/tests/dictionaries_old/70services_ip_twice/result/rougail/00-base.yml
index 85441c177..0f09b2dc9 100644
--- a/tests/dictionaries_old/70services_ip_twice/result/rougail/00-base.yml
+++ b/tests/dictionaries_old/70services_ip_twice/result/rougail/00-base.yml
@@ -1,9 +1,7 @@
+version: 1.1
 nut_monitor_host:
   type: ip
-  mandatory: true
   default: 192.168.0.1
 nut_monitor_host2:
   type: ip
-  mandatory: true
   default: 192.168.0.2
-version: '1.1'
diff --git a/tests/dictionaries_old/70services_ip_twice/result/services/00-base.yml b/tests/dictionaries_old/70services_ip_twice/result/services/00-base.yml
deleted file mode 100644
index 03c993553..000000000
--- a/tests/dictionaries_old/70services_ip_twice/result/services/00-base.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-nut.service:
-  ip:
-    rougail.nut_monitor_host: {}
-    rougail.nut_monitor_host2: {}
-version: '1.1'
diff --git a/tests/test_upgrade.py b/tests/test_upgrade.py
index 91e6c569a..f37d363c0 100644
--- a/tests/test_upgrade.py
+++ b/tests/test_upgrade.py
@@ -56,10 +56,13 @@ def launch_test(test_dir, ext):
         rmtree(new_dest_dir)
     makedirs(join(new_dest_dir, 'rougail'))
     rougailconfig = RougailConfig.copy()
-    rougailconfig_dest = RougailConfig.copy()
-    rougailconfig_dest['functions_files'] = [join(dico_dirs, '../eosfunc/test.py')]
+    rougailconfig['upgrade'] = True
+    # rougailconfig_dest = RougailConfig.copy()
+    # rougailconfig_dest['functions_files'] = [join(dico_dirs, '../eosfunc/test.py')]
     rougailconfig['main_dictionaries'] = [join(test_dir, 'xml')]
-    rougailconfig_dest['main_dictionaries'] = [join(new_dest_dir, 'rougail')]
+    upgrade_dir = join(new_dest_dir, 'rougail')
+    rougailconfig["upgrade_options.main_dictionaries"] = [upgrade_dir]
+    # rougailconfig_dest['main_dictionaries'] = [join(new_dest_dir, 'rougail')]
     extra_dictionaries = {}
     if isdir(join(test_dir, ext, 'extra_dirs')):
         extras = listdir(join(test_dir, ext, 'extra_dirs'))
@@ -68,13 +71,17 @@ def launch_test(test_dir, ext):
             subfolder = join(test_dir, ext, 'extra_dirs', extra)
             if isdir(subfolder):
                 extra_dictionaries[extra] = [subfolder]
-    rougailconfig['extra_dictionaries'] = extra_dictionaries
-    rougailconfig_dest['extra_dictionaries'] = extra_dictionaries
+        makedirs(join(new_dest_dir, 'extra'))
+    if extra_dictionaries:
+        rougailconfig['extra_dictionaries'] = extra_dictionaries
+        rougailconfig["upgrade_options.extra_dictionary"] = join(new_dest_dir, 'extra')
+    # rougailconfig_dest['extra_dictionaries'] = extra_dictionaries
     upgrade = RougailUpgrade(rougailconfig=rougailconfig)
-    upgrade.load_dictionaries(join(new_dest_dir, 'rougail'),
-                              extra_dstfolder=new_dest_dir,
-                              services_dstfolder=join(new_dest_dir, 'services'),
-                              )
+#    upgrade.load_dictionaries(join(new_dest_dir, 'rougail'),
+#                              extra_dstfolder=new_dest_dir,
+#                              services_dstfolder=join(new_dest_dir, 'services'),
+#                              )
+    upgrade.run()
     ori_lists = set()
     find_files(result_dest_dir,
                [],