From 6c6746c58f7ee1f4a243050a2350ae761e83f087 Mon Sep 17 00:00:00 2001
From: Emmanuel Garette <egarette@cadoles.com>
Date: Wed, 23 Dec 2020 13:29:51 +0100
Subject: [PATCH] help in variable or family now

---
 src/rougail/annotator.py                        | 15 ---------------
 src/rougail/data/rougail.dtd                    |  8 ++++----
 .../dictionaries/00load_autofreeze/00-base.xml  |  8 --------
 .../00load_autofreezeexpert/00-base.xml         | 10 ----------
 tests/dictionaries/00load_autosave/00-base.xml  | 10 ----------
 .../00load_autosaveexpert/00-base.xml           | 10 ----------
 tests/dictionaries/00load_comment/00-base.xml   | 10 ----------
 tests/dictionaries/00load_notype/00-base.xml    | 10 ----------
 tests/dictionaries/00load_save/00-base.xml      | 10 ----------
 tests/dictionaries/00load_subfolder/99-base.xml | 10 ----------
 .../00load_subfolder/subfolder/00-base.xml      | 10 ----------
 tests/dictionaries/01auto_base/00-base.xml      |  7 -------
 .../01auto_withoutparam/00-base.xml             |  7 -------
 tests/dictionaries/01base_multi/00-base.xml     | 10 ----------
 .../dictionaries/01fill_autofreeze/00-base.xml  |  7 -------
 tests/dictionaries/01fill_autosave/00-base.xml  |  7 -------
 tests/dictionaries/01fill_base/00-base.xml      |  7 -------
 .../dictionaries/01fill_baseaccent/00-base.xml  |  7 -------
 tests/dictionaries/01fill_mandatory/00-base.xml |  7 -------
 tests/dictionaries/01fill_number/00-base.xml    |  7 -------
 tests/dictionaries/01fill_optional/00-base.xml  |  7 -------
 tests/dictionaries/01separator_base/00-base.xml |  9 ---------
 .../01separator_neverhidden/00-base.xml         |  9 ---------
 .../dictionaries/10autosave_hidden/00-base.xml  |  8 --------
 .../10autosave_hidden_frozenifin/00-base.xml    |  8 --------
 tests/dictionaries/10check_base/00-base.xml     |  7 -------
 tests/dictionaries/10check_no_param/00-base.xml |  7 -------
 tests/dictionaries/10check_option/00-base.xml   |  7 -------
 tests/dictionaries/10check_optional/00-base.xml |  8 --------
 .../10check_valid_differ/00-base.xml            |  7 -------
 .../10check_valid_differ_add/00-base.xml        |  7 -------
 .../10check_valid_differ_add/01-base.xml        |  6 ------
 .../00-base.xml                                 |  7 -------
 .../01-base.xml                                 |  7 -------
 .../10check_valid_in_network/00-base.xml        |  7 -------
 .../10check_valid_in_network_cidr/00-base.xml   |  7 -------
 .../10check_valid_ipnetmask/00-base.xml         |  7 -------
 .../10leadership_append/00-base.xml             |  6 ------
 .../10leadership_append/01-base.xml             | 10 ++--------
 .../dictionaries/10leadership_auto/00-base.xml  |  6 ------
 .../10leadership_autoleader/00-base.xml         |  6 ------
 .../10leadership_autoleader_expert/00-base.xml  |  6 ------
 .../10leadership_autosaveexpert/00-base.xml     |  6 ------
 .../10leadership_familyaccent/00-base.xml       |  6 ------
 .../10leadership_leader_hidden/00-base.xml      |  6 ------
 .../00-base.xml                                 |  6 ------
 .../10leadership_leadermandatory/00-base.xml    |  6 ------
 .../10leadership_mandatory/00-base.xml          |  6 ------
 .../10leadership_mandatoryfollower/00-base.xml  |  5 -----
 .../dictionaries/10leadership_multi/00-base.xml |  6 ------
 .../10load_disabled_if_in/00-base.xml           |  7 -------
 .../10load_disabled_if_in_none/00-base.xml      |  7 -------
 .../00-base.xml                                 |  7 -------
 .../00-base.xml                                 |  7 -------
 .../00-base.xml                                 |  7 -------
 .../10load_disabledifin_fallback/00-base.xml    |  7 -------
 .../00-base.xml                                 |  7 -------
 .../00-base.xml                                 |  7 -------
 .../dictionaries/10load_emptyvalue/00-base.xml  | 10 ----------
 .../dictionaries/10load_frozenifin/00-base.xml  |  7 -------
 .../10load_frozenifin_auto/00-base.xml          |  7 -------
 .../10load_frozenifin_multiparam/00-base.xml    |  7 -------
 .../10load_hidden_if_family/00-base.xml         |  7 -------
 .../dictionaries/10load_leadership/00-base.xml  |  6 ------
 .../10load_leadership_default_multi/00-base.xml |  6 ------
 .../00-base.xml                                 |  6 ------
 .../00-base.xml                                 |  8 +-------
 .../10load_leadership_submulti/00-base.xml      |  6 ------
 .../10load_mandatoryifin/00-base.xml            |  7 -------
 .../dictionaries/10load_multivalue/00-base.xml  | 10 ----------
 .../10valid_enum_accent/00-base.xml             | 11 +----------
 .../dictionaries/10valid_enum_base/00-base.xml  | 10 +---------
 .../10valid_enum_base_redefine/00-base.xml      | 11 +----------
 .../10valid_enum_base_redefine/01-base.xml      |  8 --------
 .../10valid_enum_leader/00-base.xml             |  7 -------
 .../dictionaries/10valid_enum_multi/00-base.xml |  7 -------
 .../dictionaries/10valid_enum_none/00-base.xml  | 10 +---------
 .../10valid_enum_number/00-base.xml             | 10 +---------
 .../10valid_enum_numberdefault/00-base.xml      | 11 +----------
 .../dictionaries/10valid_enum_value/00-base.xml |  7 -------
 .../11disabled_if_in_filelist/00-base.xml       |  4 ----
 .../00-base.xml                                 |  4 ----
 .../11disabled_if_in_filelist_multi/00-base.xml |  4 ----
 .../00-base.xml                                 |  4 ----
 .../00-base.xml                                 |  6 ------
 .../00-base.xml                                 |  4 ----
 .../11multi_disabled_if_in_filelist/00-base.xml |  4 ----
 tests/dictionaries/20family_append/00-base.xml  | 10 ----------
 tests/dictionaries/20family_append/01-base.xml  | 10 ----------
 .../20family_appendaccent/00-base.xml           |  7 -------
 .../20family_appendaccent/01-base.xml           | 10 ----------
 .../20family_appendaccent/02-base.xml           | 10 ----------
 tests/dictionaries/20family_empty/00-base.xml   | 14 +-------------
 tests/dictionaries/20family_hidden/00-base.xml  | 10 ----------
 tests/dictionaries/20family_hidden/01-base.xml  | 10 ----------
 tests/dictionaries/20family_mode/00-base.xml    | 10 ----------
 .../20family_modeleadership/00-base.xml         |  7 -------
 tests/dictionaries/21family_change/00-base.xml  | 10 ----------
 tests/dictionaries/21family_change/01-base.xml  | 10 ----------
 .../21family_changeaccent/00-base.xml           | 10 ----------
 .../21family_changeaccent/01-base.xml           | 10 ----------
 tests/dictionaries/21family_empty/00-base.xml   | 10 ----------
 .../30mandatory_withoutvalue/00-base.xml        | 10 ----------
 .../30mandatory_withvalue/00-base.xml           | 10 ----------
 tests/dictionaries/40condition_base/00-base.xml |  7 -------
 .../40condition_fallback/00-base.xml            |  7 -------
 .../40condition_optional/00-base.xml            |  7 -------
 .../40hidden_if_in_group_fallback/00-base.xml   |  7 -------
 .../dictionaries/40ifin_leadership/00-base.xml  |  6 ------
 .../40ifin_leadershipauto/00-base.xml           |  6 ------
 tests/dictionaries/40ifin_multi/00-base.xml     |  7 -------
 tests/dictionaries/50exists_exists/00-base.xml  | 10 ----------
 tests/dictionaries/50exists_exists/01-base.xml  | 10 ----------
 .../50redefine_description/00-base.xml          | 10 ----------
 .../50redefine_description/01-redefine.xml      | 10 ----------
 .../dictionaries/51exists_nonexists/00-base.xml | 10 ----------
 .../dictionaries/51exists_nonexists/01-base.xml | 10 ----------
 tests/dictionaries/51redefine_auto/00-base.xml  |  7 -------
 tests/dictionaries/51redefine_auto/01-base.xml  |  7 -------
 .../51redefine_autofill/00-base.xml             |  6 ------
 .../51redefine_autofill/01-base.xml             |  7 -------
 .../dictionaries/51redefine_family/00-base.xml  |  7 -------
 .../dictionaries/51redefine_family/01-base.xml  | 10 ----------
 tests/dictionaries/51redefine_fill/00-base.xml  |  7 -------
 tests/dictionaries/51redefine_fill/01-base.xml  |  7 -------
 .../51redefine_fillauto/00-base.xml             |  7 -------
 .../51redefine_fillauto/01-base.xml             |  7 -------
 tests/dictionaries/51redefine_help/00-base.xml  | 17 ++---------------
 tests/dictionaries/51redefine_help/01-base.xml  | 17 +++++------------
 .../dictionaries/51redefine_hidden/00-base.xml  | 10 ----------
 .../51redefine_hidden/01-redefine.xml           | 10 ----------
 .../51redefine_remove_check/00-base.xml         |  6 ------
 .../51redefine_remove_check/01-base.xml         | 10 ----------
 .../51redefine_remove_condition/00-base.xml     |  7 -------
 .../51redefine_remove_condition/01-base.xml     | 10 ----------
 .../00-base.xml                                 |  7 -------
 tests/dictionaries/51redefine_value/00-base.xml | 10 ----------
 .../51redefine_value/01-redefine.xml            |  9 ---------
 tests/dictionaries/51remove_fill/00-base.xml    |  7 -------
 .../dictionaries/52exists_redefine/00-base.xml  | 10 ----------
 .../dictionaries/52exists_redefine/01-base.xml  |  9 ---------
 .../dictionaries/60action_external/00-base.xml  | 10 ----------
 .../extra_dirs/extra/00-base.xml                |  1 -
 .../60extra_externalspacecondition/00-base.xml  | 10 ----------
 tests/dictionaries/60extra_help/00-base.xml     |  6 ------
 .../60extra_help/extra_dirs/extra/00-base.xml   |  5 +----
 tests/dictionaries/60extra_load/00-base.xml     | 10 ----------
 .../dictionaries/60extra_mandatory/00-base.xml  | 10 ----------
 .../60extra_name_family/00-base.xml             | 10 ----------
 tests/dictionaries/60extra_redefine/00-base.xml | 10 ----------
 .../dictionaries/60extra_separators/00-base.xml | 10 ----------
 tests/dictionaries/60familyaction/00-base.xml   | 10 ----------
 .../60familyaction/extra_dirs/extra/00-base.xml |  3 ---
 .../60familyaction_accent/00-base.xml           | 10 ----------
 .../extra_dirs/extra/00-base.xml                |  3 ---
 .../60familyaction_mandatory/00-base.xml        | 10 ----------
 .../extra_dirs/extra/00-base.xml                |  5 +----
 .../dictionaries/70container_files/00-base.xml  |  7 -------
 .../70container_files_twice/00-base.xml         |  7 -------
 .../70container_filesmulti/00-base.xml          |  7 -------
 .../70container_filesredefine/00-base.xml       |  7 -------
 tests/dictionaries/70container_new/00-base.xml  |  7 -------
 .../70container_newnocont/00-base.xml           |  7 -------
 .../70container_newwithip/00-base.xml           |  7 -------
 .../70container_pathaccess/00-base.xml          |  7 -------
 .../00-base.xml                                 |  4 ----
 tests/dictionaries/70container_save/00-base.xml | 10 ----------
 .../70container_serviceaccess/00-base.xml       |  7 -------
 .../70container_servicerestriction/00-base.xml  |  8 --------
 .../70container_services/00-base.xml            |  9 ---------
 .../70services_unmanage/00-base.xml             |  7 -------
 171 files changed, 23 insertions(+), 1335 deletions(-)

diff --git a/src/rougail/annotator.py b/src/rougail/annotator.py
index cc730110..1162e567 100644
--- a/src/rougail/annotator.py
+++ b/src/rougail/annotator.py
@@ -473,7 +473,6 @@ class VariableAnnotator:
                  ):
         self.objectspace = objectspace
         self.convert_variable()
-        self.convert_helps()
         self.convert_auto_freeze()
         self.convert_separators()
 
@@ -567,20 +566,6 @@ class VariableAnnotator:
                                                     )
                                 _valid_type(variable)
 
-    def convert_helps(self):
-        if not hasattr(self.objectspace.space, 'help'):
-            return
-        helps = self.objectspace.space.help
-        if hasattr(helps, 'variable'):
-            for hlp in helps.variable.values():
-                variable = self.objectspace.paths.get_variable_obj(hlp.name)
-                variable.help = hlp.text
-        if hasattr(helps, 'family'):
-            for hlp in helps.family.values():
-                variable = self.objectspace.paths.get_family_obj(hlp.name)
-                variable.help = hlp.text
-        del self.objectspace.space.help
-
     def convert_auto_freeze(self):  # pylint: disable=C0111
         def _convert_auto_freeze(variable, namespace):
             if variable.auto_freeze:
diff --git a/src/rougail/data/rougail.dtd b/src/rougail/data/rougail.dtd
index 6269540d..c4fa78c3 100644
--- a/src/rougail/data/rougail.dtd
+++ b/src/rougail/data/rougail.dtd
@@ -80,17 +80,19 @@
 <!ATTLIST override templating (True|False) "True">
 
 <!ELEMENT variables (family*, separators*)>
-<!ELEMENT family (#PCDATA | variable)*>
+<!ELEMENT family (variable*)>
 <!ATTLIST family name CDATA #REQUIRED>
 <!ATTLIST family description CDATA #IMPLIED>
+<!ATTLIST family help CDATA #IMPLIED>
 <!ATTLIST family mode (basic|normal|expert) "basic">
 <!ATTLIST family hidden (True|False) "False">
 <!ATTLIST family dynamic CDATA #IMPLIED>
 
-<!ELEMENT variable (#PCDATA | value)*>
+<!ELEMENT variable (value*)>
 <!ATTLIST variable name CDATA #REQUIRED>
 <!ATTLIST variable type CDATA #IMPLIED>
 <!ATTLIST variable description CDATA #IMPLIED>
+<!ATTLIST variable help CDATA #IMPLIED>
 <!ATTLIST variable hidden (True|False) "False">
 <!ATTLIST variable disabled (True|False) "False">
 <!ATTLIST variable multi (True|False) "False">
@@ -145,5 +147,3 @@
 <!ATTLIST target optional (True|False) "False">
 
 <!ELEMENT follower (#PCDATA)>
-
-<!ELEMENT help ((variable* | family*)*)>
diff --git a/tests/dictionaries/00load_autofreeze/00-base.xml b/tests/dictionaries/00load_autofreeze/00-base.xml
index 63563a7e..aefd954e 100644
--- a/tests/dictionaries/00load_autofreeze/00-base.xml
+++ b/tests/dictionaries/00load_autofreeze/00-base.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
     <variables>
         <family name="général">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" auto_freeze="True">
@@ -10,14 +9,7 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/00load_autofreezeexpert/00-base.xml b/tests/dictionaries/00load_autofreezeexpert/00-base.xml
index 3e42d230..2c66f0dc 100644
--- a/tests/dictionaries/00load_autofreezeexpert/00-base.xml
+++ b/tests/dictionaries/00load_autofreezeexpert/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="général">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" auto_freeze="True" mode="expert">
@@ -12,14 +9,7 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/00load_autosave/00-base.xml b/tests/dictionaries/00load_autosave/00-base.xml
index c185a325..8825e85b 100644
--- a/tests/dictionaries/00load_autosave/00-base.xml
+++ b/tests/dictionaries/00load_autosave/00-base.xml
@@ -1,22 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="général">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" auto_save="True">
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/00load_autosaveexpert/00-base.xml b/tests/dictionaries/00load_autosaveexpert/00-base.xml
index 0b003702..7fa79f58 100644
--- a/tests/dictionaries/00load_autosaveexpert/00-base.xml
+++ b/tests/dictionaries/00load_autosaveexpert/00-base.xml
@@ -1,22 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="général">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" auto_save="True" mode="expert">
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/00load_comment/00-base.xml b/tests/dictionaries/00load_comment/00-base.xml
index bce00346..a5e543fe 100644
--- a/tests/dictionaries/00load_comment/00-base.xml
+++ b/tests/dictionaries/00load_comment/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="général">
             <!-- this is a comment -->
@@ -10,14 +7,7 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/00load_notype/00-base.xml b/tests/dictionaries/00load_notype/00-base.xml
index c73af336..aac6f7fe 100644
--- a/tests/dictionaries/00load_notype/00-base.xml
+++ b/tests/dictionaries/00load_notype/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="général">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
@@ -12,14 +9,7 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/00load_save/00-base.xml b/tests/dictionaries/00load_save/00-base.xml
index bc7628d5..b0950adb 100644
--- a/tests/dictionaries/00load_save/00-base.xml
+++ b/tests/dictionaries/00load_save/00-base.xml
@@ -1,22 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="général">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/00load_subfolder/99-base.xml b/tests/dictionaries/00load_subfolder/99-base.xml
index bc7628d5..b0950adb 100644
--- a/tests/dictionaries/00load_subfolder/99-base.xml
+++ b/tests/dictionaries/00load_subfolder/99-base.xml
@@ -1,22 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="général">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/00load_subfolder/subfolder/00-base.xml b/tests/dictionaries/00load_subfolder/subfolder/00-base.xml
index 28f0419b..337859b5 100644
--- a/tests/dictionaries/00load_subfolder/subfolder/00-base.xml
+++ b/tests/dictionaries/00load_subfolder/subfolder/00-base.xml
@@ -1,23 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <rougail>
-
-    <services/>
-
     <variables>
         <family name='général'>
             <variable name='mode_conteneur_actif1' type='oui/non' description="No change" hidden="True">
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/01auto_base/00-base.xml b/tests/dictionaries/01auto_base/00-base.xml
index edf7fd20..f20b3bc8 100644
--- a/tests/dictionaries/01auto_base/00-base.xml
+++ b/tests/dictionaries/01auto_base/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
@@ -12,7 +9,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -20,9 +16,6 @@
             <param type="variable">mode_conteneur_actif1</param>
         </fill>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/01auto_withoutparam/00-base.xml b/tests/dictionaries/01auto_withoutparam/00-base.xml
index 5c07d2c3..e1fdccf1 100644
--- a/tests/dictionaries/01auto_withoutparam/00-base.xml
+++ b/tests/dictionaries/01auto_withoutparam/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
@@ -12,16 +9,12 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
         <fill name="calc_val" target="mode_conteneur_actif">
         </fill>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/01base_multi/00-base.xml b/tests/dictionaries/01base_multi/00-base.xml
index b842e0ca..966384cd 100644
--- a/tests/dictionaries/01base_multi/00-base.xml
+++ b/tests/dictionaries/01base_multi/00-base.xml
@@ -1,22 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="Redefine description" hidden="True" multi="True">
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/01fill_autofreeze/00-base.xml b/tests/dictionaries/01fill_autofreeze/00-base.xml
index 79216db2..3613a89e 100644
--- a/tests/dictionaries/01fill_autofreeze/00-base.xml
+++ b/tests/dictionaries/01fill_autofreeze/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" auto_freeze="True">
@@ -15,7 +12,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -23,9 +19,6 @@
             <param type="variable">mode_conteneur_actif1</param>
         </fill>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/01fill_autosave/00-base.xml b/tests/dictionaries/01fill_autosave/00-base.xml
index 422e8149..39223fe0 100644
--- a/tests/dictionaries/01fill_autosave/00-base.xml
+++ b/tests/dictionaries/01fill_autosave/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" auto_save="True">
@@ -12,7 +9,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -20,9 +16,6 @@
             <param type="variable">mode_conteneur_actif1</param>
         </fill>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/01fill_base/00-base.xml b/tests/dictionaries/01fill_base/00-base.xml
index 5bc01db8..d5a6d18c 100644
--- a/tests/dictionaries/01fill_base/00-base.xml
+++ b/tests/dictionaries/01fill_base/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change"/>
@@ -10,7 +7,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -18,9 +14,6 @@
             <param type="variable">mode_conteneur_actif1</param>
         </fill>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/01fill_baseaccent/00-base.xml b/tests/dictionaries/01fill_baseaccent/00-base.xml
index 8d6ea338..faad1554 100644
--- a/tests/dictionaries/01fill_baseaccent/00-base.xml
+++ b/tests/dictionaries/01fill_baseaccent/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="Général">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
@@ -12,7 +9,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -20,9 +16,6 @@
             <param type="variable">mode_conteneur_actif1</param>
         </fill>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/01fill_mandatory/00-base.xml b/tests/dictionaries/01fill_mandatory/00-base.xml
index e6c39d4d..499a1f6e 100644
--- a/tests/dictionaries/01fill_mandatory/00-base.xml
+++ b/tests/dictionaries/01fill_mandatory/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general" mode="basic">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" mandatory="True" mode="expert"/>
@@ -10,7 +7,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -18,9 +14,6 @@
             <param type="variable">mode_conteneur_actif1</param>
         </fill>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/01fill_number/00-base.xml b/tests/dictionaries/01fill_number/00-base.xml
index 642b8f77..bfb810f2 100644
--- a/tests/dictionaries/01fill_number/00-base.xml
+++ b/tests/dictionaries/01fill_number/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="number" description="No change" hidden="True"/>
@@ -10,7 +7,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -18,9 +14,6 @@
             <param type="number">3</param>
         </fill>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/01fill_optional/00-base.xml b/tests/dictionaries/01fill_optional/00-base.xml
index a2142cab..a48bbd65 100644
--- a/tests/dictionaries/01fill_optional/00-base.xml
+++ b/tests/dictionaries/01fill_optional/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
@@ -12,7 +9,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -22,9 +18,6 @@
             <param type="variable" optional="True">mode_conteneur_actif3</param>
         </fill>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/01separator_base/00-base.xml b/tests/dictionaries/01separator_base/00-base.xml
index cd4b3228..9b468a63 100644
--- a/tests/dictionaries/01separator_base/00-base.xml
+++ b/tests/dictionaries/01separator_base/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
@@ -13,12 +10,6 @@
             <separator name="mode_conteneur_actif">Établissement</separator>
         </separators>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/01separator_neverhidden/00-base.xml b/tests/dictionaries/01separator_neverhidden/00-base.xml
index cd4b3228..9b468a63 100644
--- a/tests/dictionaries/01separator_neverhidden/00-base.xml
+++ b/tests/dictionaries/01separator_neverhidden/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
@@ -13,12 +10,6 @@
             <separator name="mode_conteneur_actif">Établissement</separator>
         </separators>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/10autosave_hidden/00-base.xml b/tests/dictionaries/10autosave_hidden/00-base.xml
index b50316fc..a18d598a 100644
--- a/tests/dictionaries/10autosave_hidden/00-base.xml
+++ b/tests/dictionaries/10autosave_hidden/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="général">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
@@ -10,18 +7,13 @@
             </variable>
             <variable name="autosavevar" type="string" description="autosave variable" hidden="True" auto_save="True"/>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
         <fill name="calc_val" target="autosavevar">
             <param>oui</param>
         </fill>
-
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/10autosave_hidden_frozenifin/00-base.xml b/tests/dictionaries/10autosave_hidden_frozenifin/00-base.xml
index 3a48d4d7..c983dcd9 100644
--- a/tests/dictionaries/10autosave_hidden_frozenifin/00-base.xml
+++ b/tests/dictionaries/10autosave_hidden_frozenifin/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="général">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
@@ -10,7 +7,6 @@
             </variable>
             <variable name="autosavevar" type="string" description="autosave variable" auto_save="True"/>
         </family>
-        <separators/>
     </variables>
     <constraints>
         <fill name="calc_val" target="autosavevar">
@@ -20,11 +16,7 @@
              <param>oui</param>
              <target type="variable">autosavevar</target>
         </condition>
-
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/10check_base/00-base.xml b/tests/dictionaries/10check_base/00-base.xml
index 49a1c307..40b7ebfa 100644
--- a/tests/dictionaries/10check_base/00-base.xml
+++ b/tests/dictionaries/10check_base/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="string" description="No change">
@@ -10,7 +7,6 @@
             </variable>
             <variable name="int" type="number" description="No change"/>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -19,9 +15,6 @@
             <param name="maxi">100</param>
         </check>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/10check_no_param/00-base.xml b/tests/dictionaries/10check_no_param/00-base.xml
index 45688bf4..f2d3626a 100644
--- a/tests/dictionaries/10check_no_param/00-base.xml
+++ b/tests/dictionaries/10check_no_param/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="string" description="No change">
@@ -10,15 +7,11 @@
             </variable>
             <variable name="int" type="number" description="No change"/>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
         <check name="valid_lower" target="int"/>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/10check_option/00-base.xml b/tests/dictionaries/10check_option/00-base.xml
index 5abff47b..3621193d 100644
--- a/tests/dictionaries/10check_option/00-base.xml
+++ b/tests/dictionaries/10check_option/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="string" description="No change">
@@ -13,7 +10,6 @@
             </variable>
             <variable name="int" type="number" description="No change"/>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -22,9 +18,6 @@
             <param name="maxi" type="variable">int2</param>
         </check>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/10check_optional/00-base.xml b/tests/dictionaries/10check_optional/00-base.xml
index 2e93d1fd..17c64a7f 100644
--- a/tests/dictionaries/10check_optional/00-base.xml
+++ b/tests/dictionaries/10check_optional/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="string" description="No change">
@@ -11,7 +8,6 @@
             <variable name="int" type="number" description="No change"/>
             <variable name="int2" type="number" description="No change"/>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -21,11 +17,7 @@
         <check name="valid_differ" target="int">
             <param type="variable" optional="True">int3</param>
         </check>
-
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/10check_valid_differ/00-base.xml b/tests/dictionaries/10check_valid_differ/00-base.xml
index 7f7417bd..e830a9da 100644
--- a/tests/dictionaries/10check_valid_differ/00-base.xml
+++ b/tests/dictionaries/10check_valid_differ/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -12,7 +9,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -20,9 +16,6 @@
             <param type="variable">mode_conteneur_actif1</param>
         </check>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/10check_valid_differ_add/00-base.xml b/tests/dictionaries/10check_valid_differ_add/00-base.xml
index fd47c9ca..4bf28ad6 100644
--- a/tests/dictionaries/10check_valid_differ_add/00-base.xml
+++ b/tests/dictionaries/10check_valid_differ_add/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -18,7 +15,6 @@
                 <value>oui</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -26,9 +22,6 @@
             <param type="variable">mode_conteneur_actif1</param>
         </check>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/10check_valid_differ_add/01-base.xml b/tests/dictionaries/10check_valid_differ_add/01-base.xml
index 3280f094..05fdad68 100644
--- a/tests/dictionaries/10check_valid_differ_add/01-base.xml
+++ b/tests/dictionaries/10check_valid_differ_add/01-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif3" redefine="True"/>
@@ -18,9 +15,6 @@
             <param type="variable">mode_conteneur_actif2</param>
         </check>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/10check_valid_differ_removecheck/00-base.xml b/tests/dictionaries/10check_valid_differ_removecheck/00-base.xml
index fd47c9ca..4bf28ad6 100644
--- a/tests/dictionaries/10check_valid_differ_removecheck/00-base.xml
+++ b/tests/dictionaries/10check_valid_differ_removecheck/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -18,7 +15,6 @@
                 <value>oui</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -26,9 +22,6 @@
             <param type="variable">mode_conteneur_actif1</param>
         </check>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/10check_valid_differ_removecheck/01-base.xml b/tests/dictionaries/10check_valid_differ_removecheck/01-base.xml
index 2f4e1a74..336a79c8 100644
--- a/tests/dictionaries/10check_valid_differ_removecheck/01-base.xml
+++ b/tests/dictionaries/10check_valid_differ_removecheck/01-base.xml
@@ -1,15 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif3" redefine="True" remove_check="True">
                 <value>oui</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -20,9 +16,6 @@
             <param type="variable">mode_conteneur_actif2</param>
         </check>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/10check_valid_in_network/00-base.xml b/tests/dictionaries/10check_valid_in_network/00-base.xml
index 43cc2898..2ce08d1a 100644
--- a/tests/dictionaries/10check_valid_in_network/00-base.xml
+++ b/tests/dictionaries/10check_valid_in_network/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -12,7 +9,6 @@
             <variable name="adresse_netmask_eth0" type="netmask" description="Masque de sous réseau de la carte" mandatory="True" mode="basic"/>
             <variable name="adresse_ip" type="local_ip" description="IP" mandatory="True" mode="basic"/>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -21,9 +17,6 @@
             <param type="variable">adresse_netmask_eth0</param>
         </check>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/10check_valid_in_network_cidr/00-base.xml b/tests/dictionaries/10check_valid_in_network_cidr/00-base.xml
index f11b495b..fba7e8c2 100644
--- a/tests/dictionaries/10check_valid_in_network_cidr/00-base.xml
+++ b/tests/dictionaries/10check_valid_in_network_cidr/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -11,7 +8,6 @@
             <variable name="adresse_ip_eth0" type="cidr" description="Adresse IP de la carte" mandatory="True" mode="basic"/>
             <variable name="adresse_ip" type="local_ip" description="IP" mandatory="True" mode="basic"/>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -19,9 +15,6 @@
             <param type="variable">adresse_ip_eth0</param>
         </check>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/10check_valid_ipnetmask/00-base.xml b/tests/dictionaries/10check_valid_ipnetmask/00-base.xml
index d02da19d..2a8d6c9d 100644
--- a/tests/dictionaries/10check_valid_ipnetmask/00-base.xml
+++ b/tests/dictionaries/10check_valid_ipnetmask/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -11,7 +8,6 @@
             <variable name="adresse_ip_eth0" type="local_ip" description="Adresse IP de la carte" mandatory="True" mode="basic"/>
             <variable name="adresse_netmask_eth0" type="netmask" description="Masque de sous réseau de la carte" mandatory="True" mode="basic"/>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -19,9 +15,6 @@
             <param type="variable">adresse_ip_eth0</param>
         </check>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/10leadership_append/00-base.xml b/tests/dictionaries/10leadership_append/00-base.xml
index f24dc653..7e4144bc 100644
--- a/tests/dictionaries/10leadership_append/00-base.xml
+++ b/tests/dictionaries/10leadership_append/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -28,7 +25,4 @@
             <follower>follower2</follower>
         </group>
     </constraints>
-
-    <help/>
-
 </rougail>
diff --git a/tests/dictionaries/10leadership_append/01-base.xml b/tests/dictionaries/10leadership_append/01-base.xml
index 6a86d00f..93706d66 100644
--- a/tests/dictionaries/10leadership_append/01-base.xml
+++ b/tests/dictionaries/10leadership_append/01-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general1">
             <variable name="follower3" type="string" description="follower3"/>
@@ -10,11 +7,8 @@
     </variables>
 
     <constraints>
-	<group leader="leader">
+        <group leader="leader">
             <follower>follower3</follower>
-	</group>
+        </group>
     </constraints>
-
-    <help/>
-
 </rougail>
diff --git a/tests/dictionaries/10leadership_auto/00-base.xml b/tests/dictionaries/10leadership_auto/00-base.xml
index 329c04a4..04fd7138 100644
--- a/tests/dictionaries/10leadership_auto/00-base.xml
+++ b/tests/dictionaries/10leadership_auto/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -31,7 +28,4 @@
             <follower>follower3</follower>
         </group>
     </constraints>
-
-    <help/>
-
 </rougail>
diff --git a/tests/dictionaries/10leadership_autoleader/00-base.xml b/tests/dictionaries/10leadership_autoleader/00-base.xml
index 04132f05..a79f5a36 100644
--- a/tests/dictionaries/10leadership_autoleader/00-base.xml
+++ b/tests/dictionaries/10leadership_autoleader/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -26,7 +23,4 @@
             <follower>follower2</follower>
         </group>
     </constraints>
-
-    <help/>
-
 </rougail>
diff --git a/tests/dictionaries/10leadership_autoleader_expert/00-base.xml b/tests/dictionaries/10leadership_autoleader_expert/00-base.xml
index 1defb82c..316c78da 100644
--- a/tests/dictionaries/10leadership_autoleader_expert/00-base.xml
+++ b/tests/dictionaries/10leadership_autoleader_expert/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general" mode="expert">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -25,7 +22,4 @@
             <follower>follower2</follower>
         </group>
     </constraints>
-
-    <help/>
-
 </rougail>
diff --git a/tests/dictionaries/10leadership_autosaveexpert/00-base.xml b/tests/dictionaries/10leadership_autosaveexpert/00-base.xml
index 35355328..20e93913 100644
--- a/tests/dictionaries/10leadership_autosaveexpert/00-base.xml
+++ b/tests/dictionaries/10leadership_autosaveexpert/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -26,7 +23,4 @@
             <follower>follower2</follower>
         </group>
     </constraints>
-
-    <help/>
-
 </rougail>
diff --git a/tests/dictionaries/10leadership_familyaccent/00-base.xml b/tests/dictionaries/10leadership_familyaccent/00-base.xml
index b272a405..201ce4b0 100644
--- a/tests/dictionaries/10leadership_familyaccent/00-base.xml
+++ b/tests/dictionaries/10leadership_familyaccent/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="Général">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -26,7 +23,4 @@
             <follower>follower2</follower>
         </group>
     </constraints>
-
-    <help/>
-
 </rougail>
diff --git a/tests/dictionaries/10leadership_leader_hidden/00-base.xml b/tests/dictionaries/10leadership_leader_hidden/00-base.xml
index 8449817f..14b731f5 100644
--- a/tests/dictionaries/10leadership_leader_hidden/00-base.xml
+++ b/tests/dictionaries/10leadership_leader_hidden/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general" mode="expert">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -25,7 +22,4 @@
             <follower>follower2</follower>
         </group>
     </constraints>
-
-    <help/>
-
 </rougail>
diff --git a/tests/dictionaries/10leadership_leader_hidden_if_in/00-base.xml b/tests/dictionaries/10leadership_leader_hidden_if_in/00-base.xml
index 5cfb49e1..019d321d 100644
--- a/tests/dictionaries/10leadership_leader_hidden_if_in/00-base.xml
+++ b/tests/dictionaries/10leadership_leader_hidden_if_in/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general" mode="expert">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -26,7 +23,4 @@
             <target type="variable">leader</target>
         </condition>
     </constraints>
-
-    <help/>
-
 </rougail>
diff --git a/tests/dictionaries/10leadership_leadermandatory/00-base.xml b/tests/dictionaries/10leadership_leadermandatory/00-base.xml
index e3c02788..7e97da35 100644
--- a/tests/dictionaries/10leadership_leadermandatory/00-base.xml
+++ b/tests/dictionaries/10leadership_leadermandatory/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -26,7 +23,4 @@
             <follower>follower2</follower>
         </group>
     </constraints>
-
-    <help/>
-
 </rougail>
diff --git a/tests/dictionaries/10leadership_mandatory/00-base.xml b/tests/dictionaries/10leadership_mandatory/00-base.xml
index c09871f7..39d53033 100644
--- a/tests/dictionaries/10leadership_mandatory/00-base.xml
+++ b/tests/dictionaries/10leadership_mandatory/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -26,7 +23,4 @@
             <follower>follower2</follower>
         </group>
     </constraints>
-
-    <help/>
-
 </rougail>
diff --git a/tests/dictionaries/10leadership_mandatoryfollower/00-base.xml b/tests/dictionaries/10leadership_mandatoryfollower/00-base.xml
index 74fda799..0697a0c7 100644
--- a/tests/dictionaries/10leadership_mandatoryfollower/00-base.xml
+++ b/tests/dictionaries/10leadership_mandatoryfollower/00-base.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
     <variables>
         <family name="général">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
@@ -9,7 +8,6 @@
 			<variable name="nut_monitor_netmask" type="netmask" description="Masque de l'IP du réseau de l'esclave" multi="True"/>
             <variable name="nut_monitor_host" type="network" description="Adresse IP du réseau de l'esclave" mandatory="True"/>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -17,9 +15,6 @@
             <follower>nut_monitor_host</follower>
         </group>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/10leadership_multi/00-base.xml b/tests/dictionaries/10leadership_multi/00-base.xml
index 4c00818e..1f3bd07c 100644
--- a/tests/dictionaries/10leadership_multi/00-base.xml
+++ b/tests/dictionaries/10leadership_multi/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -35,7 +32,4 @@
             <follower>follower21</follower>
         </group>
     </constraints>
-
-    <help/>
-
 </rougail>
diff --git a/tests/dictionaries/10load_disabled_if_in/00-base.xml b/tests/dictionaries/10load_disabled_if_in/00-base.xml
index 4a6ccb5c..1080837f 100644
--- a/tests/dictionaries/10load_disabled_if_in/00-base.xml
+++ b/tests/dictionaries/10load_disabled_if_in/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="condition" type="oui/non" description="No change">
@@ -15,7 +12,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -26,9 +22,6 @@
             <target type="filelist">afilllist</target>
         </condition>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/10load_disabled_if_in_none/00-base.xml b/tests/dictionaries/10load_disabled_if_in_none/00-base.xml
index 894d0a13..a9f4476c 100644
--- a/tests/dictionaries/10load_disabled_if_in_none/00-base.xml
+++ b/tests/dictionaries/10load_disabled_if_in_none/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="condition" type="string" description="No change">
@@ -15,7 +12,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -26,9 +22,6 @@
             <target type="filelist">afilllist</target>
         </condition>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/10load_disabled_if_inaccent_family/00-base.xml b/tests/dictionaries/10load_disabled_if_inaccent_family/00-base.xml
index d185fc60..4e5af5b7 100644
--- a/tests/dictionaries/10load_disabled_if_inaccent_family/00-base.xml
+++ b/tests/dictionaries/10load_disabled_if_inaccent_family/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="Général">
             <variable name="condition" type="oui/non" description="No change">
@@ -20,7 +17,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -31,9 +27,6 @@
             <target type="family">Général2</target>
         </condition>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/10load_disabled_if_not_in_fallback/00-base.xml b/tests/dictionaries/10load_disabled_if_not_in_fallback/00-base.xml
index d09fdf81..e2c7f89c 100644
--- a/tests/dictionaries/10load_disabled_if_not_in_fallback/00-base.xml
+++ b/tests/dictionaries/10load_disabled_if_not_in_fallback/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="condition" type="oui/non" description="No change">
@@ -15,7 +12,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -30,9 +26,6 @@
             <target type="variable">mode_conteneur_actif</target>
         </condition>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/10load_disabled_if_not_in_fallback_force/00-base.xml b/tests/dictionaries/10load_disabled_if_not_in_fallback_force/00-base.xml
index 26da30a0..3303b547 100644
--- a/tests/dictionaries/10load_disabled_if_not_in_fallback_force/00-base.xml
+++ b/tests/dictionaries/10load_disabled_if_not_in_fallback_force/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="condition" type="oui/non" description="No change">
@@ -15,7 +12,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -30,9 +26,6 @@
             <target type="variable">mode_conteneur_actif</target>
         </condition>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/10load_disabledifin_fallback/00-base.xml b/tests/dictionaries/10load_disabledifin_fallback/00-base.xml
index f6f0484c..a52611d9 100644
--- a/tests/dictionaries/10load_disabledifin_fallback/00-base.xml
+++ b/tests/dictionaries/10load_disabledifin_fallback/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="condition" type="oui/non" description="No change">
@@ -15,7 +12,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -30,9 +26,6 @@
             <target type="variable">mode_conteneur_actif</target>
         </condition>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/10load_disabledifin_fallback_force/00-base.xml b/tests/dictionaries/10load_disabledifin_fallback_force/00-base.xml
index bbbb919e..d39daed4 100644
--- a/tests/dictionaries/10load_disabledifin_fallback_force/00-base.xml
+++ b/tests/dictionaries/10load_disabledifin_fallback_force/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="condition" type="oui/non" description="No change">
@@ -15,7 +12,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -30,9 +26,6 @@
             <target type="variable">mode_conteneur_actif</target>
         </condition>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/10load_disabledifin_whithouttype/00-base.xml b/tests/dictionaries/10load_disabledifin_whithouttype/00-base.xml
index 1280f3f1..1f375c62 100644
--- a/tests/dictionaries/10load_disabledifin_whithouttype/00-base.xml
+++ b/tests/dictionaries/10load_disabledifin_whithouttype/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="condition" type="oui/non" description="No change">
@@ -15,7 +12,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -26,9 +22,6 @@
             <target type="filelist">afilllist</target>
         </condition>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/10load_emptyvalue/00-base.xml b/tests/dictionaries/10load_emptyvalue/00-base.xml
index 4469691e..49be4776 100644
--- a/tests/dictionaries/10load_emptyvalue/00-base.xml
+++ b/tests/dictionaries/10load_emptyvalue/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="string" description="No change">
@@ -12,14 +9,7 @@
                 <value/>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/10load_frozenifin/00-base.xml b/tests/dictionaries/10load_frozenifin/00-base.xml
index 37e6f3d7..cb873c2b 100644
--- a/tests/dictionaries/10load_frozenifin/00-base.xml
+++ b/tests/dictionaries/10load_frozenifin/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="condition" type="oui/non" description="No change">
@@ -15,7 +12,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -25,9 +21,6 @@
             <target type="variable">mode_conteneur_actif2</target>
         </condition>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/10load_frozenifin_auto/00-base.xml b/tests/dictionaries/10load_frozenifin_auto/00-base.xml
index 3a89b4b8..73c32950 100644
--- a/tests/dictionaries/10load_frozenifin_auto/00-base.xml
+++ b/tests/dictionaries/10load_frozenifin_auto/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="condition" type="oui/non" description="No change">
@@ -15,7 +12,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -28,9 +24,6 @@
             <param>non</param>
         </fill>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/10load_frozenifin_multiparam/00-base.xml b/tests/dictionaries/10load_frozenifin_multiparam/00-base.xml
index 900d5e65..270cf7d2 100644
--- a/tests/dictionaries/10load_frozenifin_multiparam/00-base.xml
+++ b/tests/dictionaries/10load_frozenifin_multiparam/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="condition" type="string" description="No change">
@@ -15,7 +12,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -31,9 +27,6 @@
             <target type="variable">mode_conteneur_actif2</target>
         </condition>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/10load_hidden_if_family/00-base.xml b/tests/dictionaries/10load_hidden_if_family/00-base.xml
index 193a2f76..172a26fb 100644
--- a/tests/dictionaries/10load_hidden_if_family/00-base.xml
+++ b/tests/dictionaries/10load_hidden_if_family/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="Général">
             <variable name="condition" type="oui/non" description="No change">
@@ -20,7 +17,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -31,9 +27,6 @@
             <target type="family">Général2</target>
         </condition>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/10load_leadership/00-base.xml b/tests/dictionaries/10load_leadership/00-base.xml
index f24dc653..7e4144bc 100644
--- a/tests/dictionaries/10load_leadership/00-base.xml
+++ b/tests/dictionaries/10load_leadership/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -28,7 +25,4 @@
             <follower>follower2</follower>
         </group>
     </constraints>
-
-    <help/>
-
 </rougail>
diff --git a/tests/dictionaries/10load_leadership_default_multi/00-base.xml b/tests/dictionaries/10load_leadership_default_multi/00-base.xml
index f08a2d8e..8e8ef66d 100644
--- a/tests/dictionaries/10load_leadership_default_multi/00-base.xml
+++ b/tests/dictionaries/10load_leadership_default_multi/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
           <variable name="mode_conteneur_actif" type="oui/non" description="leader" multi="True">
@@ -22,7 +19,4 @@
             <follower>follower2</follower>
         </group>
     </constraints>
-
-    <help/>
-
 </rougail>
diff --git a/tests/dictionaries/10load_leadership_default_submulti/00-base.xml b/tests/dictionaries/10load_leadership_default_submulti/00-base.xml
index 37966c0d..b750b66d 100644
--- a/tests/dictionaries/10load_leadership_default_submulti/00-base.xml
+++ b/tests/dictionaries/10load_leadership_default_submulti/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
           <variable name="mode_conteneur_actif" type="oui/non" description="leader" multi="True">
@@ -27,7 +24,4 @@
             <follower>follower2</follower>
         </group>
     </constraints>
-
-    <help/>
-
 </rougail>
diff --git a/tests/dictionaries/10load_leadership_defaultmulti_leader/00-base.xml b/tests/dictionaries/10load_leadership_defaultmulti_leader/00-base.xml
index 687f8e83..daadfbd1 100644
--- a/tests/dictionaries/10load_leadership_defaultmulti_leader/00-base.xml
+++ b/tests/dictionaries/10load_leadership_defaultmulti_leader/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
           <variable name="mode_conteneur_actif" type="oui/non" description="leader" multi="True">
@@ -11,7 +8,7 @@
           <variable name="leader" type="string" description="leader" multi="True">
            <value>value</value>
           </variable>
-	  <variable name="follower1" type="string" description="follower1"/>
+          <variable name="follower1" type="string" description="follower1"/>
           <variable name="follower2" type="string" description="follower2"/>
         </family>
     </variables>
@@ -22,7 +19,4 @@
             <follower>follower2</follower>
         </group>
     </constraints>
-
-    <help/>
-
 </rougail>
diff --git a/tests/dictionaries/10load_leadership_submulti/00-base.xml b/tests/dictionaries/10load_leadership_submulti/00-base.xml
index 48377ba3..92e68587 100644
--- a/tests/dictionaries/10load_leadership_submulti/00-base.xml
+++ b/tests/dictionaries/10load_leadership_submulti/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -28,7 +25,4 @@
             <follower>follower2</follower>
         </group>
     </constraints>
-
-    <help/>
-
 </rougail>
diff --git a/tests/dictionaries/10load_mandatoryifin/00-base.xml b/tests/dictionaries/10load_mandatoryifin/00-base.xml
index 718a24f7..9f973020 100644
--- a/tests/dictionaries/10load_mandatoryifin/00-base.xml
+++ b/tests/dictionaries/10load_mandatoryifin/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="condition" type="oui/non" description="No change">
@@ -15,7 +12,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -25,9 +21,6 @@
             <target type="variable">mode_conteneur_actif2</target>
         </condition>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/10load_multivalue/00-base.xml b/tests/dictionaries/10load_multivalue/00-base.xml
index 5ee2a5ee..6fb737af 100644
--- a/tests/dictionaries/10load_multivalue/00-base.xml
+++ b/tests/dictionaries/10load_multivalue/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True" multi="True">
@@ -10,14 +7,7 @@
                 <value>oui</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/10valid_enum_accent/00-base.xml b/tests/dictionaries/10valid_enum_accent/00-base.xml
index 12720be4..69931d89 100644
--- a/tests/dictionaries/10valid_enum_accent/00-base.xml
+++ b/tests/dictionaries/10valid_enum_accent/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general" mode="expert">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -10,11 +7,10 @@
             </variable>
         </family>
         <family name="enumfam" mode="expert">
-            <variable name="enumvar" type="string" description="multi">
+            <variable name="enumvar" type="string" description="multi" help="bla bla bla">
                 <value>c</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -25,11 +21,6 @@
             <param>é</param>
         </check>
     </constraints>
-
-    <help>
-        <variable name="enumvar">bla bla bla</variable>
-    </help>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/10valid_enum_base/00-base.xml b/tests/dictionaries/10valid_enum_base/00-base.xml
index 9c8d133e..4be6f836 100644
--- a/tests/dictionaries/10valid_enum_base/00-base.xml
+++ b/tests/dictionaries/10valid_enum_base/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general" mode="expert">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -10,7 +7,7 @@
             </variable>
         </family>
         <family name="enumfam" mode="expert">
-            <variable name="enumvar" type="string" description="multi">
+            <variable name="enumvar" type="string" description="multi" help="bla bla bla">
                 <value>c</value>
             </variable>
         </family>
@@ -24,11 +21,6 @@
             <param>c</param>
         </check>
     </constraints>
-
-    <help>
-        <variable name="enumvar">bla bla bla</variable>
-    </help>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/10valid_enum_base_redefine/00-base.xml b/tests/dictionaries/10valid_enum_base_redefine/00-base.xml
index 0b6101aa..b9d58f5c 100644
--- a/tests/dictionaries/10valid_enum_base_redefine/00-base.xml
+++ b/tests/dictionaries/10valid_enum_base_redefine/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general" mode="expert">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -13,11 +10,10 @@
             <variable name="enumvar2" type="string" description="multi">
                 <value>c</value>
             </variable>
-            <variable name="enumvar" type="string" description="multi">
+            <variable name="enumvar" type="string" description="multi" help="bla bla bla">
                 <value>c</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -32,11 +28,6 @@
             <param>c</param>
         </check>
     </constraints>
-
-    <help>
-        <variable name="enumvar">bla bla bla</variable>
-    </help>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/10valid_enum_base_redefine/01-base.xml b/tests/dictionaries/10valid_enum_base_redefine/01-base.xml
index 44db7160..0a3e784f 100644
--- a/tests/dictionaries/10valid_enum_base_redefine/01-base.xml
+++ b/tests/dictionaries/10valid_enum_base_redefine/01-base.xml
@@ -1,15 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="enumfam" mode="expert">
             <variable name="enumvar" redefine="True" remove_check="True">
                 <value>c</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -18,10 +14,6 @@
             <param>c</param>
         </check>
     </constraints>
-
-    <help>
-    </help>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/10valid_enum_leader/00-base.xml b/tests/dictionaries/10valid_enum_leader/00-base.xml
index 27161903..d571785a 100644
--- a/tests/dictionaries/10valid_enum_leader/00-base.xml
+++ b/tests/dictionaries/10valid_enum_leader/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -12,7 +9,6 @@
             <variable name="follower1" type="string" description="follower1"/>
             <variable name="follower2" type="string" description="follower2"/>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -26,9 +22,6 @@
             <follower>follower2</follower>
         </group>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/10valid_enum_multi/00-base.xml b/tests/dictionaries/10valid_enum_multi/00-base.xml
index 6ea4bfa1..6ff34085 100644
--- a/tests/dictionaries/10valid_enum_multi/00-base.xml
+++ b/tests/dictionaries/10valid_enum_multi/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -10,7 +7,6 @@
             </variable>
             <variable name="multi" type="string" description="multi" multi="True"/>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -20,9 +16,6 @@
             <param>c</param>
         </check>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/10valid_enum_none/00-base.xml b/tests/dictionaries/10valid_enum_none/00-base.xml
index f03d3e1a..0de059b5 100644
--- a/tests/dictionaries/10valid_enum_none/00-base.xml
+++ b/tests/dictionaries/10valid_enum_none/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general" mode="expert">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -10,7 +7,7 @@
             </variable>
         </family>
         <family name="enumfam" mode="expert">
-            <variable name="enumvar" type="string" description="multi">
+            <variable name="enumvar" type="string" description="multi" help="bla bla bla">
                 <value>b</value>
             </variable>
         </family>
@@ -24,11 +21,6 @@
             <param/>
         </check>
     </constraints>
-
-    <help>
-        <variable name="enumvar">bla bla bla</variable>
-    </help>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/10valid_enum_number/00-base.xml b/tests/dictionaries/10valid_enum_number/00-base.xml
index 2ab66988..d0e93af0 100644
--- a/tests/dictionaries/10valid_enum_number/00-base.xml
+++ b/tests/dictionaries/10valid_enum_number/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general" mode="expert">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -10,9 +7,8 @@
             </variable>
         </family>
         <family name="enumfam" mode="expert">
-            <variable name="enumvar" type="number" description="enumvar"/>
+            <variable name="enumvar" type="number" description="enumvar" help="bla bla bla"/>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -23,10 +19,6 @@
         </check>
     </constraints>
 
-    <help>
-        <variable name="enumvar">bla bla bla</variable>
-    </help>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/10valid_enum_numberdefault/00-base.xml b/tests/dictionaries/10valid_enum_numberdefault/00-base.xml
index 531b177f..dbc70d07 100644
--- a/tests/dictionaries/10valid_enum_numberdefault/00-base.xml
+++ b/tests/dictionaries/10valid_enum_numberdefault/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general" mode="expert">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -10,11 +7,10 @@
             </variable>
         </family>
         <family name="enumfam" mode="expert">
-            <variable name="enumvar" type="number" description="enumvar">
+            <variable name="enumvar" type="number" description="enumvar" help="bla bla bla">
                 <value>3</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -24,11 +20,6 @@
             <param>3</param>
         </check>
     </constraints>
-
-    <help>
-        <variable name="enumvar">bla bla bla</variable>
-    </help>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/10valid_enum_value/00-base.xml b/tests/dictionaries/10valid_enum_value/00-base.xml
index 1794b78e..fd8b959d 100644
--- a/tests/dictionaries/10valid_enum_value/00-base.xml
+++ b/tests/dictionaries/10valid_enum_value/00-base.xml
@@ -1,15 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="string" description="No change">
                 <value>b</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -19,9 +15,6 @@
             <param>c</param>
         </check>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/11disabled_if_in_filelist/00-base.xml b/tests/dictionaries/11disabled_if_in_filelist/00-base.xml
index 6a391d6b..7504d5de 100644
--- a/tests/dictionaries/11disabled_if_in_filelist/00-base.xml
+++ b/tests/dictionaries/11disabled_if_in_filelist/00-base.xml
@@ -17,7 +17,6 @@
             </variable>
             <variable name="mode_conteneur_actif2" type="boolean" description="No change"/>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -28,9 +27,6 @@
             <target type="filelist">afilllist</target>
         </condition>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/11disabled_if_in_filelist_disabled/00-base.xml b/tests/dictionaries/11disabled_if_in_filelist_disabled/00-base.xml
index 32c9fdb1..4a169edf 100644
--- a/tests/dictionaries/11disabled_if_in_filelist_disabled/00-base.xml
+++ b/tests/dictionaries/11disabled_if_in_filelist_disabled/00-base.xml
@@ -19,7 +19,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -30,9 +29,6 @@
             <target type="filelist">afilllist</target>
         </condition>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/11disabled_if_in_filelist_multi/00-base.xml b/tests/dictionaries/11disabled_if_in_filelist_multi/00-base.xml
index def894a2..bbe62203 100644
--- a/tests/dictionaries/11disabled_if_in_filelist_multi/00-base.xml
+++ b/tests/dictionaries/11disabled_if_in_filelist_multi/00-base.xml
@@ -20,7 +20,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -31,9 +30,6 @@
             <target type="filelist">afilllist</target>
         </condition>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/11disabledifin_filelist_notexist/00-base.xml b/tests/dictionaries/11disabledifin_filelist_notexist/00-base.xml
index 0c84e95b..6d8f6173 100644
--- a/tests/dictionaries/11disabledifin_filelist_notexist/00-base.xml
+++ b/tests/dictionaries/11disabledifin_filelist_notexist/00-base.xml
@@ -19,7 +19,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -28,9 +27,6 @@
             <target type="filelist">afilllist</target>
         </condition>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/11disabledifnotin_filelist_notexist/00-base.xml b/tests/dictionaries/11disabledifnotin_filelist_notexist/00-base.xml
index e85efc4c..2508fe11 100644
--- a/tests/dictionaries/11disabledifnotin_filelist_notexist/00-base.xml
+++ b/tests/dictionaries/11disabledifnotin_filelist_notexist/00-base.xml
@@ -6,8 +6,6 @@
             <file name="/tmp/file" filelist="afilllist"/>
         </service>
     </services>
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="condition" type="oui/non" description="No change">
@@ -20,7 +18,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -29,9 +26,6 @@
             <target type="filelist">afilllist</target>
         </condition>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/00-base.xml b/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/00-base.xml
index d97574cc..4537c1bc 100644
--- a/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/00-base.xml
+++ b/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/00-base.xml
@@ -19,7 +19,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -32,9 +31,6 @@
             <target type="filelist">afilllist</target>
         </condition>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/11multi_disabled_if_in_filelist/00-base.xml b/tests/dictionaries/11multi_disabled_if_in_filelist/00-base.xml
index a091d1a7..8707e22d 100644
--- a/tests/dictionaries/11multi_disabled_if_in_filelist/00-base.xml
+++ b/tests/dictionaries/11multi_disabled_if_in_filelist/00-base.xml
@@ -16,7 +16,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -29,9 +28,6 @@
             <target type="filelist">afilllist</target>
         </condition>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/20family_append/00-base.xml b/tests/dictionaries/20family_append/00-base.xml
index 9941bac4..2a71d00f 100644
--- a/tests/dictionaries/20family_append/00-base.xml
+++ b/tests/dictionaries/20family_append/00-base.xml
@@ -1,22 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/20family_append/01-base.xml b/tests/dictionaries/20family_append/01-base.xml
index 9ffc7dac..a0693ce4 100644
--- a/tests/dictionaries/20family_append/01-base.xml
+++ b/tests/dictionaries/20family_append/01-base.xml
@@ -1,20 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif1" type="oui/non" description="No change" hidden="True">
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
diff --git a/tests/dictionaries/20family_appendaccent/00-base.xml b/tests/dictionaries/20family_appendaccent/00-base.xml
index 7057c75f..67c5d738 100644
--- a/tests/dictionaries/20family_appendaccent/00-base.xml
+++ b/tests/dictionaries/20family_appendaccent/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="Général">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -14,7 +11,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -23,9 +19,6 @@
             <target type="variable">mode_conteneur_actif</target>
         </condition>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/20family_appendaccent/01-base.xml b/tests/dictionaries/20family_appendaccent/01-base.xml
index 4b835daa..dcb4413d 100644
--- a/tests/dictionaries/20family_appendaccent/01-base.xml
+++ b/tests/dictionaries/20family_appendaccent/01-base.xml
@@ -1,20 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="Général">
             <variable name="mode_conteneur_actif1" type="oui/non" description="No change" hidden="True">
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
diff --git a/tests/dictionaries/20family_appendaccent/02-base.xml b/tests/dictionaries/20family_appendaccent/02-base.xml
index ddcecbf0..909bd4e6 100644
--- a/tests/dictionaries/20family_appendaccent/02-base.xml
+++ b/tests/dictionaries/20family_appendaccent/02-base.xml
@@ -1,20 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif2" type="oui/non" description="No change" hidden="True">
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
diff --git a/tests/dictionaries/20family_empty/00-base.xml b/tests/dictionaries/20family_empty/00-base.xml
index 5d9d7073..3325774d 100644
--- a/tests/dictionaries/20family_empty/00-base.xml
+++ b/tests/dictionaries/20family_empty/00-base.xml
@@ -1,25 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" mode="basic">
                 <value>non</value>
             </variable>
         </family>
-        <family name="general2"/>
-        <separators/>
+        <family name="general2" help="family"/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help>
-        <family name="general2">family</family>
-    </help>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/20family_hidden/00-base.xml b/tests/dictionaries/20family_hidden/00-base.xml
index 9941bac4..2a71d00f 100644
--- a/tests/dictionaries/20family_hidden/00-base.xml
+++ b/tests/dictionaries/20family_hidden/00-base.xml
@@ -1,22 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/20family_hidden/01-base.xml b/tests/dictionaries/20family_hidden/01-base.xml
index 53f82a9e..ded4eeea 100644
--- a/tests/dictionaries/20family_hidden/01-base.xml
+++ b/tests/dictionaries/20family_hidden/01-base.xml
@@ -1,16 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general" hidden="True"/>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
diff --git a/tests/dictionaries/20family_mode/00-base.xml b/tests/dictionaries/20family_mode/00-base.xml
index 74c33e51..f58d09d5 100644
--- a/tests/dictionaries/20family_mode/00-base.xml
+++ b/tests/dictionaries/20family_mode/00-base.xml
@@ -1,22 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" mode="basic">
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/20family_modeleadership/00-base.xml b/tests/dictionaries/20family_modeleadership/00-base.xml
index a52b1256..b2192efd 100644
--- a/tests/dictionaries/20family_modeleadership/00-base.xml
+++ b/tests/dictionaries/20family_modeleadership/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -12,7 +9,6 @@
             <variable name="follower1" type="string" description="follower1"/>
             <variable name="follower2" type="string" description="follower2" mode="basic"/>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -21,9 +17,6 @@
             <follower>follower2</follower>
         </group>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/21family_change/00-base.xml b/tests/dictionaries/21family_change/00-base.xml
index 8ac2b7b2..5a042b87 100644
--- a/tests/dictionaries/21family_change/00-base.xml
+++ b/tests/dictionaries/21family_change/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
@@ -12,14 +9,7 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/21family_change/01-base.xml b/tests/dictionaries/21family_change/01-base.xml
index 10433943..7e335cc1 100644
--- a/tests/dictionaries/21family_change/01-base.xml
+++ b/tests/dictionaries/21family_change/01-base.xml
@@ -1,20 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="other">
             <variable name="mode_conteneur_actif1" redefine="True">
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
diff --git a/tests/dictionaries/21family_changeaccent/00-base.xml b/tests/dictionaries/21family_changeaccent/00-base.xml
index 9c3c9676..523b30ca 100644
--- a/tests/dictionaries/21family_changeaccent/00-base.xml
+++ b/tests/dictionaries/21family_changeaccent/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="Général">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
@@ -12,14 +9,7 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/21family_changeaccent/01-base.xml b/tests/dictionaries/21family_changeaccent/01-base.xml
index 5ba9b1f6..47ef88e1 100644
--- a/tests/dictionaries/21family_changeaccent/01-base.xml
+++ b/tests/dictionaries/21family_changeaccent/01-base.xml
@@ -1,20 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="Otherwithé">
             <variable name="mode_conteneur_actif1" redefine="True">
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
diff --git a/tests/dictionaries/21family_empty/00-base.xml b/tests/dictionaries/21family_empty/00-base.xml
index 39654c7d..d99b2414 100644
--- a/tests/dictionaries/21family_empty/00-base.xml
+++ b/tests/dictionaries/21family_empty/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -11,14 +8,7 @@
         </family>
         <family name="general1">
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/30mandatory_withoutvalue/00-base.xml b/tests/dictionaries/30mandatory_withoutvalue/00-base.xml
index b4231102..a35bee0a 100644
--- a/tests/dictionaries/30mandatory_withoutvalue/00-base.xml
+++ b/tests/dictionaries/30mandatory_withoutvalue/00-base.xml
@@ -1,20 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="string" description="No change" mandatory="True"/>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/30mandatory_withvalue/00-base.xml b/tests/dictionaries/30mandatory_withvalue/00-base.xml
index fcc28536..cbe896d5 100644
--- a/tests/dictionaries/30mandatory_withvalue/00-base.xml
+++ b/tests/dictionaries/30mandatory_withvalue/00-base.xml
@@ -1,20 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="string" description="No change">
                 <value>value</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
diff --git a/tests/dictionaries/40condition_base/00-base.xml b/tests/dictionaries/40condition_base/00-base.xml
index fe19e698..cfc7b2a6 100644
--- a/tests/dictionaries/40condition_base/00-base.xml
+++ b/tests/dictionaries/40condition_base/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -18,7 +15,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -28,9 +24,6 @@
             <target type="variable" optional="True">mode_conteneur_actif2</target>
         </condition>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/40condition_fallback/00-base.xml b/tests/dictionaries/40condition_fallback/00-base.xml
index f2f042ac..621036ae 100644
--- a/tests/dictionaries/40condition_fallback/00-base.xml
+++ b/tests/dictionaries/40condition_fallback/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -20,7 +17,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -31,9 +27,6 @@
             <target type="family">disabled_family</target>
         </condition>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/40condition_optional/00-base.xml b/tests/dictionaries/40condition_optional/00-base.xml
index 2db75e7b..8099769b 100644
--- a/tests/dictionaries/40condition_optional/00-base.xml
+++ b/tests/dictionaries/40condition_optional/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -15,7 +12,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -25,9 +21,6 @@
             <target type="variable" optional="True">mode_conteneur_actif2</target>
         </condition>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/40hidden_if_in_group_fallback/00-base.xml b/tests/dictionaries/40hidden_if_in_group_fallback/00-base.xml
index d814f125..8d25428e 100644
--- a/tests/dictionaries/40hidden_if_in_group_fallback/00-base.xml
+++ b/tests/dictionaries/40hidden_if_in_group_fallback/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -15,7 +12,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -27,9 +23,6 @@
             <follower>mode_conteneur_actif2</follower>
         </group>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/40ifin_leadership/00-base.xml b/tests/dictionaries/40ifin_leadership/00-base.xml
index 9eb54040..e27da00e 100644
--- a/tests/dictionaries/40ifin_leadership/00-base.xml
+++ b/tests/dictionaries/40ifin_leadership/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -25,7 +22,4 @@
             <target type="variable">follower1</target>
         </condition>
     </constraints>
-
-    <help/>
-
 </rougail>
diff --git a/tests/dictionaries/40ifin_leadershipauto/00-base.xml b/tests/dictionaries/40ifin_leadershipauto/00-base.xml
index 0d14016f..d4556f38 100644
--- a/tests/dictionaries/40ifin_leadershipauto/00-base.xml
+++ b/tests/dictionaries/40ifin_leadershipauto/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -28,7 +25,4 @@
             <target type="variable">follower1</target>
         </condition>
     </constraints>
-
-    <help/>
-
 </rougail>
diff --git a/tests/dictionaries/40ifin_multi/00-base.xml b/tests/dictionaries/40ifin_multi/00-base.xml
index abb35cfd..33627872 100644
--- a/tests/dictionaries/40ifin_multi/00-base.xml
+++ b/tests/dictionaries/40ifin_multi/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
@@ -17,7 +14,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -30,9 +26,6 @@
             <target type="variable">mode_conteneur_actif3</target>
         </condition>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/50exists_exists/00-base.xml b/tests/dictionaries/50exists_exists/00-base.xml
index f4f4f61f..c419dad1 100644
--- a/tests/dictionaries/50exists_exists/00-base.xml
+++ b/tests/dictionaries/50exists_exists/00-base.xml
@@ -1,22 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="Description" hidden="True">
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/50exists_exists/01-base.xml b/tests/dictionaries/50exists_exists/01-base.xml
index 0376408d..765a7eb9 100644
--- a/tests/dictionaries/50exists_exists/01-base.xml
+++ b/tests/dictionaries/50exists_exists/01-base.xml
@@ -1,22 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="New description" exists="False">
                 <value>oui</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/50redefine_description/00-base.xml b/tests/dictionaries/50redefine_description/00-base.xml
index c973121f..d482c3a1 100644
--- a/tests/dictionaries/50redefine_description/00-base.xml
+++ b/tests/dictionaries/50redefine_description/00-base.xml
@@ -1,22 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="Redefine description" hidden="True">
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/50redefine_description/01-redefine.xml b/tests/dictionaries/50redefine_description/01-redefine.xml
index bef6be40..494558cb 100644
--- a/tests/dictionaries/50redefine_description/01-redefine.xml
+++ b/tests/dictionaries/50redefine_description/01-redefine.xml
@@ -1,20 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" redefine="True" description="Redefined"/>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/51exists_nonexists/00-base.xml b/tests/dictionaries/51exists_nonexists/00-base.xml
index adecfbe4..c91df672 100644
--- a/tests/dictionaries/51exists_nonexists/00-base.xml
+++ b/tests/dictionaries/51exists_nonexists/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="Description">
@@ -12,14 +9,7 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/51exists_nonexists/01-base.xml b/tests/dictionaries/51exists_nonexists/01-base.xml
index edd34100..6fd6f1f5 100644
--- a/tests/dictionaries/51exists_nonexists/01-base.xml
+++ b/tests/dictionaries/51exists_nonexists/01-base.xml
@@ -1,22 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif2" type="oui/non" description="New description" exists="False">
                 <value>oui</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/51redefine_auto/00-base.xml b/tests/dictionaries/51redefine_auto/00-base.xml
index 086c1e48..4aba6f3e 100644
--- a/tests/dictionaries/51redefine_auto/00-base.xml
+++ b/tests/dictionaries/51redefine_auto/00-base.xml
@@ -1,15 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -17,9 +13,6 @@
             <param name="valeur">non</param>
         </fill>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/51redefine_auto/01-base.xml b/tests/dictionaries/51redefine_auto/01-base.xml
index b7b6a0fb..17a39f9b 100644
--- a/tests/dictionaries/51redefine_auto/01-base.xml
+++ b/tests/dictionaries/51redefine_auto/01-base.xml
@@ -1,13 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" redefine="True"/>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -15,7 +11,4 @@
             <param name="valeur">non</param>
         </fill>
     </constraints>
-
-    <help/>
-
 </rougail>
diff --git a/tests/dictionaries/51redefine_autofill/00-base.xml b/tests/dictionaries/51redefine_autofill/00-base.xml
index 39d001c1..45c6114e 100644
--- a/tests/dictionaries/51redefine_autofill/00-base.xml
+++ b/tests/dictionaries/51redefine_autofill/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
@@ -17,9 +14,6 @@
             <param name="valeur">oui</param>
         </fill>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/51redefine_autofill/01-base.xml b/tests/dictionaries/51redefine_autofill/01-base.xml
index ab6b8177..712a6b98 100644
--- a/tests/dictionaries/51redefine_autofill/01-base.xml
+++ b/tests/dictionaries/51redefine_autofill/01-base.xml
@@ -1,13 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" redefine="True" hidden="False"/>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -15,7 +11,4 @@
             <param name="valeur">non</param>
         </fill>
     </constraints>
-
-    <help/>
-
 </rougail>
diff --git a/tests/dictionaries/51redefine_family/00-base.xml b/tests/dictionaries/51redefine_family/00-base.xml
index 8b34f2c9..d485fb0c 100644
--- a/tests/dictionaries/51redefine_family/00-base.xml
+++ b/tests/dictionaries/51redefine_family/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
@@ -14,7 +11,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -23,9 +19,6 @@
             <target type="family">general2</target>
         </condition>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/51redefine_family/01-base.xml b/tests/dictionaries/51redefine_family/01-base.xml
index f341f9e2..dbf23972 100644
--- a/tests/dictionaries/51redefine_family/01-base.xml
+++ b/tests/dictionaries/51redefine_family/01-base.xml
@@ -1,20 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" redefine="True">
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
diff --git a/tests/dictionaries/51redefine_fill/00-base.xml b/tests/dictionaries/51redefine_fill/00-base.xml
index 39d001c1..12e6ba60 100644
--- a/tests/dictionaries/51redefine_fill/00-base.xml
+++ b/tests/dictionaries/51redefine_fill/00-base.xml
@@ -1,15 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -17,9 +13,6 @@
             <param name="valeur">oui</param>
         </fill>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/51redefine_fill/01-base.xml b/tests/dictionaries/51redefine_fill/01-base.xml
index b7b6a0fb..17a39f9b 100644
--- a/tests/dictionaries/51redefine_fill/01-base.xml
+++ b/tests/dictionaries/51redefine_fill/01-base.xml
@@ -1,13 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" redefine="True"/>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -15,7 +11,4 @@
             <param name="valeur">non</param>
         </fill>
     </constraints>
-
-    <help/>
-
 </rougail>
diff --git a/tests/dictionaries/51redefine_fillauto/00-base.xml b/tests/dictionaries/51redefine_fillauto/00-base.xml
index 833b6e54..d52173e5 100644
--- a/tests/dictionaries/51redefine_fillauto/00-base.xml
+++ b/tests/dictionaries/51redefine_fillauto/00-base.xml
@@ -1,15 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -17,9 +13,6 @@
             <param name="valeur">oui</param>
         </fill>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/51redefine_fillauto/01-base.xml b/tests/dictionaries/51redefine_fillauto/01-base.xml
index 3a960564..1c9d3331 100644
--- a/tests/dictionaries/51redefine_fillauto/01-base.xml
+++ b/tests/dictionaries/51redefine_fillauto/01-base.xml
@@ -1,13 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" redefine="True" hidden="True"/>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -15,7 +11,4 @@
             <param name="valeur">non</param>
         </fill>
     </constraints>
-
-    <help/>
-
 </rougail>
diff --git a/tests/dictionaries/51redefine_help/00-base.xml b/tests/dictionaries/51redefine_help/00-base.xml
index 64d717c8..e554e787 100644
--- a/tests/dictionaries/51redefine_help/00-base.xml
+++ b/tests/dictionaries/51redefine_help/00-base.xml
@@ -1,25 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="oui/non" description="redefine help" hidden="True">
+        <family name="general" help="redefine help family">
+            <variable name="mode_conteneur_actif" type="oui/non" description="redefine help" hidden="True" help="redefine help">
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help>
-        <variable name="mode_conteneur_actif">redefine help</variable>
-        <family name="general">redefine help family</family>
-    </help>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/51redefine_help/01-base.xml b/tests/dictionaries/51redefine_help/01-base.xml
index 480c426b..be1df993 100644
--- a/tests/dictionaries/51redefine_help/01-base.xml
+++ b/tests/dictionaries/51redefine_help/01-base.xml
@@ -1,17 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
+        <family name="general" help="redefine help family ok">
+            <variable name="mode_conteneur_actif" redefine="True" hidden="True" help="redefine help ok">
+                <value>non</value>
+            </variable>
+        </family>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help>
-        <variable name="mode_conteneur_actif" redefine="True">redefine help ok</variable>
-        <family name="general">redefine help family ok</family>
-    </help>
-
 </rougail>
diff --git a/tests/dictionaries/51redefine_hidden/00-base.xml b/tests/dictionaries/51redefine_hidden/00-base.xml
index b473ea15..d480612b 100644
--- a/tests/dictionaries/51redefine_hidden/00-base.xml
+++ b/tests/dictionaries/51redefine_hidden/00-base.xml
@@ -1,22 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="Redefine hidden">
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/51redefine_hidden/01-redefine.xml b/tests/dictionaries/51redefine_hidden/01-redefine.xml
index 65d1eeaa..94364be5 100644
--- a/tests/dictionaries/51redefine_hidden/01-redefine.xml
+++ b/tests/dictionaries/51redefine_hidden/01-redefine.xml
@@ -1,20 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" redefine="True" hidden="True"/>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/51redefine_remove_check/00-base.xml b/tests/dictionaries/51redefine_remove_check/00-base.xml
index 0fbbb510..b979ceda 100644
--- a/tests/dictionaries/51redefine_remove_check/00-base.xml
+++ b/tests/dictionaries/51redefine_remove_check/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True"/>
@@ -17,9 +14,6 @@
             <param>c</param>
         </check>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/51redefine_remove_check/01-base.xml b/tests/dictionaries/51redefine_remove_check/01-base.xml
index 2661f4f1..78363e65 100644
--- a/tests/dictionaries/51redefine_remove_check/01-base.xml
+++ b/tests/dictionaries/51redefine_remove_check/01-base.xml
@@ -1,20 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" redefine="True" remove_check="True">
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
diff --git a/tests/dictionaries/51redefine_remove_condition/00-base.xml b/tests/dictionaries/51redefine_remove_condition/00-base.xml
index 9146f0dd..85656965 100644
--- a/tests/dictionaries/51redefine_remove_condition/00-base.xml
+++ b/tests/dictionaries/51redefine_remove_condition/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -18,7 +15,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -28,9 +24,6 @@
             <target type="variable">mode_conteneur_actif2</target>
         </condition>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/51redefine_remove_condition/01-base.xml b/tests/dictionaries/51redefine_remove_condition/01-base.xml
index 05c1c8b8..e11fe0c6 100644
--- a/tests/dictionaries/51redefine_remove_condition/01-base.xml
+++ b/tests/dictionaries/51redefine_remove_condition/01-base.xml
@@ -1,18 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="condition" redefine="True" remove_condition="True"/>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
diff --git a/tests/dictionaries/51redefine_removecondition_nonautofreeze/00-base.xml b/tests/dictionaries/51redefine_removecondition_nonautofreeze/00-base.xml
index 7c42bfd4..0ad603c9 100644
--- a/tests/dictionaries/51redefine_removecondition_nonautofreeze/00-base.xml
+++ b/tests/dictionaries/51redefine_removecondition_nonautofreeze/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" auto_freeze="True">
@@ -21,7 +18,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -31,9 +27,6 @@
             <target type="variable">mode_conteneur_actif2</target>
         </condition>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/51redefine_value/00-base.xml b/tests/dictionaries/51redefine_value/00-base.xml
index ac8188ca..3a27320e 100644
--- a/tests/dictionaries/51redefine_value/00-base.xml
+++ b/tests/dictionaries/51redefine_value/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="Redefine value">
@@ -12,14 +9,7 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/51redefine_value/01-redefine.xml b/tests/dictionaries/51redefine_value/01-redefine.xml
index 2db49451..af8a3d8c 100644
--- a/tests/dictionaries/51redefine_value/01-redefine.xml
+++ b/tests/dictionaries/51redefine_value/01-redefine.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif1" redefine="True">
@@ -11,12 +8,6 @@
         </family>
         <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/51remove_fill/00-base.xml b/tests/dictionaries/51remove_fill/00-base.xml
index 5bc01db8..d5a6d18c 100644
--- a/tests/dictionaries/51remove_fill/00-base.xml
+++ b/tests/dictionaries/51remove_fill/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change"/>
@@ -10,7 +7,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -18,9 +14,6 @@
             <param type="variable">mode_conteneur_actif1</param>
         </fill>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/52exists_redefine/00-base.xml b/tests/dictionaries/52exists_redefine/00-base.xml
index 90e907b0..2b476718 100644
--- a/tests/dictionaries/52exists_redefine/00-base.xml
+++ b/tests/dictionaries/52exists_redefine/00-base.xml
@@ -1,22 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="Description" hidden="True">
                 <value>oui</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/52exists_redefine/01-base.xml b/tests/dictionaries/52exists_redefine/01-base.xml
index bd823df2..f43f3172 100644
--- a/tests/dictionaries/52exists_redefine/01-base.xml
+++ b/tests/dictionaries/52exists_redefine/01-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" description="New description" exists="False" redefine="True">
@@ -11,12 +8,6 @@
         </family>
         <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/60action_external/00-base.xml b/tests/dictionaries/60action_external/00-base.xml
index bc7628d5..b0950adb 100644
--- a/tests/dictionaries/60action_external/00-base.xml
+++ b/tests/dictionaries/60action_external/00-base.xml
@@ -1,22 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="général">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/60action_external/extra_dirs/extra/00-base.xml b/tests/dictionaries/60action_external/extra_dirs/extra/00-base.xml
index 607bb5c1..12840066 100644
--- a/tests/dictionaries/60action_external/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/60action_external/extra_dirs/extra/00-base.xml
@@ -14,5 +14,4 @@
             <param>http://localhost/</param>
         </fill>
     </constraints>
-    <help/>
 </rougail>
diff --git a/tests/dictionaries/60extra_externalspacecondition/00-base.xml b/tests/dictionaries/60extra_externalspacecondition/00-base.xml
index 3067f3c0..f0375a2e 100644
--- a/tests/dictionaries/60extra_externalspacecondition/00-base.xml
+++ b/tests/dictionaries/60extra_externalspacecondition/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="général">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" auto_freeze="True">
@@ -15,14 +12,7 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/60extra_help/00-base.xml b/tests/dictionaries/60extra_help/00-base.xml
index 22be6cd9..1fe81917 100644
--- a/tests/dictionaries/60extra_help/00-base.xml
+++ b/tests/dictionaries/60extra_help/00-base.xml
@@ -18,12 +18,6 @@
         </family>
         <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/60extra_help/extra_dirs/extra/00-base.xml b/tests/dictionaries/60extra_help/extra_dirs/extra/00-base.xml
index 15a5a566..5e631398 100644
--- a/tests/dictionaries/60extra_help/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/60extra_help/extra_dirs/extra/00-base.xml
@@ -6,7 +6,7 @@
             <variable name="description" type="string">
                 <value>Exportation de la base de ejabberd</value>
             </variable>
-            <variable name="day" type="schedule"></variable>
+            <variable name="day" type="schedule" help="Test help"></variable>
             <variable name="mode" type="schedulemod">
                 <value>pre</value>
             </variable>
@@ -20,7 +20,4 @@
             <param name='mismatch'>daily</param>
         </fill>
     </constraints>
-    <help>
-        <variable name="extra.ejabberd.day">Test help</variable>
-    </help>
 </rougail>
diff --git a/tests/dictionaries/60extra_load/00-base.xml b/tests/dictionaries/60extra_load/00-base.xml
index 2e4fec44..48c2547c 100644
--- a/tests/dictionaries/60extra_load/00-base.xml
+++ b/tests/dictionaries/60extra_load/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="général">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
@@ -12,14 +9,7 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/60extra_mandatory/00-base.xml b/tests/dictionaries/60extra_mandatory/00-base.xml
index 2e4fec44..48c2547c 100644
--- a/tests/dictionaries/60extra_mandatory/00-base.xml
+++ b/tests/dictionaries/60extra_mandatory/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="général">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
@@ -12,14 +9,7 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/60extra_name_family/00-base.xml b/tests/dictionaries/60extra_name_family/00-base.xml
index 7304014f..f7909f48 100644
--- a/tests/dictionaries/60extra_name_family/00-base.xml
+++ b/tests/dictionaries/60extra_name_family/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="extra">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
@@ -12,14 +9,7 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/60extra_redefine/00-base.xml b/tests/dictionaries/60extra_redefine/00-base.xml
index 2e4fec44..48c2547c 100644
--- a/tests/dictionaries/60extra_redefine/00-base.xml
+++ b/tests/dictionaries/60extra_redefine/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="général">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
@@ -12,14 +9,7 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/60extra_separators/00-base.xml b/tests/dictionaries/60extra_separators/00-base.xml
index 2e4fec44..48c2547c 100644
--- a/tests/dictionaries/60extra_separators/00-base.xml
+++ b/tests/dictionaries/60extra_separators/00-base.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="général">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
@@ -12,14 +9,7 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/60familyaction/00-base.xml b/tests/dictionaries/60familyaction/00-base.xml
index bc7628d5..b0950adb 100644
--- a/tests/dictionaries/60familyaction/00-base.xml
+++ b/tests/dictionaries/60familyaction/00-base.xml
@@ -1,22 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="général">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/60familyaction/extra_dirs/extra/00-base.xml b/tests/dictionaries/60familyaction/extra_dirs/extra/00-base.xml
index 31df7c1f..cee7b730 100644
--- a/tests/dictionaries/60familyaction/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/60familyaction/extra_dirs/extra/00-base.xml
@@ -6,7 +6,4 @@
             </variable>
         </family>
     </variables>
-    <constraints>
-    </constraints>
-    <help/>
 </rougail>
diff --git a/tests/dictionaries/60familyaction_accent/00-base.xml b/tests/dictionaries/60familyaction_accent/00-base.xml
index bc7628d5..b0950adb 100644
--- a/tests/dictionaries/60familyaction_accent/00-base.xml
+++ b/tests/dictionaries/60familyaction_accent/00-base.xml
@@ -1,22 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="général">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/60familyaction_accent/extra_dirs/extra/00-base.xml b/tests/dictionaries/60familyaction_accent/extra_dirs/extra/00-base.xml
index 31df7c1f..cee7b730 100644
--- a/tests/dictionaries/60familyaction_accent/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/60familyaction_accent/extra_dirs/extra/00-base.xml
@@ -6,7 +6,4 @@
             </variable>
         </family>
     </variables>
-    <constraints>
-    </constraints>
-    <help/>
 </rougail>
diff --git a/tests/dictionaries/60familyaction_mandatory/00-base.xml b/tests/dictionaries/60familyaction_mandatory/00-base.xml
index bc7628d5..b0950adb 100644
--- a/tests/dictionaries/60familyaction_mandatory/00-base.xml
+++ b/tests/dictionaries/60familyaction_mandatory/00-base.xml
@@ -1,22 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="général">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/60familyaction_mandatory/extra_dirs/extra/00-base.xml b/tests/dictionaries/60familyaction_mandatory/extra_dirs/extra/00-base.xml
index e6bf3faf..b23cfcb2 100644
--- a/tests/dictionaries/60familyaction_mandatory/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/60familyaction_mandatory/extra_dirs/extra/00-base.xml
@@ -4,10 +4,7 @@
             <variable name="delay" type="number" description="délai en minutes avant lancement">
                 <value>0</value>
             </variable>
-	    <variable name="day" type="number" description="day avant lancement" mandatory="True"/>
+            <variable name="day" type="number" description="day avant lancement" mandatory="True"/>
         </family>
     </variables>
-    <constraints>
-    </constraints>
-    <help/>
 </rougail>
diff --git a/tests/dictionaries/70container_files/00-base.xml b/tests/dictionaries/70container_files/00-base.xml
index d07f06d0..41aa835f 100644
--- a/tests/dictionaries/70container_files/00-base.xml
+++ b/tests/dictionaries/70container_files/00-base.xml
@@ -16,14 +16,7 @@
                 <value>oui</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/70container_files_twice/00-base.xml b/tests/dictionaries/70container_files_twice/00-base.xml
index 525227b4..999719ba 100644
--- a/tests/dictionaries/70container_files_twice/00-base.xml
+++ b/tests/dictionaries/70container_files_twice/00-base.xml
@@ -17,14 +17,7 @@
                 <value>oui</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/70container_filesmulti/00-base.xml b/tests/dictionaries/70container_filesmulti/00-base.xml
index 94e431ec..e0a29f79 100644
--- a/tests/dictionaries/70container_filesmulti/00-base.xml
+++ b/tests/dictionaries/70container_filesmulti/00-base.xml
@@ -16,14 +16,7 @@
                 <value>oui</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/70container_filesredefine/00-base.xml b/tests/dictionaries/70container_filesredefine/00-base.xml
index 33c10c0d..7650d10b 100644
--- a/tests/dictionaries/70container_filesredefine/00-base.xml
+++ b/tests/dictionaries/70container_filesredefine/00-base.xml
@@ -15,14 +15,7 @@
                 <value>oui</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/70container_new/00-base.xml b/tests/dictionaries/70container_new/00-base.xml
index f9525ee9..eda8cdc8 100644
--- a/tests/dictionaries/70container_new/00-base.xml
+++ b/tests/dictionaries/70container_new/00-base.xml
@@ -14,14 +14,7 @@
                 <value>oui</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/70container_newnocont/00-base.xml b/tests/dictionaries/70container_newnocont/00-base.xml
index e72c5a7a..44765892 100644
--- a/tests/dictionaries/70container_newnocont/00-base.xml
+++ b/tests/dictionaries/70container_newnocont/00-base.xml
@@ -14,14 +14,7 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/70container_newwithip/00-base.xml b/tests/dictionaries/70container_newwithip/00-base.xml
index bc94a2bf..27bbcee2 100644
--- a/tests/dictionaries/70container_newwithip/00-base.xml
+++ b/tests/dictionaries/70container_newwithip/00-base.xml
@@ -15,14 +15,7 @@
             </variable>
             <variable name='adresse_ip_test' type='ip' description="No change"/>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/70container_pathaccess/00-base.xml b/tests/dictionaries/70container_pathaccess/00-base.xml
index e53c08ed..e4336f77 100644
--- a/tests/dictionaries/70container_pathaccess/00-base.xml
+++ b/tests/dictionaries/70container_pathaccess/00-base.xml
@@ -16,14 +16,7 @@
 			<variable name="nut_monitor_netmask" type="netmask" description="Masque de l'IP du réseau de l'esclave" mandatory='True'/>
 			<variable name="nut_monitor_host" type="network" description="Adresse IP du réseau de l'esclave"  mandatory='True'/>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/70container_pathaccess_leadership/00-base.xml b/tests/dictionaries/70container_pathaccess_leadership/00-base.xml
index e70da268..c0ac9ab9 100644
--- a/tests/dictionaries/70container_pathaccess_leadership/00-base.xml
+++ b/tests/dictionaries/70container_pathaccess_leadership/00-base.xml
@@ -16,7 +16,6 @@
 			<variable name="nut_monitor_netmask" type="netmask" description="Masque de l'IP du réseau de l'esclave" mandatory='True' multi='True'/>
             <variable name="nut_monitor_host" type="network" description="Adresse IP du réseau de l'esclave" mandatory='True'/>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -24,9 +23,6 @@
             <follower>nut_monitor_host</follower>
         </group>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/70container_save/00-base.xml b/tests/dictionaries/70container_save/00-base.xml
index 421369b7..35551231 100644
--- a/tests/dictionaries/70container_save/00-base.xml
+++ b/tests/dictionaries/70container_save/00-base.xml
@@ -1,23 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <rougail>
-
-    <services/>
-
     <variables>
         <family name='général'>
             <variable name='mode_conteneur_actif' type='oui/non' description="No change" hidden="True">
                 <value>oui</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/70container_serviceaccess/00-base.xml b/tests/dictionaries/70container_serviceaccess/00-base.xml
index 8ff545f3..57a631bc 100644
--- a/tests/dictionaries/70container_serviceaccess/00-base.xml
+++ b/tests/dictionaries/70container_serviceaccess/00-base.xml
@@ -14,14 +14,7 @@
                 <value>oui</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/70container_servicerestriction/00-base.xml b/tests/dictionaries/70container_servicerestriction/00-base.xml
index 8f2cb3cf..7eef4016 100644
--- a/tests/dictionaries/70container_servicerestriction/00-base.xml
+++ b/tests/dictionaries/70container_servicerestriction/00-base.xml
@@ -8,21 +8,13 @@
         </service>
     </services>
 
-
     <variables>
         <family name='général'>
             <variable name='mode_conteneur_actif' type='oui/non' description="No change" hidden="True">
                 <value>oui</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/70container_services/00-base.xml b/tests/dictionaries/70container_services/00-base.xml
index 09c24b38..ceebed18 100644
--- a/tests/dictionaries/70container_services/00-base.xml
+++ b/tests/dictionaries/70container_services/00-base.xml
@@ -6,22 +6,13 @@
         <service name='testsrv'>
         </service>
     </services>
-
-
     <variables>
         <family name='général'>
             <variable name='mode_conteneur_actif' type='oui/non' description="No change" hidden="True">
                 <value>oui</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->
diff --git a/tests/dictionaries/70services_unmanage/00-base.xml b/tests/dictionaries/70services_unmanage/00-base.xml
index 06d0a07e..87aace2c 100644
--- a/tests/dictionaries/70services_unmanage/00-base.xml
+++ b/tests/dictionaries/70services_unmanage/00-base.xml
@@ -14,14 +14,7 @@
                 <value>oui</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->