From 65d40f494f0832186752b8538c4f51332ad174c4 Mon Sep 17 00:00:00 2001
From: Emmanuel Garette <egarette@cadoles.com>
Date: Tue, 13 Apr 2021 11:07:10 +0200
Subject: [PATCH] reident tests

---
 src/rougail/data/rougail.dtd                  | 10 +--
 src/rougail/update.py                         |  2 +-
 tests/dictionaries/00empty/00_base.xml        |  6 +-
 .../00load_autofreeze/00-base.xml             | 18 +++--
 .../00load_autofreezeexpert/00-base.xml       | 18 +++--
 .../dictionaries/00load_autosave/00-base.xml  | 18 +++--
 .../00load_autosaveexpert/00-base.xml         | 18 +++--
 tests/dictionaries/00load_comment/00-base.xml | 18 +++--
 tests/dictionaries/00load_notype/00-base.xml  | 22 +++---
 tests/dictionaries/00load_save/00-base.xml    | 16 ++---
 .../dictionaries/00load_subfolder/99-base.xml | 16 ++---
 .../00load_subfolder/subfolder/00-base.xml    | 19 +++--
 .../01auto_autofreeze/00-base.xml             | 30 ++++----
 tests/dictionaries/01auto_base/00-base.xml    | 35 +++++----
 .../01auto_withoutparam/00-base.xml           | 33 ++++-----
 .../01base_domainname/00-base.xml             | 16 ++---
 tests/dictionaries/01base_file/00-base.xml    | 30 ++++----
 .../01base_file_include/00-base.xml           | 30 ++++----
 .../01base_file_include_content/00-base.xml   | 32 ++++-----
 .../01base_file_include_name/00-base.xml      | 32 ++++-----
 .../01base_file_patch/00-base.xml             | 30 ++++----
 .../01base_file_utfchar/00-base.xml           | 30 ++++----
 tests/dictionaries/01base_float/00-base.xml   | 22 +++---
 .../01base_help_quote/00-base.xml             | 14 ++--
 tests/dictionaries/01base_multi/00-base.xml   | 16 ++---
 .../01base_value_doublequote/00-base.xml      | 16 ++---
 .../01base_value_doublequote2/00-base.xml     | 16 ++---
 .../01base_value_doublequote3/00-base.xml     | 16 ++---
 .../00-base.xml                               | 16 ++---
 .../00-base.xml                               | 16 ++---
 .../01base_value_multi_quote/00-base.xml      | 16 ++---
 .../01base_value_quote/00-base.xml            | 16 ++---
 .../01base_var_name_same_family/00-base.xml   | 16 ++---
 .../01boolean_no_mandatory/00-base.xml        |  8 +--
 .../01family_description/00-base.xml          | 16 ++---
 .../01fill_autofreeze/00-base.xml             | 37 +++++-----
 .../dictionaries/01fill_autosave/00-base.xml  | 37 +++++-----
 tests/dictionaries/01fill_base/00-base.xml    | 31 ++++----
 .../dictionaries/01fill_mandatory/00-base.xml | 31 ++++----
 tests/dictionaries/01fill_number/00-base.xml  | 31 ++++----
 .../01fill_only_optional/00-base.xml          | 35 +++++----
 .../dictionaries/01fill_optional/00-base.xml  | 39 +++++-----
 tests/dictionaries/01fill_quote/00-base.xml   | 55 +++++++-------
 .../01fill_target_optional/00-base.xml        | 29 ++++----
 .../01hidden_if_in_autofreeze/00-base.xml     | 38 +++++-----
 tests/dictionaries/01test/00-base.xml         | 16 ++---
 tests/dictionaries/01test_multi/00-base.xml   | 16 ++---
 .../01test_multi_none/00-base.xml             | 16 ++---
 .../dictionaries/01test_redefine/00-base.xml  | 16 ++---
 .../dictionaries/01test_redefine/10-base.xml  | 12 ++--
 .../01test_redefine_base/00-base.xml          |  8 +--
 .../01test_redefine_base/10-base.xml          |  8 +--
 .../01test_redefine_remove/00-base.xml        | 16 ++---
 .../01test_redefine_remove/10-base.xml        | 12 ++--
 .../02autosave_hidden_frozenifin/00-base.xml  | 40 +++++------
 .../02fill_multi_calc_val/00-base.xml         | 29 ++++----
 .../02fill_multi_calc_val_multi/00-base.xml   | 31 ++++----
 .../10autosave_hidden/00-base.xml             | 33 ++++-----
 tests/dictionaries/10check_base/00-base.xml   | 32 ++++-----
 .../10check_base_target_optional/00-base.xml  | 22 +++---
 .../dictionaries/10check_no_param/00-base.xml | 29 ++++----
 tests/dictionaries/10check_option/00-base.xml | 39 +++++-----
 .../dictionaries/10check_optional/00-base.xml | 41 +++++------
 .../10check_valid_differ/00-base.xml          | 35 +++++----
 .../10check_valid_differ_add/00-base.xml      | 47 ++++++------
 .../10check_valid_differ_add/01-base.xml      | 33 ++++-----
 .../00-base.xml                               | 47 ++++++------
 .../01-base.xml                               | 37 +++++-----
 .../10check_valid_in_network/00-base.xml      | 37 +++++-----
 .../10check_valid_in_network_cidr/00-base.xml | 33 ++++-----
 .../10check_valid_ipnetmask/00-base.xml       | 33 ++++-----
 .../10fill_information/00-base.xml            | 25 +++----
 .../00-base.xml                               | 50 ++++++-------
 .../10leadership_append/00-base.xml           | 53 +++++++-------
 .../10leadership_append/01-base.xml           | 21 +++---
 .../10leadership_append_hidden/00-base.xml    | 53 +++++++-------
 .../10leadership_append_hidden/01-base.xml    | 21 +++---
 .../10leadership_append_name/00-base.xml      | 53 +++++++-------
 .../10leadership_append_name/01-base.xml      | 21 +++---
 .../10leadership_auto/00-base.xml             | 61 ++++++++--------
 .../10leadership_auto_index/00-base.xml       | 35 +++++----
 .../10leadership_autoleader/00-base.xml       | 49 +++++++------
 .../00-base.xml                               | 45 ++++++------
 .../10leadership_autosaveexpert/00-base.xml   | 49 +++++++------
 .../10leadership_leader_hidden/00-base.xml    | 45 ++++++------
 .../00-base.xml                               | 45 ++++++------
 .../00-base.xml                               | 45 ++++++------
 .../10leadership_leadermandatory/00-base.xml  | 49 +++++++------
 .../10leadership_mandatory/00-base.xml        | 49 +++++++------
 .../00-base.xml                               | 31 ++++----
 .../10leadership_multi/00-base.xml            | 67 +++++++++--------
 .../10load_disabled_if_in/00-base.xml         | 43 ++++++-----
 .../10load_disabled_if_in_fill/00-base.xml    | 41 +++++------
 .../00-base.xml                               | 21 +++---
 .../00-base.xml                               | 57 +++++++--------
 .../00-base.xml                               | 67 +++++++++--------
 .../00-base.xml                               | 67 +++++++++--------
 .../00-base.xml                               | 67 +++++++++--------
 .../00-base.xml                               | 67 +++++++++--------
 .../00-base.xml                               | 67 +++++++++--------
 .../00-base.xml                               | 57 +++++++--------
 .../10load_disabled_if_in_none/00-base.xml    | 43 ++++++-----
 .../10load_disabled_if_in_twice/00-base.xml   | 45 ++++++------
 .../00-base.xml                               | 58 +++++++--------
 .../00-base.xml                               | 58 +++++++--------
 .../00-base.xml                               | 46 ++++++------
 .../00-base.xml                               | 53 +++++++-------
 .../10load_disabledifin_fallback/00-base.xml  | 51 +++++++------
 .../00-base.xml                               | 51 +++++++------
 .../00-base.xml                               | 43 ++++++-----
 .../10load_emptyvalue/00-base.xml             | 22 +++---
 .../10load_frozenifin/00-base.xml             | 43 ++++++-----
 .../10load_frozenifin_auto/00-base.xml        | 51 +++++++------
 .../10load_frozenifin_multiparam/00-base.xml  | 57 +++++++--------
 .../10load_frozenifin_noexist/00-base.xml     | 62 ++++++++--------
 .../10load_frozenifin_variable/00-base.xml    | 58 +++++++--------
 .../10load_frozenifnotin/00-base.xml          | 43 ++++++-----
 .../10load_frozenifnotin_noexist/00-base.xml  | 62 ++++++++--------
 .../10load_hidden_if_empty_family/00-base.xml | 47 ++++++------
 .../10load_hidden_if_family/00-base.xml       | 55 +++++++-------
 .../10load_leadership/00-base.xml             | 53 +++++++-------
 .../00-base.xml                               | 37 +++++-----
 .../00-base.xml                               | 47 ++++++------
 .../00-base.xml                               | 37 +++++-----
 .../10load_leadership_description/00-base.xml | 54 +++++++-------
 .../10load_leadership_name/00-base.xml        | 54 +++++++-------
 .../10load_leadership_submulti/00-base.xml    | 53 +++++++-------
 .../10load_mandatoryifin/00-base.xml          | 43 ++++++-----
 .../00-base.xml                               | 62 ++++++++--------
 .../10load_multivalue/00-base.xml             | 18 +++--
 .../10valid_enum_accent/00-base.xml           | 45 ++++++------
 .../10valid_enum_base/00-base.xml             | 43 ++++++-----
 .../00-base.xml                               | 43 ++++++-----
 .../10valid_enum_base_redefine/00-base.xml    | 61 ++++++++--------
 .../10valid_enum_base_redefine/01-base.xml    | 31 ++++----
 .../10valid_enum_leader/00-base.xml           | 47 ++++++------
 .../10valid_enum_mandatory/00-base.xml        | 41 +++++------
 .../10valid_enum_multi/00-base.xml            | 35 +++++----
 .../10valid_enum_none/00-base.xml             | 43 ++++++-----
 .../10valid_enum_number/00-base.xml           | 40 +++++------
 .../10valid_enum_numberdefault/00-base.xml    | 43 ++++++-----
 .../10valid_enum_param_empty/00-base.xml      | 35 +++++----
 .../10valid_enum_param_empty2/00-base.xml     | 35 +++++----
 .../10valid_enum_quote/00-base.xml            | 39 +++++-----
 .../10valid_enum_value/00-base.xml            | 33 ++++-----
 .../11disabled_if_in_filelist/00-base.xml     | 53 +++++++-------
 .../00-base.xml                               | 35 +++++----
 .../00-base.xml                               | 39 +++++-----
 .../00-base.xml                               | 57 +++++++--------
 .../00-base.xml                               | 59 +++++++--------
 .../00-base.xml                               | 53 +++++++-------
 .../00-base.xml                               | 52 +++++++-------
 .../00-base.xml                               | 61 ++++++++--------
 .../00-base.xml                               | 61 ++++++++--------
 .../00-base.xml                               | 55 +++++++-------
 .../11valid_enum_function/00-base.xml         | 32 ++++-----
 .../11valid_enum_variable/00-base.xml         | 38 +++++-----
 .../dictionaries/20family_append/00-base.xml  | 16 ++---
 .../dictionaries/20family_append/01-base.xml  | 14 ++--
 .../dictionaries/20family_dynamic/00-base.xml | 25 ++++---
 .../20family_dynamic_calc/00-base.xml         | 47 ++++++------
 .../20family_dynamic_calc2/00-base.xml        | 47 ++++++------
 .../20family_dynamic_calc_suffix/00-base.xml  | 47 ++++++------
 .../20family_dynamic_description/00-base.xml  | 25 ++++---
 .../20family_dynamic_number/00-base.xml       | 47 ++++++------
 tests/dictionaries/20family_empty/00-base.xml | 18 +++--
 .../dictionaries/20family_hidden/00-base.xml  | 16 ++---
 .../dictionaries/20family_hidden/01-base.xml  |  6 +-
 tests/dictionaries/20family_mode/00-base.xml  | 16 ++---
 .../20family_modeleadership/00-base.xml       | 35 +++++----
 tests/dictionaries/20notemplating/00-base.xml | 28 ++++----
 tests/dictionaries/20override/00-base.xml     | 34 ++++-----
 .../20override_no_templating/00-base.xml      | 28 ++++----
 .../20override_source/00-base.xml             | 28 ++++----
 tests/dictionaries/21family_empty/00-base.xml | 18 +++--
 .../30mandatory_withoutvalue/00-base.xml      | 12 ++--
 .../30mandatory_withoutvaluecalc/00-base.xml  | 24 +++----
 .../30mandatory_withvalue/00-base.xml         | 14 ++--
 .../30mandatory_withvaluecalc/00-base.xml     | 22 +++---
 .../dictionaries/40condition_base/00-base.xml | 49 ++++++-------
 .../40condition_base_add/00-base.xml          | 49 ++++++-------
 .../40condition_base_add/01-base.xml          | 28 ++++----
 .../40condition_fallback/00-base.xml          | 55 +++++++-------
 .../40condition_optional/00-base.xml          | 43 ++++++-----
 .../40condition_optional_empty/00-base.xml    | 41 +++++------
 .../40condition_optional_family/00-base.xml   | 29 ++++----
 tests/dictionaries/40empty_param/00_base.xml  | 33 ++++-----
 tests/dictionaries/40empty_param2/00_base.xml | 33 ++++-----
 .../40hidden_if_in_group_fallback/00-base.xml | 47 ++++++------
 .../40ifin_leadership/00-base.xml             | 47 ++++++------
 .../40ifin_leadershipauto/00-base.xml         | 68 +++++++++---------
 .../00-base.xml                               | 72 +++++++++----------
 tests/dictionaries/40ifin_multi/00-base.xml   | 53 +++++++-------
 tests/dictionaries/40ifin_multi2/00-base.xml  | 53 +++++++-------
 .../dictionaries/40ifin_validenum/00-base.xml | 60 ++++++++--------
 .../45extra_without_family/00-base.xml        | 22 +++---
 .../extra_dirs/extra/00-base.xml              | 21 +++---
 tests/dictionaries/45multi_family/00-base.xml | 16 ++---
 .../45multi_family_basic/00-base.xml          | 16 ++---
 .../45multi_family_expert/00-base.xml         | 16 ++---
 .../45multi_family_order/00-base.xml          | 22 +++---
 .../dictionaries/45without_family/00-base.xml |  8 +--
 .../dictionaries/50exists_exists/00-base.xml  | 16 ++---
 .../dictionaries/50exists_exists/01-base.xml  | 16 ++---
 .../50redefine_description/00-base.xml        | 16 ++---
 .../50redefine_description/01-redefine.xml    | 12 ++--
 .../51exists_nonexists/00-base.xml            | 22 +++---
 .../51exists_nonexists/01-base.xml            | 16 ++---
 .../51exists_redefine/00-base.xml             | 16 ++---
 .../51exists_redefine/01-base.xml             | 22 +++---
 .../dictionaries/51redefine_auto/00-base.xml  | 29 ++++----
 .../dictionaries/51redefine_auto/01-base.xml  | 23 +++---
 .../51redefine_autofill/00-base.xml           | 29 ++++----
 .../51redefine_autofill/01-base.xml           | 23 +++---
 .../51redefine_family/00-base.xml             | 39 +++++-----
 .../51redefine_family/01-base.xml             | 14 ++--
 .../dictionaries/51redefine_fill/00-base.xml  | 29 ++++----
 .../dictionaries/51redefine_fill/01-base.xml  | 23 +++---
 .../51redefine_fillauto/00-base.xml           | 29 ++++----
 .../51redefine_fillauto/01-base.xml           | 23 +++---
 .../dictionaries/51redefine_help/00-base.xml  | 16 ++---
 .../dictionaries/51redefine_help/01-base.xml  | 14 ++--
 .../51redefine_hidden/00-base.xml             | 16 ++---
 .../51redefine_hidden/01-redefine.xml         | 12 ++--
 .../dictionaries/51redefine_multi/00-base.xml | 16 ++---
 .../51redefine_multi/01-redefine.xml          | 12 ++--
 .../51redefine_remove_check/00-base.xml       | 29 ++++----
 .../51redefine_remove_check/01-base.xml       | 14 ++--
 .../51redefine_remove_condition/00-base.xml   | 49 ++++++-------
 .../51redefine_remove_condition/01-base.xml   | 10 +--
 .../00-base.xml                               | 51 +++++++------
 .../01-base.xml                               |  6 +-
 .../dictionaries/51redefine_type/00-base.xml  | 16 ++---
 .../51redefine_type/01-redefine.xml           | 12 ++--
 .../51redefine_validenum/00-base.xml          | 28 ++++----
 .../51redefine_validenum/01-redefine.xml      | 26 ++++---
 .../dictionaries/51redefine_value/00-base.xml | 22 +++---
 .../51redefine_value/01-redefine.xml          | 16 ++---
 tests/dictionaries/51remove_fill/00-base.xml  | 35 +++++----
 tests/dictionaries/51remove_fill/01-base.xml  | 12 ++--
 .../52exists_redefine/00-base.xml             | 16 ++---
 .../52exists_redefine/01-base.xml             | 16 ++---
 .../60action_external/00-base.xml             | 16 ++---
 .../extra_dirs/extra/00-base.xml              | 33 ++++-----
 .../00-base.xml                               | 28 ++++----
 .../extra_dirs/extra/00-base.xml              | 25 ++++---
 .../extra_dirs/extra1/00-base.xml             | 29 ++++----
 tests/dictionaries/60extra_group/00-base.xml  | 32 ++++-----
 .../extra_dirs/extra/00-base.xml              | 33 +++++----
 .../60extra_group_name/00-base.xml            | 32 ++++-----
 .../extra_dirs/extra/00-base.xml              | 33 +++++----
 tests/dictionaries/60extra_help/00-base.xml   | 34 ++++-----
 .../60extra_help/extra_dirs/extra/00-base.xml | 43 ++++++-----
 tests/dictionaries/60extra_load/00-base.xml   | 22 +++---
 .../60extra_load/extra_dirs/extra/00-base.xml | 43 ++++++-----
 .../60extra_mandatory/00-base.xml             | 22 +++---
 .../extra_dirs/extra/00-base.xml              | 41 ++++++-----
 .../60extra_name_family/00-base.xml           | 22 +++---
 .../extra_dirs/extra/00-base.xml              | 43 ++++++-----
 .../60extra_no_condition/00-base.xml          | 28 ++++----
 .../extra_dirs/extra/00-base.xml              | 25 ++++---
 .../dictionaries/60extra_redefine/00-base.xml | 22 +++---
 .../extra_dirs/extra/00-base.xml              | 43 ++++++-----
 .../extra_dirs/extra/01-redefine.xml          | 13 ++--
 .../60extra_variable_name_extra/00-base.xml   | 22 +++---
 .../extra_dirs/extra/00-base.xml              |  9 ++-
 tests/dictionaries/60familyaction/00-base.xml | 16 ++---
 .../extra_dirs/extra/00-base.xml              | 15 ++--
 .../60familyaction_mandatory/00-base.xml      | 16 ++---
 .../extra_dirs/extra/00-base.xml              | 17 ++---
 .../61extra_auto_freeze/00-base.xml           | 18 +++--
 .../extra_dirs/extra/00-base.xml              | 17 +++--
 tests/dictionaries/61extra_dyn/00-base.xml    | 16 ++---
 .../61extra_dyn/extra_dirs/extra/00-base.xml  | 13 ++--
 .../61extra_dyn_extra/00-base.xml             | 16 ++---
 .../extra_dirs/extra/00-base.xml              | 23 +++---
 .../70container_files/00-base.xml             | 30 ++++----
 .../00-base.xml                               | 34 ++++-----
 .../00-base.xml                               | 42 +++++------
 .../00-base.xml                               | 28 ++++----
 .../70container_files_twice/00-base.xml       | 32 ++++-----
 .../70container_filesmulti/00-base.xml        | 30 ++++----
 .../70container_filesredefine/00-base.xml     | 28 ++++----
 .../70container_filesredefine/01-base.xml     | 16 ++---
 .../dictionaries/70container_new/00-base.xml  | 24 +++----
 .../70container_newnocont/00-base.xml         | 24 +++----
 .../70container_newwithip/00-base.xml         | 26 ++++---
 .../dictionaries/70container_save/00-base.xml | 19 +++--
 tests/dictionaries/70service_base/00-base.xml | 26 +++----
 .../70service_not_managed/00-base.xml         | 22 +++---
 .../70service_servicelist/00-base.xml         | 34 ++++-----
 .../00-base.xml                               | 48 ++++++-------
 .../70service_servicelist_file/00-base.xml    | 42 ++++++-----
 .../70service_servicelist_ip/00-base.xml      | 42 ++++++-----
 .../00-base.xml                               | 34 ++++-----
 tests/dictionaries/70services_ip/00-base.xml  | 27 +++----
 .../70services_ip_cidr/00-base.xml            | 24 +++----
 .../70services_ip_disabled/00-base.xml        | 27 +++----
 .../70services_ip_iplist/00-base.xml          | 46 ++++++------
 .../70services_ip_iplist2/00-base.xml         | 44 ++++++------
 .../70services_ip_leadership/00-base.xml      | 44 ++++++------
 .../70services_ip_multi/00-base.xml           | 29 ++++----
 .../70services_ip_network/00-base.xml         | 33 ++++-----
 .../70services_ip_not_mandatory/00-base.xml   | 21 +++---
 .../70services_ip_twice/00-base.xml           | 35 ++++-----
 tests/dictionaries/80auto_family/00-base.xml  | 28 ++++----
 .../dictionaries/80check_unknown/00-base.xml  | 33 ++++-----
 .../80check_unknown_var/00-base.xml           | 30 ++++----
 .../80check_without_target/00-base.xml        | 31 ++++----
 .../80condition_itself/00-base.xml            | 24 +++----
 .../80condition_not_exists_error/00-base.xml  | 29 ++++----
 .../00-base.xml                               | 29 ++++----
 .../80condition_without_target/00-base.xml    | 45 ++++++------
 .../00-base.xml                               | 32 ++++-----
 .../00-base.xml                               | 26 ++++---
 .../01-base.xml                               | 12 ++--
 .../80empty_param_number/00_base.xml          | 29 ++++----
 .../80empty_typeeole_eole/00_base.xml         | 39 +++++-----
 .../80empty_typeeole_number/00_base.xml       | 30 ++++----
 .../80extra_externalspaceauto/00-base.xml     | 16 ++---
 .../extra_dirs/extra/00-base.xml              | 27 ++++---
 .../extra_dirs/extra1/00-base.xml             | 35 +++++----
 .../00-base.xml                               | 16 ++---
 .../extra_dirs/extra/00-base.xml              | 27 ++++---
 .../extra_dirs/extra1/00-base.xml             | 29 ++++----
 .../00-base.xml                               | 16 ++---
 .../extra_dirs/extra/00-base.xml              | 29 ++++----
 .../dictionaries/80extra_rougail/00-base.xml  | 22 +++---
 .../extra_dirs/rougail/00-base.xml            | 43 ++++++-----
 .../dictionaries/80extra_services/00-base.xml | 22 +++---
 .../extra_dirs/services/00-base.xml           | 43 ++++++-----
 .../80family_appendaccent/00-base.xml         | 39 +++++-----
 .../80family_appendaccent/01-base.xml         | 14 ++--
 .../80family_appendaccent/02-base.xml         | 14 ++--
 .../dictionaries/80family_change/00-base.xml  | 22 +++---
 .../dictionaries/80family_change/01-base.xml  | 14 ++--
 .../00-base.xml                               | 47 ++++++------
 .../80family_dynamic_check/00-base.xml        | 39 +++++-----
 .../80family_dynamic_not_multi/00-base.xml    | 23 +++---
 .../80family_dynamic_with_family/00-base.xml  | 27 ++++---
 .../00-base.xml                               | 47 ++++++------
 .../80family_only_on_suffix/00-base.xml       | 37 +++++-----
 .../dictionaries/80family_several/00-base.xml | 53 +++++++-------
 .../dictionaries/80family_unique/00-base.xml  | 16 ++---
 .../00-base.xml                               | 14 ++--
 .../80familyaction_accent/00-base.xml         | 16 ++---
 .../extra_dirs/extra/00-base.xml              | 15 ++--
 .../80file_wrong_type/00-base.xml             | 22 +++---
 .../80fill_baseaccent/00-base.xml             | 35 +++++----
 tests/dictionaries/80fill_error/00-base.xml   | 38 +++++-----
 tests/dictionaries/80fill_multi/00-base.xml   | 43 ++++++-----
 .../80fill_not_exists/00-base.xml             | 39 +++++-----
 .../80fill_unknown_function/00-base.xml       | 31 ++++----
 .../80frozenifin_unknown/00-base.xml          | 50 ++++++-------
 .../80hidden_if_in_dynamic/00-base.xml        | 47 ++++++------
 .../80hidden_if_in_filelist/00-base.xml       | 44 ++++++------
 tests/dictionaries/80invalid_dtd/00_base.xml  |  6 +-
 .../80leadership_accent/00-base.xml           | 53 +++++++-------
 .../80leadership_accent_leader/00-base.xml    | 53 +++++++-------
 .../80leadership_auto_save/00-base.xml        | 51 +++++++------
 .../80leadership_autofreeze/00-base.xml       | 45 ++++++------
 .../80leadership_familyaccent/00-base.xml     | 49 +++++++------
 .../80leadership_leader_not_multi/00-base.xml | 37 +++++-----
 .../00-base.xml                               | 49 +++++++------
 .../80leadership_not_ordered/00-base.xml      | 53 +++++++-------
 .../80leadership_not_same_family/00-base.xml  | 57 ++++++++-------
 .../80leadership_notexists/00-base.xml        | 57 ++++++++-------
 .../00-base.xml                               | 55 +++++++-------
 .../00-base.xml                               | 36 +++++-----
 .../01-base.xml                               | 10 +--
 .../80load_mandatoryifin_family/00-base.xml   | 31 ++++----
 .../dictionaries/80mode_conflict/00-base.xml  | 18 +++--
 .../80mode_leadership_conflict/00-base.xml    | 45 ++++++------
 .../80multi_family_mode_conflict/00-base.xml  | 16 ++---
 .../dictionaries/80nil_with_value/00-base.xml | 45 ++++++------
 .../80no_leadership_index/00-base.xml         | 19 +++--
 .../dictionaries/80override_twice/00-base.xml | 30 ++++----
 .../80redefine_double_error/00-base.xml       | 16 ++---
 .../80redefine_double_error/01-base.xml       | 12 ++--
 .../80redefine_double_error/02-base.xml       | 12 ++--
 .../dictionaries/80redefine_error/00-base.xml | 16 ++---
 .../80redefine_error/01-redefine.xml          | 16 ++---
 .../80redefine_fillerror/00-base.xml          | 30 ++++----
 .../80redefine_fillerror/01-base.xml          | 12 ++--
 .../80redefine_notexists/00-base.xml          | 16 ++---
 .../80redefine_notexists/01-redefine.xml      | 16 ++---
 .../00-base.xml                               | 22 +++---
 .../80services_ip_cidr_netmask/00-base.xml    | 22 +++---
 .../80services_ip_netmask/00-base.xml         | 25 +++----
 .../00-base.xml                               | 23 +++---
 .../80services_ip_not_netmask/00-base.xml     | 25 +++----
 .../80services_ip_wrong_type/00-base.xml      | 27 +++----
 .../80target_list_unknown/00-base.xml         | 21 +++---
 tests/dictionaries/80unknown_type/00-base.xml | 12 ++--
 .../80valid_entier_invalid_param/00-base.xml  | 31 ++++----
 .../80valid_entier_not_number/00-base.xml     | 33 ++++-----
 .../80valid_entier_without_param/00-base.xml  | 29 ++++----
 .../80valid_enum_base_redefine/00-base.xml    | 61 ++++++++--------
 .../80valid_enum_base_redefine/01-base.xml    | 31 ++++----
 .../80valid_enum_multi_param/00-base.xml      | 40 +++++------
 .../80valid_enum_multi_variable/00-base.xml   | 50 +++++++------
 .../80valid_enum_no_param/00-base.xml         | 37 +++++-----
 .../00-base.xml                               | 34 +++++----
 .../00-base.xml                               | 36 +++++-----
 .../80value_not_multi/00-base.xml             | 17 ++---
 .../80variable_accent/00-base.xml             | 38 +++++-----
 .../80variable_accent/01-base.xml             | 14 ++--
 .../80variable_accent/02-base.xml             | 14 ++--
 .../dictionaries/80variable_extra/00-base.xml |  8 +--
 .../extra_dirs/extra/00-base.xml              |  9 ++-
 .../00-base.xml                               | 14 ++--
 .../80variable_rougail/00-base.xml            |  8 +--
 tests/dictionaries/80variable_up/00-base.xml  | 38 +++++-----
 .../81extra_externalspace/00-base.xml         | 16 ++---
 .../extra_dirs/extra/00-base.xml              | 27 ++++---
 .../extra_dirs/extra1/00-base.xml             | 35 +++++----
 .../88valid_enum_not_number/00-base.xml       | 39 +++++-----
 .../88valid_enum_not_number2/00-base.xml      | 39 +++++-----
 .../00-base.xml                               | 27 ++++---
 .../00-base.xml                               | 43 ++++++-----
 .../00-base.xml                               | 38 +++++-----
 421 files changed, 6203 insertions(+), 7129 deletions(-)

diff --git a/src/rougail/data/rougail.dtd b/src/rougail/data/rougail.dtd
index 8612f48d5..d22f6f980 100644
--- a/src/rougail/data/rougail.dtd
+++ b/src/rougail/data/rougail.dtd
@@ -38,7 +38,7 @@
 <!-- =============== -->
 
 <!ELEMENT rougail (services|variables|constraints)*>
-<!ATTLIST rougail version (0.9) #REQUIRED>
+<!ATTLIST rougail version (0.10) #REQUIRED>
 
 <!-- ============== -->
 <!-- files element  -->
@@ -83,6 +83,7 @@
 <!ATTLIST family mode CDATA #IMPLIED>
 <!ATTLIST family hidden (True|False) "False">
 <!ATTLIST family dynamic CDATA #IMPLIED>
+<!ATTLIST family leadership (True|False) "False">
 <!ATTLIST family provider CDATA #IMPLIED>
 
 <!ELEMENT variable (value*)>
@@ -107,7 +108,7 @@
 
 <!ELEMENT value (#PCDATA)>
 
-<!ELEMENT constraints ((fill*|check*|condition*|group*)*)>
+<!ELEMENT constraints ((fill*|check*|condition*)*)>
 
 <!ELEMENT fill ((target|param)+)>
 <!ATTLIST fill name CDATA #REQUIRED>
@@ -132,9 +133,4 @@
 <!ATTLIST target type (variable|family|servicelist|filelist|iplist) "variable">
 <!ATTLIST target optional (True|False) "False">
 
-<!ELEMENT group (follower+)>
-<!ATTLIST group leader CDATA #REQUIRED>
-<!ATTLIST group name CDATA #IMPLIED>
-<!ATTLIST group description CDATA #IMPLIED>
-
 <!ELEMENT follower (#PCDATA)>
diff --git a/src/rougail/update.py b/src/rougail/update.py
index 19076048d..63c0f5115 100644
--- a/src/rougail/update.py
+++ b/src/rougail/update.py
@@ -84,6 +84,7 @@ class RougailUpgrade:
                     root = getattr(self, function_version)(root, upgrade_help, namespace)
                 if function_version == search_function_name:
                     function_found = True
+                root.attrib['version'] = version
             with open(xmldst, 'wb') as xmlfh:
                 xmlfh.write(tostring(root, pretty_print=True, encoding="UTF-8", xml_declaration=True))
     #            if
@@ -101,7 +102,6 @@ class RougailUpgrade:
                            ) -> 'Element':
         # rename root
         root.tag = 'rougail'
-        root.attrib['version'] = '0.9'
         variables_auto_valid_enum = {}
         variables_help = {}
         families_help = {}
diff --git a/tests/dictionaries/00empty/00_base.xml b/tests/dictionaries/00empty/00_base.xml
index ea43804dd..78227d6fc 100644
--- a/tests/dictionaries/00empty/00_base.xml
+++ b/tests/dictionaries/00empty/00_base.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <services>
-        <service name="tata">
+  <services>
+    <service name="tata">
         </service>
-    </services>
+  </services>
 </rougail>
diff --git a/tests/dictionaries/00load_autofreeze/00-base.xml b/tests/dictionaries/00load_autofreeze/00-base.xml
index 119c729b4..92f639a10 100644
--- a/tests/dictionaries/00load_autofreeze/00-base.xml
+++ b/tests/dictionaries/00load_autofreeze/00-base.xml
@@ -1,13 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <variable name="myvar" auto_freeze="True">
-            <value>no</value>
-        </variable>
-        <variable name="server_deployed" type="boolean">
-            <value>False</value>
-        </variable>
-    </variables>
+  <variables>
+    <variable name="myvar" auto_freeze="True">
+      <value>no</value>
+    </variable>
+    <variable name="server_deployed" type="boolean">
+      <value>False</value>
+    </variable>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/00load_autofreezeexpert/00-base.xml b/tests/dictionaries/00load_autofreezeexpert/00-base.xml
index d4f59f6e4..5c1546e2d 100644
--- a/tests/dictionaries/00load_autofreezeexpert/00-base.xml
+++ b/tests/dictionaries/00load_autofreezeexpert/00-base.xml
@@ -1,13 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <variable name="my_var" auto_freeze="True" mode="expert">
-            <value>no</value>
-        </variable>
-        <variable name="server_deployed" type="boolean">
-            <value>False</value>
-        </variable>
-    </variables>
+  <variables>
+    <variable name="my_var" auto_freeze="True" mode="expert">
+      <value>no</value>
+    </variable>
+    <variable name="server_deployed" type="boolean">
+      <value>False</value>
+    </variable>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/00load_autosave/00-base.xml b/tests/dictionaries/00load_autosave/00-base.xml
index 28d7d0cfa..647c823d7 100644
--- a/tests/dictionaries/00load_autosave/00-base.xml
+++ b/tests/dictionaries/00load_autosave/00-base.xml
@@ -1,13 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <variable name="server_deployed" type="boolean"/>
-        <family name="general" description="général">
-            <variable name="mode_conteneur_actif" type="string" description="No change" auto_save="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <variable name="server_deployed" type="boolean"/>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" auto_save="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/00load_autosaveexpert/00-base.xml b/tests/dictionaries/00load_autosaveexpert/00-base.xml
index 63b1dd769..2959c5c30 100644
--- a/tests/dictionaries/00load_autosaveexpert/00-base.xml
+++ b/tests/dictionaries/00load_autosaveexpert/00-base.xml
@@ -1,13 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <variable name="server_deployed" type="boolean"/>
-        <family name="general" description="général">
-            <variable name="mode_conteneur_actif" type="string" description="No change" auto_save="True" mode="expert">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <variable name="server_deployed" type="boolean"/>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" auto_save="True" mode="expert">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/00load_comment/00-base.xml b/tests/dictionaries/00load_comment/00-base.xml
index e781b9f85..7ff4428fe 100644
--- a/tests/dictionaries/00load_comment/00-base.xml
+++ b/tests/dictionaries/00load_comment/00-base.xml
@@ -1,13 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general" description="général">
-            <!-- this is a comment -->
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general" description="général">
+      <!-- this is a comment -->
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/00load_notype/00-base.xml b/tests/dictionaries/00load_notype/00-base.xml
index fddb62b3c..14c82f1ca 100644
--- a/tests/dictionaries/00load_notype/00-base.xml
+++ b/tests/dictionaries/00load_notype/00-base.xml
@@ -1,15 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general" description="général">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="without_type">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="without_type">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/00load_save/00-base.xml b/tests/dictionaries/00load_save/00-base.xml
index 46d871318..849130906 100644
--- a/tests/dictionaries/00load_save/00-base.xml
+++ b/tests/dictionaries/00load_save/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general" description="général">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/00load_subfolder/99-base.xml b/tests/dictionaries/00load_subfolder/99-base.xml
index 46d871318..849130906 100644
--- a/tests/dictionaries/00load_subfolder/99-base.xml
+++ b/tests/dictionaries/00load_subfolder/99-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general" description="général">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/00load_subfolder/subfolder/00-base.xml b/tests/dictionaries/00load_subfolder/subfolder/00-base.xml
index d6b12510a..27c7f0b7e 100644
--- a/tests/dictionaries/00load_subfolder/subfolder/00-base.xml
+++ b/tests/dictionaries/00load_subfolder/subfolder/00-base.xml
@@ -1,13 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general" description="général">
-            <variable name='mode_conteneur_actif1' type='string' description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif1" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01auto_autofreeze/00-base.xml b/tests/dictionaries/01auto_autofreeze/00-base.xml
index 7ce63e7d5..db10997f7 100644
--- a/tests/dictionaries/01auto_autofreeze/00-base.xml
+++ b/tests/dictionaries/01auto_autofreeze/00-base.xml
@@ -1,19 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <variable name="server_deployed" type="boolean">
-            <value>no</value>
-        </variable>
-        <variable name="my_variable" auto_freeze="True" hidden="True">
-            <value>no</value>
-        </variable>
-    </variables>
-    <constraints>
-        <fill name="calc_val">
-            <param>yes</param>
-            <target>my_variable</target>
-        </fill>
-    </constraints>
+  <variables>
+    <variable name="server_deployed" type="boolean">
+      <value>no</value>
+    </variable>
+    <variable name="my_variable" auto_freeze="True" hidden="True">
+      <value>no</value>
+    </variable>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param>yes</param>
+      <target>my_variable</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01auto_base/00-base.xml b/tests/dictionaries/01auto_base/00-base.xml
index b8e98b89d..4db9eed37 100644
--- a/tests/dictionaries/01auto_base/00-base.xml
+++ b/tests/dictionaries/01auto_base/00-base.xml
@@ -1,22 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif1" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param type="variable">mode_conteneur_actif1</param>
-            <target>mode_conteneur_actif</target>
-        </fill>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="variable">mode_conteneur_actif1</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01auto_withoutparam/00-base.xml b/tests/dictionaries/01auto_withoutparam/00-base.xml
index 3647b4bd6..7c3468376 100644
--- a/tests/dictionaries/01auto_withoutparam/00-base.xml
+++ b/tests/dictionaries/01auto_withoutparam/00-base.xml
@@ -1,21 +1,18 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif1" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <target>mode_conteneur_actif</target>
-        </fill>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01base_domainname/00-base.xml b/tests/dictionaries/01base_domainname/00-base.xml
index 343c76d19..1376bc799 100644
--- a/tests/dictionaries/01base_domainname/00-base.xml
+++ b/tests/dictionaries/01base_domainname/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="domain" type="domainname" description="Description">
-                <value>my.domain.name</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="domain" type="domainname" description="Description">
+        <value>my.domain.name</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01base_file/00-base.xml b/tests/dictionaries/01base_file/00-base.xml
index 5e1ac5f7c..2bc1f68d4 100644
--- a/tests/dictionaries/01base_file/00-base.xml
+++ b/tests/dictionaries/01base_file/00-base.xml
@@ -1,20 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-
-    <services>
-        <service name="test">
-            <file>/etc/file</file>
-            <file engine="jinja2">/etc/file2</file>
-        </service>
-    </services>
-
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Description">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <services>
+    <service name="test">
+      <file>/etc/file</file>
+      <file engine="jinja2">/etc/file2</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Description">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01base_file_include/00-base.xml b/tests/dictionaries/01base_file_include/00-base.xml
index 5e1ac5f7c..2bc1f68d4 100644
--- a/tests/dictionaries/01base_file_include/00-base.xml
+++ b/tests/dictionaries/01base_file_include/00-base.xml
@@ -1,20 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-
-    <services>
-        <service name="test">
-            <file>/etc/file</file>
-            <file engine="jinja2">/etc/file2</file>
-        </service>
-    </services>
-
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Description">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <services>
+    <service name="test">
+      <file>/etc/file</file>
+      <file engine="jinja2">/etc/file2</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Description">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01base_file_include_content/00-base.xml b/tests/dictionaries/01base_file_include_content/00-base.xml
index 5f361ea79..6632ee174 100644
--- a/tests/dictionaries/01base_file_include_content/00-base.xml
+++ b/tests/dictionaries/01base_file_include_content/00-base.xml
@@ -1,21 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-
-    <services>
-        <service name="test">
-            <file>/etc/file</file>
-            <file engine="jinja2">/etc/file2</file>
-            <file included="content">/etc/dir/incfile</file>
-        </service>
-    </services>
-
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Description">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <services>
+    <service name="test">
+      <file>/etc/file</file>
+      <file engine="jinja2">/etc/file2</file>
+      <file included="content">/etc/dir/incfile</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Description">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01base_file_include_name/00-base.xml b/tests/dictionaries/01base_file_include_name/00-base.xml
index ad7b470a7..eff8650e1 100644
--- a/tests/dictionaries/01base_file_include_name/00-base.xml
+++ b/tests/dictionaries/01base_file_include_name/00-base.xml
@@ -1,21 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-
-    <services>
-        <service name="test">
-            <file>/etc/file</file>
-            <file engine="jinja2">/etc/file2</file>
-            <file included="name">/etc/dir/incfile</file>
-        </service>
-    </services>
-
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Description">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <services>
+    <service name="test">
+      <file>/etc/file</file>
+      <file engine="jinja2">/etc/file2</file>
+      <file included="name">/etc/dir/incfile</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Description">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01base_file_patch/00-base.xml b/tests/dictionaries/01base_file_patch/00-base.xml
index 5e1ac5f7c..2bc1f68d4 100644
--- a/tests/dictionaries/01base_file_patch/00-base.xml
+++ b/tests/dictionaries/01base_file_patch/00-base.xml
@@ -1,20 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-
-    <services>
-        <service name="test">
-            <file>/etc/file</file>
-            <file engine="jinja2">/etc/file2</file>
-        </service>
-    </services>
-
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Description">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <services>
+    <service name="test">
+      <file>/etc/file</file>
+      <file engine="jinja2">/etc/file2</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Description">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01base_file_utfchar/00-base.xml b/tests/dictionaries/01base_file_utfchar/00-base.xml
index 63bce8959..5954ca3bc 100644
--- a/tests/dictionaries/01base_file_utfchar/00-base.xml
+++ b/tests/dictionaries/01base_file_utfchar/00-base.xml
@@ -1,20 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-
-    <services>
-        <service name="test">
-            <file>/etc/systemd-makefs@dev-disk-by\x2dpartlabel</file>
-            <file engine="jinja2">/etc/systemd-makefs@dev-disk-by\x2dpartlabel2</file>
-        </service>
-    </services>
-
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Description">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <services>
+    <service name="test">
+      <file>/etc/systemd-makefs@dev-disk-by\x2dpartlabel</file>
+      <file engine="jinja2">/etc/systemd-makefs@dev-disk-by\x2dpartlabel2</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Description">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01base_float/00-base.xml b/tests/dictionaries/01base_float/00-base.xml
index 617d04c84..e775553e7 100644
--- a/tests/dictionaries/01base_float/00-base.xml
+++ b/tests/dictionaries/01base_float/00-base.xml
@@ -1,15 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="float" type="float" description="Description">
-                <value>0.527</value>
-            </variable>
-            <variable name="float_multi" type="float" description="Description" multi="True">
-                <value>0.527</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="float" type="float" description="Description">
+        <value>0.527</value>
+      </variable>
+      <variable name="float_multi" type="float" description="Description" multi="True">
+        <value>0.527</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01base_help_quote/00-base.xml b/tests/dictionaries/01base_help_quote/00-base.xml
index a748eec1a..43c3fdae1 100644
--- a/tests/dictionaries/01base_help_quote/00-base.xml
+++ b/tests/dictionaries/01base_help_quote/00-base.xml
@@ -1,11 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Redefine description" help="message with '"/>
-            <variable name="mode_conteneur_actif1" type="string" description="Redefine description" help='message with "'/>
-        </family>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Redefine description" help="message with '"/>
+      <variable name="mode_conteneur_actif1" type="string" description="Redefine description" help="message with &quot;"/>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01base_multi/00-base.xml b/tests/dictionaries/01base_multi/00-base.xml
index 8d78cb861..67ec9b798 100644
--- a/tests/dictionaries/01base_multi/00-base.xml
+++ b/tests/dictionaries/01base_multi/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True" multi="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True" multi="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01base_value_doublequote/00-base.xml b/tests/dictionaries/01base_value_doublequote/00-base.xml
index a4e1ad394..df1c54f3a 100644
--- a/tests/dictionaries/01base_value_doublequote/00-base.xml
+++ b/tests/dictionaries/01base_value_doublequote/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True">
-                <value>quote"</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True">
+        <value>quote"</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01base_value_doublequote2/00-base.xml b/tests/dictionaries/01base_value_doublequote2/00-base.xml
index 64811b2a9..8f2faae96 100644
--- a/tests/dictionaries/01base_value_doublequote2/00-base.xml
+++ b/tests/dictionaries/01base_value_doublequote2/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True">
-                <value>quote'"</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True">
+        <value>quote'"</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01base_value_doublequote3/00-base.xml b/tests/dictionaries/01base_value_doublequote3/00-base.xml
index 649311a87..97070d9f4 100644
--- a/tests/dictionaries/01base_value_doublequote3/00-base.xml
+++ b/tests/dictionaries/01base_value_doublequote3/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True">
-                <value>quote\"\'</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True">
+        <value>quote\"\'</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01base_value_multi_doublequote/00-base.xml b/tests/dictionaries/01base_value_multi_doublequote/00-base.xml
index 89f83e69e..6f8b0f9ba 100644
--- a/tests/dictionaries/01base_value_multi_doublequote/00-base.xml
+++ b/tests/dictionaries/01base_value_multi_doublequote/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True" multi="True">
-                <value>quote"</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True" multi="True">
+        <value>quote"</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01base_value_multi_doublequote2/00-base.xml b/tests/dictionaries/01base_value_multi_doublequote2/00-base.xml
index 2a5957c43..cc6ed95ec 100644
--- a/tests/dictionaries/01base_value_multi_doublequote2/00-base.xml
+++ b/tests/dictionaries/01base_value_multi_doublequote2/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True" multi="True">
-                <value>quote'"</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True" multi="True">
+        <value>quote'"</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01base_value_multi_quote/00-base.xml b/tests/dictionaries/01base_value_multi_quote/00-base.xml
index 990549018..a2a33d6db 100644
--- a/tests/dictionaries/01base_value_multi_quote/00-base.xml
+++ b/tests/dictionaries/01base_value_multi_quote/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True" multi="True">
-                <value>quote'</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True" multi="True">
+        <value>quote'</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01base_value_quote/00-base.xml b/tests/dictionaries/01base_value_quote/00-base.xml
index a30582af3..1b8d7272c 100644
--- a/tests/dictionaries/01base_value_quote/00-base.xml
+++ b/tests/dictionaries/01base_value_quote/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True">
-                <value>quote'</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True">
+        <value>quote'</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01base_var_name_same_family/00-base.xml b/tests/dictionaries/01base_var_name_same_family/00-base.xml
index 780a0417b..7d8e62da1 100644
--- a/tests/dictionaries/01base_var_name_same_family/00-base.xml
+++ b/tests/dictionaries/01base_var_name_same_family/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="general" type="string" description="description">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="general" type="string" description="description">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01boolean_no_mandatory/00-base.xml b/tests/dictionaries/01boolean_no_mandatory/00-base.xml
index 663cb3b96..f17d73cdc 100644
--- a/tests/dictionaries/01boolean_no_mandatory/00-base.xml
+++ b/tests/dictionaries/01boolean_no_mandatory/00-base.xml
@@ -1,8 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <variable name="my_variable" type="boolean" mandatory="False"/>
-    </variables>
+  <variables>
+    <variable name="my_variable" type="boolean" mandatory="False"/>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01family_description/00-base.xml b/tests/dictionaries/01family_description/00-base.xml
index fb5dd3f05..d43898234 100644
--- a/tests/dictionaries/01family_description/00-base.xml
+++ b/tests/dictionaries/01family_description/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general" description="Other description">
-            <variable name="mode_conteneur_actif">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general" description="Other description">
+      <variable name="mode_conteneur_actif">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01fill_autofreeze/00-base.xml b/tests/dictionaries/01fill_autofreeze/00-base.xml
index ac1d1926e..a1f99cdee 100644
--- a/tests/dictionaries/01fill_autofreeze/00-base.xml
+++ b/tests/dictionaries/01fill_autofreeze/00-base.xml
@@ -1,23 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <variable name="my_var1" auto_freeze="True">
-            <value>no</value>
-        </variable>
-        <variable name="my_var2">
-            <value>no</value>
-        </variable>
-        <variable name="server_deployed" type="boolean">
-            <value>False</value>
-        </variable>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param type="variable">my_var2</param>
-            <target>my_var1</target>
-        </fill>
-    </constraints>
+  <variables>
+    <variable name="my_var1" auto_freeze="True">
+      <value>no</value>
+    </variable>
+    <variable name="my_var2">
+      <value>no</value>
+    </variable>
+    <variable name="server_deployed" type="boolean">
+      <value>False</value>
+    </variable>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="variable">my_var2</param>
+      <target>my_var1</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01fill_autosave/00-base.xml b/tests/dictionaries/01fill_autosave/00-base.xml
index 823d4187f..b5bbda902 100644
--- a/tests/dictionaries/01fill_autosave/00-base.xml
+++ b/tests/dictionaries/01fill_autosave/00-base.xml
@@ -1,23 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <variable name="server_deployed" type="boolean"/>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" auto_save="True">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif1" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param type="variable">mode_conteneur_actif1</param>
-            <target>mode_conteneur_actif</target>
-        </fill>
-    </constraints>
+  <variables>
+    <variable name="server_deployed" type="boolean"/>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" auto_save="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="variable">mode_conteneur_actif1</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01fill_base/00-base.xml b/tests/dictionaries/01fill_base/00-base.xml
index e26350587..a8241336e 100644
--- a/tests/dictionaries/01fill_base/00-base.xml
+++ b/tests/dictionaries/01fill_base/00-base.xml
@@ -1,20 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change"/>
-            <variable name="mode_conteneur_actif1" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param type="variable">mode_conteneur_actif1</param>
-            <target>mode_conteneur_actif</target>
-        </fill>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change"/>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="variable">mode_conteneur_actif1</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01fill_mandatory/00-base.xml b/tests/dictionaries/01fill_mandatory/00-base.xml
index dbeacf98f..ac83f20e7 100644
--- a/tests/dictionaries/01fill_mandatory/00-base.xml
+++ b/tests/dictionaries/01fill_mandatory/00-base.xml
@@ -1,20 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general" mode="basic">
-            <variable name="mode_conteneur_actif" type="string" description="No change" mandatory="True" mode="expert"/>
-            <variable name="mode_conteneur_actif1" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param type="variable">mode_conteneur_actif1</param>
-            <target>mode_conteneur_actif</target>
-        </fill>
-    </constraints>
+  <variables>
+    <family name="general" mode="basic">
+      <variable name="mode_conteneur_actif" type="string" description="No change" mandatory="True" mode="expert"/>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="variable">mode_conteneur_actif1</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01fill_number/00-base.xml b/tests/dictionaries/01fill_number/00-base.xml
index 60d6ed6c1..ee2e4094b 100644
--- a/tests/dictionaries/01fill_number/00-base.xml
+++ b/tests/dictionaries/01fill_number/00-base.xml
@@ -1,20 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="number" description="No change" hidden="True"/>
-            <variable name="mode_conteneur_actif1" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param type="number">3</param>
-            <target>mode_conteneur_actif</target>
-        </fill>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="number" description="No change" hidden="True"/>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="number">3</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01fill_only_optional/00-base.xml b/tests/dictionaries/01fill_only_optional/00-base.xml
index 5e6dc7bc4..10fef3065 100644
--- a/tests/dictionaries/01fill_only_optional/00-base.xml
+++ b/tests/dictionaries/01fill_only_optional/00-base.xml
@@ -1,22 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif1" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param type="variable" optional="True">mode_conteneur_actif4</param>
-            <target>mode_conteneur_actif</target>
-        </fill>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="variable" optional="True">mode_conteneur_actif4</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01fill_optional/00-base.xml b/tests/dictionaries/01fill_optional/00-base.xml
index 3fe145b63..6382ce450 100644
--- a/tests/dictionaries/01fill_optional/00-base.xml
+++ b/tests/dictionaries/01fill_optional/00-base.xml
@@ -1,24 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif1" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param type="variable" optional="True">mode_conteneur_actif4</param>
-            <param type="variable">mode_conteneur_actif1</param>
-            <param type="variable" optional="True">mode_conteneur_actif3</param>
-            <target>mode_conteneur_actif</target>
-        </fill>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="variable" optional="True">mode_conteneur_actif4</param>
+      <param type="variable">mode_conteneur_actif1</param>
+      <param type="variable" optional="True">mode_conteneur_actif3</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01fill_quote/00-base.xml b/tests/dictionaries/01fill_quote/00-base.xml
index ccf030939..155af2703 100644
--- a/tests/dictionaries/01fill_quote/00-base.xml
+++ b/tests/dictionaries/01fill_quote/00-base.xml
@@ -1,32 +1,29 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change"/>
-            <variable name="mode_conteneur_actif1" type="string" description="No change"/>
-            <variable name="mode_conteneur_actif2" type="string" description="No change"/>
-            <variable name="mode_conteneur_actif3" type="string" description="No change"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param>quote'</param>
-            <target>mode_conteneur_actif</target>
-        </fill>
-        <fill name="calc_val">
-            <param>quote"</param>
-            <target>mode_conteneur_actif1</target>
-        </fill>
-        <fill name="calc_val">
-            <param>quote"'</param>
-            <target>mode_conteneur_actif2</target>
-        </fill>
-        <fill name="calc_val">
-            <param>quote"\'</param>
-            <target>mode_conteneur_actif3</target>
-        </fill>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change"/>
+      <variable name="mode_conteneur_actif1" type="string" description="No change"/>
+      <variable name="mode_conteneur_actif2" type="string" description="No change"/>
+      <variable name="mode_conteneur_actif3" type="string" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param>quote'</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+    <fill name="calc_val">
+      <param>quote"</param>
+      <target>mode_conteneur_actif1</target>
+    </fill>
+    <fill name="calc_val">
+      <param>quote"'</param>
+      <target>mode_conteneur_actif2</target>
+    </fill>
+    <fill name="calc_val">
+      <param>quote"\'</param>
+      <target>mode_conteneur_actif3</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01fill_target_optional/00-base.xml b/tests/dictionaries/01fill_target_optional/00-base.xml
index 1003d6d5f..d2421162b 100644
--- a/tests/dictionaries/01fill_target_optional/00-base.xml
+++ b/tests/dictionaries/01fill_target_optional/00-base.xml
@@ -1,19 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif1" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param type="variable">mode_conteneur_actif1</param>
-            <target optional="True">mode_conteneur_actif</target>
-        </fill>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="variable">mode_conteneur_actif1</param>
+      <target optional="True">mode_conteneur_actif</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01hidden_if_in_autofreeze/00-base.xml b/tests/dictionaries/01hidden_if_in_autofreeze/00-base.xml
index c8e9e8be4..2626d61c4 100644
--- a/tests/dictionaries/01hidden_if_in_autofreeze/00-base.xml
+++ b/tests/dictionaries/01hidden_if_in_autofreeze/00-base.xml
@@ -1,23 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <variable name="server_deployed" type="boolean">
-            <value>False</value>
-        </variable>
-        <variable name="my_var" type="string" auto_freeze="True">
-            <value>no</value>
-        </variable>
-    </variables>
-    <constraints>
-        <fill name="calc_val">
-            <param>yes</param>
-            <target>my_var</target>
-        </fill>
-        <condition name="hidden_if_in" source="server_deployed">
-            <param>True</param>
-            <target type="variable">my_var</target>
-        </condition>
-    </constraints>
+  <variables>
+    <variable name="server_deployed" type="boolean">
+      <value>False</value>
+    </variable>
+    <variable name="my_var" type="string" auto_freeze="True">
+      <value>no</value>
+    </variable>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param>yes</param>
+      <target>my_var</target>
+    </fill>
+    <condition name="hidden_if_in" source="server_deployed">
+      <param>True</param>
+      <target type="variable">my_var</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01test/00-base.xml b/tests/dictionaries/01test/00-base.xml
index 4499bdd4c..a3d9a16c7 100644
--- a/tests/dictionaries/01test/00-base.xml
+++ b/tests/dictionaries/01test/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" test="test">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" test="test">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01test_multi/00-base.xml b/tests/dictionaries/01test_multi/00-base.xml
index 976d6fa69..3fbe4b855 100644
--- a/tests/dictionaries/01test_multi/00-base.xml
+++ b/tests/dictionaries/01test_multi/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" test="test1|test2">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" test="test1|test2">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01test_multi_none/00-base.xml b/tests/dictionaries/01test_multi_none/00-base.xml
index d703f1dfc..eef0cf6ea 100644
--- a/tests/dictionaries/01test_multi_none/00-base.xml
+++ b/tests/dictionaries/01test_multi_none/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" test="|test1|test2">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" test="|test1|test2">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01test_redefine/00-base.xml b/tests/dictionaries/01test_redefine/00-base.xml
index 4499bdd4c..a3d9a16c7 100644
--- a/tests/dictionaries/01test_redefine/00-base.xml
+++ b/tests/dictionaries/01test_redefine/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" test="test">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" test="test">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01test_redefine/10-base.xml b/tests/dictionaries/01test_redefine/10-base.xml
index 7910620e8..131db74ef 100644
--- a/tests/dictionaries/01test_redefine/10-base.xml
+++ b/tests/dictionaries/01test_redefine/10-base.xml
@@ -1,10 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" redefine="True" test="test1"/>
-        </family>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" redefine="True" test="test1"/>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01test_redefine_base/00-base.xml b/tests/dictionaries/01test_redefine_base/00-base.xml
index 9047130c1..51e932bfa 100644
--- a/tests/dictionaries/01test_redefine_base/00-base.xml
+++ b/tests/dictionaries/01test_redefine_base/00-base.xml
@@ -1,8 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <variable name="my_variable"/>
-    </variables>
+  <variables>
+    <variable name="my_variable"/>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01test_redefine_base/10-base.xml b/tests/dictionaries/01test_redefine_base/10-base.xml
index a99cbf1fe..ca929f577 100644
--- a/tests/dictionaries/01test_redefine_base/10-base.xml
+++ b/tests/dictionaries/01test_redefine_base/10-base.xml
@@ -1,8 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <variable name="my_variable" redefine="True" test="test1"/>
-    </variables>
+  <variables>
+    <variable name="my_variable" redefine="True" test="test1"/>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01test_redefine_remove/00-base.xml b/tests/dictionaries/01test_redefine_remove/00-base.xml
index 4499bdd4c..a3d9a16c7 100644
--- a/tests/dictionaries/01test_redefine_remove/00-base.xml
+++ b/tests/dictionaries/01test_redefine_remove/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" test="test">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" test="test">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/01test_redefine_remove/10-base.xml b/tests/dictionaries/01test_redefine_remove/10-base.xml
index 5f7099f34..b1c129959 100644
--- a/tests/dictionaries/01test_redefine_remove/10-base.xml
+++ b/tests/dictionaries/01test_redefine_remove/10-base.xml
@@ -1,10 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" redefine="True" test=""/>
-        </family>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" redefine="True" test=""/>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/02autosave_hidden_frozenifin/00-base.xml b/tests/dictionaries/02autosave_hidden_frozenifin/00-base.xml
index 23223e087..6f811c347 100644
--- a/tests/dictionaries/02autosave_hidden_frozenifin/00-base.xml
+++ b/tests/dictionaries/02autosave_hidden_frozenifin/00-base.xml
@@ -1,24 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <variable name="server_deployed" type="boolean"/>
-        <family name="general" description="général">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="autosavevar" type="string" description="autosave variable" auto_save="True"/>
-        </family>
-    </variables>
-    <constraints>
-        <fill name="calc_val">
-            <param>oui</param>
-            <target>autosavevar</target>
-        </fill>
-        <condition name="hidden_if_in" source="mode_conteneur_actif">
-             <param>oui</param>
-             <target type="variable">autosavevar</target>
-        </condition>
-    </constraints>
+  <variables>
+    <variable name="server_deployed" type="boolean"/>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="autosavevar" type="string" description="autosave variable" auto_save="True"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param>oui</param>
+      <target>autosavevar</target>
+    </fill>
+    <condition name="hidden_if_in" source="mode_conteneur_actif">
+      <param>oui</param>
+      <target type="variable">autosavevar</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/02fill_multi_calc_val/00-base.xml b/tests/dictionaries/02fill_multi_calc_val/00-base.xml
index f12a5cfea..66876828b 100644
--- a/tests/dictionaries/02fill_multi_calc_val/00-base.xml
+++ b/tests/dictionaries/02fill_multi_calc_val/00-base.xml
@@ -1,19 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <variable name="var1">
-            <value>no</value>
-        </variable>
-        <variable name="var2" multi='True'/>
-    </variables>
-
-    <constraints>
-        <fill name="calc_value">
-            <param type="variable">var1</param>
-            <param type="boolean" name="multi">True</param>
-            <target>var2</target>
-        </fill>
-    </constraints>
+  <variables>
+    <variable name="var1">
+      <value>no</value>
+    </variable>
+    <variable name="var2" multi="True"/>
+  </variables>
+  <constraints>
+    <fill name="calc_value">
+      <param type="variable">var1</param>
+      <param type="boolean" name="multi">True</param>
+      <target>var2</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/02fill_multi_calc_val_multi/00-base.xml b/tests/dictionaries/02fill_multi_calc_val_multi/00-base.xml
index ac1e413de..f260758ab 100644
--- a/tests/dictionaries/02fill_multi_calc_val_multi/00-base.xml
+++ b/tests/dictionaries/02fill_multi_calc_val_multi/00-base.xml
@@ -1,20 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <variable name="var1" multi='True'>
-            <value>no</value>
-            <value>yes</value>
-            <value>maybe</value>
-        </variable>
-        <variable name="var2" multi='True'/>
-    </variables>
-
-    <constraints>
-        <fill name="calc_value">
-            <param type="variable">var1</param>
-            <target>var2</target>
-        </fill>
-    </constraints>
+  <variables>
+    <variable name="var1" multi="True">
+      <value>no</value>
+      <value>yes</value>
+      <value>maybe</value>
+    </variable>
+    <variable name="var2" multi="True"/>
+  </variables>
+  <constraints>
+    <fill name="calc_value">
+      <param type="variable">var1</param>
+      <target>var2</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10autosave_hidden/00-base.xml b/tests/dictionaries/10autosave_hidden/00-base.xml
index 1785ae349..f3248ec3f 100644
--- a/tests/dictionaries/10autosave_hidden/00-base.xml
+++ b/tests/dictionaries/10autosave_hidden/00-base.xml
@@ -1,21 +1,18 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <variable name="server_deployed" type="boolean"/>
-        <family name="general" description="général">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="autosavevar" type="string" description="autosave variable" hidden="True" auto_save="True"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param>oui</param>
-            <target>autosavevar</target>
-        </fill>
-    </constraints>
+  <variables>
+    <variable name="server_deployed" type="boolean"/>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="autosavevar" type="string" description="autosave variable" hidden="True" auto_save="True"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param>oui</param>
+      <target>autosavevar</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10check_base/00-base.xml b/tests/dictionaries/10check_base/00-base.xml
index af2187904..ca0c88032 100644
--- a/tests/dictionaries/10check_base/00-base.xml
+++ b/tests/dictionaries/10check_base/00-base.xml
@@ -1,20 +1,18 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>b</value>
-            </variable>
-            <variable name="int" type="number" description="No change"/>
-        </family>
-    </variables>
-    <constraints>
-        <check name="valid_entier">
-            <param name="mini" type="number">0</param>
-            <param name="maxi" type="number">100</param>
-            <target>int</target>
-        </check>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>b</value>
+      </variable>
+      <variable name="int" type="number" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_entier">
+      <param name="mini" type="number">0</param>
+      <param name="maxi" type="number">100</param>
+      <target>int</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10check_base_target_optional/00-base.xml b/tests/dictionaries/10check_base_target_optional/00-base.xml
index 5bd88212c..ff050721b 100644
--- a/tests/dictionaries/10check_base_target_optional/00-base.xml
+++ b/tests/dictionaries/10check_base_target_optional/00-base.xml
@@ -1,15 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <variable name="my_variable"/>
-    </variables>
-    <constraints>
-        <check name="valid_entier">
-            <param name="mini" type="number">0</param>
-            <param name="maxi" type="number">100</param>
-            <target optional="True">int</target>
-        </check>
-    </constraints>
+  <variables>
+    <variable name="my_variable"/>
+  </variables>
+  <constraints>
+    <check name="valid_entier">
+      <param name="mini" type="number">0</param>
+      <param name="maxi" type="number">100</param>
+      <target optional="True">int</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10check_no_param/00-base.xml b/tests/dictionaries/10check_no_param/00-base.xml
index 8042b729c..dbc7ff3d5 100644
--- a/tests/dictionaries/10check_no_param/00-base.xml
+++ b/tests/dictionaries/10check_no_param/00-base.xml
@@ -1,19 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>b</value>
-            </variable>
-            <variable name="int" type="number" description="No change"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_lower">
-            <target>int</target>
-        </check>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>b</value>
+      </variable>
+      <variable name="int" type="number" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_lower">
+      <target>int</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10check_option/00-base.xml b/tests/dictionaries/10check_option/00-base.xml
index a48d9e40b..90decd5f9 100644
--- a/tests/dictionaries/10check_option/00-base.xml
+++ b/tests/dictionaries/10check_option/00-base.xml
@@ -1,24 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>b</value>
-            </variable>
-            <variable name="int2" type="number" description="No change">
-                <value>100</value>
-            </variable>
-            <variable name="int" type="number" description="No change"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_lower">
-            <param name="mini" type="number">0</param>
-            <param name="maxi" type="variable">int2</param>
-            <target>int</target>
-        </check>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>b</value>
+      </variable>
+      <variable name="int2" type="number" description="No change">
+        <value>100</value>
+      </variable>
+      <variable name="int" type="number" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_lower">
+      <param name="mini" type="number">0</param>
+      <param name="maxi" type="variable">int2</param>
+      <target>int</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10check_optional/00-base.xml b/tests/dictionaries/10check_optional/00-base.xml
index 230ff007c..2492a5b8d 100644
--- a/tests/dictionaries/10check_optional/00-base.xml
+++ b/tests/dictionaries/10check_optional/00-base.xml
@@ -1,25 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>b</value>
-            </variable>
-            <variable name="int" type="number" description="No change"/>
-            <variable name="int2" type="number" description="No change"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_differ">
-            <param type="variable" optional="True">int2</param>
-            <target>int</target>
-        </check>
-        <check name="valid_differ">
-            <param type="variable" optional="True">int3</param>
-            <target>int</target>
-        </check>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>b</value>
+      </variable>
+      <variable name="int" type="number" description="No change"/>
+      <variable name="int2" type="number" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_differ">
+      <param type="variable" optional="True">int2</param>
+      <target>int</target>
+    </check>
+    <check name="valid_differ">
+      <param type="variable" optional="True">int3</param>
+      <target>int</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10check_valid_differ/00-base.xml b/tests/dictionaries/10check_valid_differ/00-base.xml
index 263d84574..66c5cdb25 100644
--- a/tests/dictionaries/10check_valid_differ/00-base.xml
+++ b/tests/dictionaries/10check_valid_differ/00-base.xml
@@ -1,22 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>oui</value>
-            </variable>
-            <variable name="mode_conteneur_actif1" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_differ">
-            <param type="variable">mode_conteneur_actif1</param>
-            <target>mode_conteneur_actif</target>
-        </check>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>oui</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_differ">
+      <param type="variable">mode_conteneur_actif1</param>
+      <target>mode_conteneur_actif</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10check_valid_differ_add/00-base.xml b/tests/dictionaries/10check_valid_differ_add/00-base.xml
index e8eaac333..8f7d0d622 100644
--- a/tests/dictionaries/10check_valid_differ_add/00-base.xml
+++ b/tests/dictionaries/10check_valid_differ_add/00-base.xml
@@ -1,28 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>oui</value>
-            </variable>
-            <variable name="mode_conteneur_actif1" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif3" type="string" description="No change">
-                <value>oui</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_differ">
-            <param type="variable">mode_conteneur_actif1</param>
-            <target>mode_conteneur_actif3</target>
-        </check>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>oui</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif3" type="string" description="No change">
+        <value>oui</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_differ">
+      <param type="variable">mode_conteneur_actif1</param>
+      <target>mode_conteneur_actif3</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10check_valid_differ_add/01-base.xml b/tests/dictionaries/10check_valid_differ_add/01-base.xml
index 514abfabc..cb008e7c4 100644
--- a/tests/dictionaries/10check_valid_differ_add/01-base.xml
+++ b/tests/dictionaries/10check_valid_differ_add/01-base.xml
@@ -1,21 +1,18 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif3" redefine="True"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_differ">
-            <param type="variable">mode_conteneur_actif1</param>
-            <target>mode_conteneur_actif3</target>
-        </check>
-        <check name="valid_differ">
-            <param type="variable">mode_conteneur_actif2</param>
-            <target>mode_conteneur_actif3</target>
-        </check>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif3" redefine="True"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_differ">
+      <param type="variable">mode_conteneur_actif1</param>
+      <target>mode_conteneur_actif3</target>
+    </check>
+    <check name="valid_differ">
+      <param type="variable">mode_conteneur_actif2</param>
+      <target>mode_conteneur_actif3</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10check_valid_differ_removecheck/00-base.xml b/tests/dictionaries/10check_valid_differ_removecheck/00-base.xml
index e8eaac333..8f7d0d622 100644
--- a/tests/dictionaries/10check_valid_differ_removecheck/00-base.xml
+++ b/tests/dictionaries/10check_valid_differ_removecheck/00-base.xml
@@ -1,28 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>oui</value>
-            </variable>
-            <variable name="mode_conteneur_actif1" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif3" type="string" description="No change">
-                <value>oui</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_differ">
-            <param type="variable">mode_conteneur_actif1</param>
-            <target>mode_conteneur_actif3</target>
-        </check>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>oui</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif3" type="string" description="No change">
+        <value>oui</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_differ">
+      <param type="variable">mode_conteneur_actif1</param>
+      <target>mode_conteneur_actif3</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10check_valid_differ_removecheck/01-base.xml b/tests/dictionaries/10check_valid_differ_removecheck/01-base.xml
index 589d86f53..f60d9d424 100644
--- a/tests/dictionaries/10check_valid_differ_removecheck/01-base.xml
+++ b/tests/dictionaries/10check_valid_differ_removecheck/01-base.xml
@@ -1,23 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif3" redefine="True" remove_check="True">
-                <value>oui</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_differ">
-            <param type="variable">mode_conteneur_actif1</param>
-            <target>mode_conteneur_actif3</target>
-        </check>
-        <check name="valid_differ">
-            <param type="variable">mode_conteneur_actif2</param>
-            <target>mode_conteneur_actif3</target>
-        </check>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif3" redefine="True" remove_check="True">
+        <value>oui</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_differ">
+      <param type="variable">mode_conteneur_actif1</param>
+      <target>mode_conteneur_actif3</target>
+    </check>
+    <check name="valid_differ">
+      <param type="variable">mode_conteneur_actif2</param>
+      <target>mode_conteneur_actif3</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10check_valid_in_network/00-base.xml b/tests/dictionaries/10check_valid_in_network/00-base.xml
index 35bce26eb..5b807fc81 100644
--- a/tests/dictionaries/10check_valid_in_network/00-base.xml
+++ b/tests/dictionaries/10check_valid_in_network/00-base.xml
@@ -1,23 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>oui</value>
-            </variable>
-            <variable name="adresse_ip_eth0" type="local_ip" description="Adresse IP de la carte" mandatory="True" mode="basic"/>
-            <variable name="adresse_netmask_eth0" type="netmask" description="Masque de sous réseau de la carte" mandatory="True" mode="basic"/>
-            <variable name="adresse_ip" type="local_ip" description="IP" mandatory="True" mode="basic"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_in_network" level="warning">
-            <param type="variable">adresse_ip_eth0</param>
-            <param type="variable">adresse_netmask_eth0</param>
-            <target>adresse_ip</target>
-        </check>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>oui</value>
+      </variable>
+      <variable name="adresse_ip_eth0" type="local_ip" description="Adresse IP de la carte" mandatory="True" mode="basic"/>
+      <variable name="adresse_netmask_eth0" type="netmask" description="Masque de sous réseau de la carte" mandatory="True" mode="basic"/>
+      <variable name="adresse_ip" type="local_ip" description="IP" mandatory="True" mode="basic"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_in_network" level="warning">
+      <param type="variable">adresse_ip_eth0</param>
+      <param type="variable">adresse_netmask_eth0</param>
+      <target>adresse_ip</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10check_valid_in_network_cidr/00-base.xml b/tests/dictionaries/10check_valid_in_network_cidr/00-base.xml
index 5e6e2fcc2..b46fc733e 100644
--- a/tests/dictionaries/10check_valid_in_network_cidr/00-base.xml
+++ b/tests/dictionaries/10check_valid_in_network_cidr/00-base.xml
@@ -1,21 +1,18 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>oui</value>
-            </variable>
-            <variable name="adresse_ip_eth0" type="cidr" description="Adresse IP de la carte" mandatory="True" mode="basic"/>
-            <variable name="adresse_ip" type="local_ip" description="IP" mandatory="True" mode="basic"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_in_network" level="warning">
-            <param type="variable">adresse_ip_eth0</param>
-            <target>adresse_ip</target>
-        </check>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>oui</value>
+      </variable>
+      <variable name="adresse_ip_eth0" type="cidr" description="Adresse IP de la carte" mandatory="True" mode="basic"/>
+      <variable name="adresse_ip" type="local_ip" description="IP" mandatory="True" mode="basic"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_in_network" level="warning">
+      <param type="variable">adresse_ip_eth0</param>
+      <target>adresse_ip</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10check_valid_ipnetmask/00-base.xml b/tests/dictionaries/10check_valid_ipnetmask/00-base.xml
index 0c0a913cd..62e76c062 100644
--- a/tests/dictionaries/10check_valid_ipnetmask/00-base.xml
+++ b/tests/dictionaries/10check_valid_ipnetmask/00-base.xml
@@ -1,21 +1,18 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>oui</value>
-            </variable>
-            <variable name="adresse_ip_eth0" type="local_ip" description="Adresse IP de la carte" mandatory="True" mode="basic"/>
-            <variable name="adresse_netmask_eth0" type="netmask" description="Masque de sous réseau de la carte" mandatory="True" mode="basic"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_ipnetmask" level="warning">
-            <param type="variable">adresse_ip_eth0</param>
-            <target>adresse_netmask_eth0</target>
-        </check>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>oui</value>
+      </variable>
+      <variable name="adresse_ip_eth0" type="local_ip" description="Adresse IP de la carte" mandatory="True" mode="basic"/>
+      <variable name="adresse_netmask_eth0" type="netmask" description="Masque de sous réseau de la carte" mandatory="True" mode="basic"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_ipnetmask" level="warning">
+      <param type="variable">adresse_ip_eth0</param>
+      <target>adresse_netmask_eth0</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10fill_information/00-base.xml b/tests/dictionaries/10fill_information/00-base.xml
index 1b46fd3b2..a8bdb0661 100644
--- a/tests/dictionaries/10fill_information/00-base.xml
+++ b/tests/dictionaries/10fill_information/00-base.xml
@@ -1,17 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param type="information">test_information</param>
-            <target>mode_conteneur_actif</target>
-        </fill>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="information">test_information</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10frozenifin_unknown_valid_enum_number/00-base.xml b/tests/dictionaries/10frozenifin_unknown_valid_enum_number/00-base.xml
index 3ae689fd1..96e87d8f3 100644
--- a/tests/dictionaries/10frozenifin_unknown_valid_enum_number/00-base.xml
+++ b/tests/dictionaries/10frozenifin_unknown_valid_enum_number/00-base.xml
@@ -1,30 +1,26 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general" mode="expert">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="enumfam" mode="expert">
-            <variable name="enumvar" type="number" description="enumvar" help="bla bla bla"/>
-            <variable name="test_variable" type="number" description="test variable"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_enum">
-            <param>1</param>
-            <param>2</param>
-            <param>3</param>
-            <target>enumvar</target>
-        </check>
-        <condition name="hidden_if_in" source="enumvar">
-            <param>4</param>
-            <target type="variable">test_variable</target>
-        </condition>
-    </constraints>
-
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="enumfam" mode="expert">
+      <variable name="enumvar" type="number" description="enumvar" help="bla bla bla"/>
+      <variable name="test_variable" type="number" description="test variable"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>1</param>
+      <param>2</param>
+      <param>3</param>
+      <target>enumvar</target>
+    </check>
+    <condition name="hidden_if_in" source="enumvar">
+      <param>4</param>
+      <target type="variable">test_variable</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10leadership_append/00-base.xml b/tests/dictionaries/10leadership_append/00-base.xml
index a1c29b993..2b7726a56 100644
--- a/tests/dictionaries/10leadership_append/00-base.xml
+++ b/tests/dictionaries/10leadership_append/00-base.xml
@@ -1,30 +1,29 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="general1">
-            <variable name="leader" type="string" description="leader" multi="True"/>
-            <variable name="follower1" type="string" description="follower1"/>
-            <variable name="follower2" type="string" description="follower2"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param name="valeur">valfill</param>
-	    <target>follower1</target>
-        </fill>
-        <fill name="calc_val">
-            <param type="variable">follower1</param>
-	    <target>follower2</target>
-        </fill>
-        <group leader="leader">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="general1">
+      <variable name="leader" type="string" description="leader" multi="True"/>
+      <variable name="follower1" type="string" description="follower1"/>
+      <variable name="follower2" type="string" description="follower2"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valfill</param>
+      <target>follower1</target>
+    </fill>
+    <fill name="calc_val">
+      <param type="variable">follower1</param>
+      <target>follower2</target>
+    </fill>
+    <group leader="leader">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+    </group>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/10leadership_append/01-base.xml b/tests/dictionaries/10leadership_append/01-base.xml
index 84510a9a0..b271772bd 100644
--- a/tests/dictionaries/10leadership_append/01-base.xml
+++ b/tests/dictionaries/10leadership_append/01-base.xml
@@ -1,14 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general1">
-            <variable name="follower3" type="string" description="follower3"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <group leader="leader">
-            <follower>follower3</follower>
-        </group>
-    </constraints>
+  <variables>
+    <family name="general1">
+      <variable name="follower3" type="string" description="follower3"/>
+    </family>
+  </variables>
+  <constraints>
+    <group leader="leader">
+      <follower>follower3</follower>
+    </group>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/10leadership_append_hidden/00-base.xml b/tests/dictionaries/10leadership_append_hidden/00-base.xml
index ad4f48623..605a5b15c 100644
--- a/tests/dictionaries/10leadership_append_hidden/00-base.xml
+++ b/tests/dictionaries/10leadership_append_hidden/00-base.xml
@@ -1,30 +1,29 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="general1">
-            <variable name="leader" type="string" description="leader" multi="True" hidden="True"/>
-            <variable name="follower1" type="string" description="follower1"/>
-            <variable name="follower2" type="string" description="follower2"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param name="valeur">valfill</param>
-	    <target>follower1</target>
-        </fill>
-        <fill name="calc_val">
-            <param type="variable">follower1</param>
-	    <target>follower2</target>
-        </fill>
-        <group leader="leader">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="general1">
+      <variable name="leader" type="string" description="leader" multi="True" hidden="True"/>
+      <variable name="follower1" type="string" description="follower1"/>
+      <variable name="follower2" type="string" description="follower2"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valfill</param>
+      <target>follower1</target>
+    </fill>
+    <fill name="calc_val">
+      <param type="variable">follower1</param>
+      <target>follower2</target>
+    </fill>
+    <group leader="leader">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+    </group>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/10leadership_append_hidden/01-base.xml b/tests/dictionaries/10leadership_append_hidden/01-base.xml
index 84510a9a0..b271772bd 100644
--- a/tests/dictionaries/10leadership_append_hidden/01-base.xml
+++ b/tests/dictionaries/10leadership_append_hidden/01-base.xml
@@ -1,14 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general1">
-            <variable name="follower3" type="string" description="follower3"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <group leader="leader">
-            <follower>follower3</follower>
-        </group>
-    </constraints>
+  <variables>
+    <family name="general1">
+      <variable name="follower3" type="string" description="follower3"/>
+    </family>
+  </variables>
+  <constraints>
+    <group leader="leader">
+      <follower>follower3</follower>
+    </group>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/10leadership_append_name/00-base.xml b/tests/dictionaries/10leadership_append_name/00-base.xml
index 94969b2d7..8dc3f4417 100644
--- a/tests/dictionaries/10leadership_append_name/00-base.xml
+++ b/tests/dictionaries/10leadership_append_name/00-base.xml
@@ -1,30 +1,29 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="general1">
-            <variable name="leader" type="string" description="leader" multi="True"/>
-            <variable name="follower1" type="string" description="follower1"/>
-            <variable name="follower2" type="string" description="follower2"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param name="valeur">valfill</param>
-	    <target>follower1</target>
-        </fill>
-        <fill name="calc_val">
-            <param type="variable">follower1</param>
-	    <target>follower2</target>
-        </fill>
-        <group leader="leader" name="leadership">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="general1">
+      <variable name="leader" type="string" description="leader" multi="True"/>
+      <variable name="follower1" type="string" description="follower1"/>
+      <variable name="follower2" type="string" description="follower2"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valfill</param>
+      <target>follower1</target>
+    </fill>
+    <fill name="calc_val">
+      <param type="variable">follower1</param>
+      <target>follower2</target>
+    </fill>
+    <group leader="leader" name="leadership">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+    </group>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/10leadership_append_name/01-base.xml b/tests/dictionaries/10leadership_append_name/01-base.xml
index 84510a9a0..b271772bd 100644
--- a/tests/dictionaries/10leadership_append_name/01-base.xml
+++ b/tests/dictionaries/10leadership_append_name/01-base.xml
@@ -1,14 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general1">
-            <variable name="follower3" type="string" description="follower3"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <group leader="leader">
-            <follower>follower3</follower>
-        </group>
-    </constraints>
+  <variables>
+    <family name="general1">
+      <variable name="follower3" type="string" description="follower3"/>
+    </family>
+  </variables>
+  <constraints>
+    <group leader="leader">
+      <follower>follower3</follower>
+    </group>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/10leadership_auto/00-base.xml b/tests/dictionaries/10leadership_auto/00-base.xml
index cf529b267..abdc42df6 100644
--- a/tests/dictionaries/10leadership_auto/00-base.xml
+++ b/tests/dictionaries/10leadership_auto/00-base.xml
@@ -1,34 +1,33 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="leader" type="string" description="leader" multi="True"/>
-            <variable name="follower1" type="string" description="follower1" hidden="True"/>
-            <variable name="follower2" type="string" description="follower2" hidden="True"/>
-            <variable name="follower3" type="string" description="follower3" hidden="True"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param name="valeur">valfill</param>
-	    <target>follower1</target>
-        </fill>
-        <fill name="calc_val">
-            <param type="variable">follower1</param>
-	    <target>follower2</target>
-        </fill>
-        <fill name="calc_val">
-            <param type="variable">leader</param>
-	    <target>follower3</target>
-        </fill>
-        <group leader="leader">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-            <follower>follower3</follower>
-        </group>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="leader" type="string" description="leader" multi="True"/>
+      <variable name="follower1" type="string" description="follower1" hidden="True"/>
+      <variable name="follower2" type="string" description="follower2" hidden="True"/>
+      <variable name="follower3" type="string" description="follower3" hidden="True"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valfill</param>
+      <target>follower1</target>
+    </fill>
+    <fill name="calc_val">
+      <param type="variable">follower1</param>
+      <target>follower2</target>
+    </fill>
+    <fill name="calc_val">
+      <param type="variable">leader</param>
+      <target>follower3</target>
+    </fill>
+    <group leader="leader">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+      <follower>follower3</follower>
+    </group>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/10leadership_auto_index/00-base.xml b/tests/dictionaries/10leadership_auto_index/00-base.xml
index ef54c49be..cd8979cb0 100644
--- a/tests/dictionaries/10leadership_auto_index/00-base.xml
+++ b/tests/dictionaries/10leadership_auto_index/00-base.xml
@@ -1,21 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <variable name="leader" multi="True">
-            <value>a</value>
-            <value>b</value>
-            <value>c</value>
-        </variable>
-        <variable name="follower1" type="number"/>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param type="index"/>
-            <target>follower1</target>
-        </fill>
-        <group leader="leader">
-            <follower>follower1</follower>
-        </group>
-    </constraints>
+  <variables>
+    <variable name="leader" multi="True">
+      <value>a</value>
+      <value>b</value>
+      <value>c</value>
+    </variable>
+    <variable name="follower1" type="number"/>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="index"/>
+      <target>follower1</target>
+    </fill>
+    <group leader="leader">
+      <follower>follower1</follower>
+    </group>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/10leadership_autoleader/00-base.xml b/tests/dictionaries/10leadership_autoleader/00-base.xml
index c7d93e40a..08f977237 100644
--- a/tests/dictionaries/10leadership_autoleader/00-base.xml
+++ b/tests/dictionaries/10leadership_autoleader/00-base.xml
@@ -1,28 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="leader" type="string" description="leader" multi="True"/>
-            <variable name="follower1" type="string" description="follower1" hidden="True"/>
-            <variable name="follower2" type="string" description="follower2" hidden="True"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param name="valeur">valfill</param>
-	    <target>follower1</target>
-        </fill>
-        <fill name="calc_val">
-            <param type="variable">leader</param>
-	    <target>follower2</target>
-        </fill>
-        <group leader="leader">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="leader" type="string" description="leader" multi="True"/>
+      <variable name="follower1" type="string" description="follower1" hidden="True"/>
+      <variable name="follower2" type="string" description="follower2" hidden="True"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valfill</param>
+      <target>follower1</target>
+    </fill>
+    <fill name="calc_val">
+      <param type="variable">leader</param>
+      <target>follower2</target>
+    </fill>
+    <group leader="leader">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+    </group>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/10leadership_autoleader_expert/00-base.xml b/tests/dictionaries/10leadership_autoleader_expert/00-base.xml
index 9492e422f..231c29f30 100644
--- a/tests/dictionaries/10leadership_autoleader_expert/00-base.xml
+++ b/tests/dictionaries/10leadership_autoleader_expert/00-base.xml
@@ -1,26 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general" mode="expert">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="leadermode">
-            <variable name="leader" type="string" description="leader" multi="True" mode="expert"/>
-            <variable name="follower1" type="string" description="follower1"/>
-            <variable name="follower2" type="string" description="follower2"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_list">
-            <param name="valeur">valfill</param>
-	    <target>leader</target>
-        </fill>
-        <group leader="leader">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-    </constraints>
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="leadermode">
+      <variable name="leader" type="string" description="leader" multi="True" mode="expert"/>
+      <variable name="follower1" type="string" description="follower1"/>
+      <variable name="follower2" type="string" description="follower2"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_list">
+      <param name="valeur">valfill</param>
+      <target>leader</target>
+    </fill>
+    <group leader="leader">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+    </group>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/10leadership_autosaveexpert/00-base.xml b/tests/dictionaries/10leadership_autosaveexpert/00-base.xml
index aed0bc94a..fab4877de 100644
--- a/tests/dictionaries/10leadership_autosaveexpert/00-base.xml
+++ b/tests/dictionaries/10leadership_autosaveexpert/00-base.xml
@@ -1,28 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="leader" type="string" description="leader" multi="True"/>
-            <variable name="follower1" type="string" description="follower1"/>
-            <variable name="follower2" type="string" description="follower2" mode="expert"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param name="valeur">valfill</param>
-	    <target>follower1</target>
-        </fill>
-        <fill name="calc_val">
-            <param type="variable">follower1</param>
-	    <target>follower2</target>
-        </fill>
-        <group leader="leader">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="leader" type="string" description="leader" multi="True"/>
+      <variable name="follower1" type="string" description="follower1"/>
+      <variable name="follower2" type="string" description="follower2" mode="expert"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valfill</param>
+      <target>follower1</target>
+    </fill>
+    <fill name="calc_val">
+      <param type="variable">follower1</param>
+      <target>follower2</target>
+    </fill>
+    <group leader="leader">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+    </group>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/10leadership_leader_hidden/00-base.xml b/tests/dictionaries/10leadership_leader_hidden/00-base.xml
index 2833833f9..baa6de826 100644
--- a/tests/dictionaries/10leadership_leader_hidden/00-base.xml
+++ b/tests/dictionaries/10leadership_leader_hidden/00-base.xml
@@ -1,26 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general" mode="expert">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="leadermode">
-            <variable name="leader" type="string" description="leader" multi="True" hidden="True"/>
-            <variable name="follower1" type="string" description="follower1"/>
-            <variable name="follower2" type="string" description="follower2"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_list">
-            <param name="valeur">valfill</param>
-	    <target>leader</target>
-        </fill>
-        <group leader="leader">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-    </constraints>
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="leadermode">
+      <variable name="leader" type="string" description="leader" multi="True" hidden="True"/>
+      <variable name="follower1" type="string" description="follower1"/>
+      <variable name="follower2" type="string" description="follower2"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_list">
+      <param name="valeur">valfill</param>
+      <target>leader</target>
+    </fill>
+    <group leader="leader">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+    </group>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/10leadership_leader_hidden_if_in/00-base.xml b/tests/dictionaries/10leadership_leader_hidden_if_in/00-base.xml
index 1e1913b82..0b3448653 100644
--- a/tests/dictionaries/10leadership_leader_hidden_if_in/00-base.xml
+++ b/tests/dictionaries/10leadership_leader_hidden_if_in/00-base.xml
@@ -1,26 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general" mode="expert">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="leadermode">
-            <variable name="leader" type="string" description="leader" multi="True"/>
-            <variable name="follower1" type="string" description="follower1"/>
-            <variable name="follower2" type="string" description="follower2"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <group leader="leader">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-        <condition name="hidden_if_in" source="mode_conteneur_actif">
-            <param>non</param>
-            <target type="variable">leader</target>
-        </condition>
-    </constraints>
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="leadermode">
+      <variable name="leader" type="string" description="leader" multi="True"/>
+      <variable name="follower1" type="string" description="follower1"/>
+      <variable name="follower2" type="string" description="follower2"/>
+    </family>
+  </variables>
+  <constraints>
+    <group leader="leader">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+    </group>
+    <condition name="hidden_if_in" source="mode_conteneur_actif">
+      <param>non</param>
+      <target type="variable">leader</target>
+    </condition>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/10leadership_leader_hidden_if_in_name/00-base.xml b/tests/dictionaries/10leadership_leader_hidden_if_in_name/00-base.xml
index e969f76f8..9a5818a56 100644
--- a/tests/dictionaries/10leadership_leader_hidden_if_in_name/00-base.xml
+++ b/tests/dictionaries/10leadership_leader_hidden_if_in_name/00-base.xml
@@ -1,26 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general" mode="expert">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="leadermode">
-            <variable name="leader" type="string" description="leader" multi="True"/>
-            <variable name="follower1" type="string" description="follower1"/>
-            <variable name="follower2" type="string" description="follower2"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <group leader="leader" name="other">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-        <condition name="hidden_if_in" source="mode_conteneur_actif">
-            <param>non</param>
-            <target type="variable">leader</target>
-        </condition>
-    </constraints>
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="leadermode">
+      <variable name="leader" type="string" description="leader" multi="True"/>
+      <variable name="follower1" type="string" description="follower1"/>
+      <variable name="follower2" type="string" description="follower2"/>
+    </family>
+  </variables>
+  <constraints>
+    <group leader="leader" name="other">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+    </group>
+    <condition name="hidden_if_in" source="mode_conteneur_actif">
+      <param>non</param>
+      <target type="variable">leader</target>
+    </condition>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/10leadership_leadermandatory/00-base.xml b/tests/dictionaries/10leadership_leadermandatory/00-base.xml
index 6cca43c98..b8d1b8136 100644
--- a/tests/dictionaries/10leadership_leadermandatory/00-base.xml
+++ b/tests/dictionaries/10leadership_leadermandatory/00-base.xml
@@ -1,28 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="leader" type="string" description="leader" multi="True" mandatory="True"/>
-            <variable name="follower1" type="string" description="follower1"/>
-            <variable name="follower2" type="string" description="follower2"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param name="valeur">valfill</param>
-	    <target>follower1</target>
-        </fill>
-	<fill name="calc_val">
-            <param type="variable">follower1</param>
-	    <target>follower2</target>
-        </fill>
-        <group leader="leader">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="leader" type="string" description="leader" multi="True" mandatory="True"/>
+      <variable name="follower1" type="string" description="follower1"/>
+      <variable name="follower2" type="string" description="follower2"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valfill</param>
+      <target>follower1</target>
+    </fill>
+    <fill name="calc_val">
+      <param type="variable">follower1</param>
+      <target>follower2</target>
+    </fill>
+    <group leader="leader">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+    </group>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/10leadership_mandatory/00-base.xml b/tests/dictionaries/10leadership_mandatory/00-base.xml
index b6c3b8ef8..07d8f068d 100644
--- a/tests/dictionaries/10leadership_mandatory/00-base.xml
+++ b/tests/dictionaries/10leadership_mandatory/00-base.xml
@@ -1,28 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="leader" type="string" description="leader" multi="True"/>
-            <variable name="follower1" type="string" description="follower1" mandatory="True"/>
-            <variable name="follower2" type="string" description="follower2"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param name="valeur">valfill</param>
-	    <target>follower1</target>
-        </fill>
-	<fill name="calc_val">
-            <param type="variable">follower1</param>
-	    <target>follower2</target>
-        </fill>
-        <group leader="leader">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="leader" type="string" description="leader" multi="True"/>
+      <variable name="follower1" type="string" description="follower1" mandatory="True"/>
+      <variable name="follower2" type="string" description="follower2"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valfill</param>
+      <target>follower1</target>
+    </fill>
+    <fill name="calc_val">
+      <param type="variable">follower1</param>
+      <target>follower2</target>
+    </fill>
+    <group leader="leader">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+    </group>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/10leadership_mandatoryfollower/00-base.xml b/tests/dictionaries/10leadership_mandatoryfollower/00-base.xml
index 8af3a1bc7..6865c3315 100644
--- a/tests/dictionaries/10leadership_mandatoryfollower/00-base.xml
+++ b/tests/dictionaries/10leadership_mandatoryfollower/00-base.xml
@@ -1,20 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general" description="général">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>oui</value>
-            </variable>
-			<variable name="nut_monitor_netmask" type="netmask" description="Masque de l'IP du réseau de l'esclave" multi="True"/>
-            <variable name="nut_monitor_host" type="network" description="Adresse IP du réseau de l'esclave" mandatory="True"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <group leader="nut_monitor_netmask">
-            <follower>nut_monitor_host</follower>
-        </group>
-    </constraints>
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>oui</value>
+      </variable>
+      <variable name="nut_monitor_netmask" type="netmask" description="Masque de l'IP du réseau de l'esclave" multi="True"/>
+      <variable name="nut_monitor_host" type="network" description="Adresse IP du réseau de l'esclave" mandatory="True"/>
+    </family>
+  </variables>
+  <constraints>
+    <group leader="nut_monitor_netmask">
+      <follower>nut_monitor_host</follower>
+    </group>
+  </constraints>
 </rougail>
-<!-- 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 b24f297c0..8bb071cfc 100644
--- a/tests/dictionaries/10leadership_multi/00-base.xml
+++ b/tests/dictionaries/10leadership_multi/00-base.xml
@@ -1,37 +1,36 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="general1">
-            <variable name="leader" type="string" description="leader" multi="True"/>
-            <variable name="follower1" type="string" description="follower1"/>
-            <variable name="follower2" type="string" description="follower2"/>
-            <variable name="leader1" type="string" description="leader" multi="True"/>
-            <variable name="follower11" type="string" description="follower1"/>
-            <variable name="follower21" type="string" description="follower2"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param name="valeur">valfill</param>
-	    <target>follower1</target>
-        </fill>
-        <fill name="calc_val">
-            <param type="variable">follower1</param>
-	    <target>follower2</target>
-        </fill>
-        <group leader="leader">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-        <group leader="leader1">
-            <follower>follower11</follower>
-            <follower>follower21</follower>
-        </group>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="general1">
+      <variable name="leader" type="string" description="leader" multi="True"/>
+      <variable name="follower1" type="string" description="follower1"/>
+      <variable name="follower2" type="string" description="follower2"/>
+      <variable name="leader1" type="string" description="leader" multi="True"/>
+      <variable name="follower11" type="string" description="follower1"/>
+      <variable name="follower21" type="string" description="follower2"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valfill</param>
+      <target>follower1</target>
+    </fill>
+    <fill name="calc_val">
+      <param type="variable">follower1</param>
+      <target>follower2</target>
+    </fill>
+    <group leader="leader">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+    </group>
+    <group leader="leader1">
+      <follower>follower11</follower>
+      <follower>follower21</follower>
+    </group>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/10load_disabled_if_in/00-base.xml b/tests/dictionaries/10load_disabled_if_in/00-base.xml
index 08ed72c26..b9d716872 100644
--- a/tests/dictionaries/10load_disabled_if_in/00-base.xml
+++ b/tests/dictionaries/10load_disabled_if_in/00-base.xml
@@ -1,26 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="condition" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_in" source="condition">
-            <param>oui</param>
-            <target type="variable">mode_conteneur_actif</target>
-            <target type="variable">mode_conteneur_actif2</target>
-        </condition>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10load_disabled_if_in_fill/00-base.xml b/tests/dictionaries/10load_disabled_if_in_fill/00-base.xml
index 306d24093..4488de320 100644
--- a/tests/dictionaries/10load_disabled_if_in_fill/00-base.xml
+++ b/tests/dictionaries/10load_disabled_if_in_fill/00-base.xml
@@ -1,25 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="condition" type="string">
-                <value>no</value>
-            </variable>
-            <variable name="variable1" type="string"/>
-            <variable name="variable2" type="string"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_in" source="condition">
-            <param>no</param>
-            <target type="variable">variable1</target>
-        </condition>
-        <fill name="calc_val">
-            <param type="variable" propertyerror="False">variable1</param>
-            <target>variable2</target>
-        </fill>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string">
+        <value>no</value>
+      </variable>
+      <variable name="variable1" type="string"/>
+      <variable name="variable2" type="string"/>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>no</param>
+      <target type="variable">variable1</target>
+    </condition>
+    <fill name="calc_val">
+      <param type="variable" propertyerror="False">variable1</param>
+      <target>variable2</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10load_disabled_if_in_list_optional/00-base.xml b/tests/dictionaries/10load_disabled_if_in_list_optional/00-base.xml
index d1201d36d..51927ae8f 100644
--- a/tests/dictionaries/10load_disabled_if_in_list_optional/00-base.xml
+++ b/tests/dictionaries/10load_disabled_if_in_list_optional/00-base.xml
@@ -1,15 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <variable name="condition" type="boolean"/>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_in" source="condition">
-            <param>True</param>
-            <target type="filelist" optional="True">unknown</target>
-        </condition>
-    </constraints>
+  <variables>
+    <variable name="condition" type="boolean"/>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>True</param>
+      <target type="filelist" optional="True">unknown</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param/00-base.xml b/tests/dictionaries/10load_disabled_if_in_multi_param/00-base.xml
index 6ed6397ab..e24812055 100644
--- a/tests/dictionaries/10load_disabled_if_in_multi_param/00-base.xml
+++ b/tests/dictionaries/10load_disabled_if_in_multi_param/00-base.xml
@@ -1,33 +1,30 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <services>
-        <service name="test">
-            <file filelist="afilllist">/tmp/file1</file>
-        </service>
-    </services>
-    <variables>
-        <family name="general">
-            <variable name="condition" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_in" source="condition">
-            <param>oui</param>
-            <param>maybe</param>
-            <target type="variable">mode_conteneur_actif</target>
-            <target type="variable">mode_conteneur_actif2</target>
-            <target type="filelist">afilllist</target>
-        </condition>
-    </constraints>
+  <services>
+    <service name="test">
+      <file filelist="afilllist">/tmp/file1</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>oui</param>
+      <param>maybe</param>
+      <target type="variable">mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+      <target type="filelist">afilllist</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param2/00-base.xml b/tests/dictionaries/10load_disabled_if_in_multi_param2/00-base.xml
index a395156f6..484e19178 100644
--- a/tests/dictionaries/10load_disabled_if_in_multi_param2/00-base.xml
+++ b/tests/dictionaries/10load_disabled_if_in_multi_param2/00-base.xml
@@ -1,38 +1,35 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <services>
-        <service name="test">
-            <file filelist="afilllist">/tmp/file1</file>
-        </service>
-    </services>
-    <variables>
-        <family name="general">
-            <variable name="condition" type="string" description="No change">
-                <value>no</value>
-            </variable>
-            <variable name="condition2" type="string" description="No change">
-                <value>no</value>
-            </variable>
-            <variable name="test_variable" type="string" description="No change" hidden="True">
-                <value>no</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_in" source="condition">
-            <param>yes</param>
-            <param>maybe</param>
-            <target type="variable">test_variable</target>
-            <target type="filelist">afilllist</target>
-        </condition>
-        <condition name="disabled_if_in" source="condition2">
-            <param>yes</param>
-            <param>maybe</param>
-            <target type="variable">test_variable</target>
-            <target type="filelist">afilllist</target>
-        </condition>
-    </constraints>
+  <services>
+    <service name="test">
+      <file filelist="afilllist">/tmp/file1</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>no</value>
+      </variable>
+      <variable name="condition2" type="string" description="No change">
+        <value>no</value>
+      </variable>
+      <variable name="test_variable" type="string" description="No change" hidden="True">
+        <value>no</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>yes</param>
+      <param>maybe</param>
+      <target type="variable">test_variable</target>
+      <target type="filelist">afilllist</target>
+    </condition>
+    <condition name="disabled_if_in" source="condition2">
+      <param>yes</param>
+      <param>maybe</param>
+      <target type="variable">test_variable</target>
+      <target type="filelist">afilllist</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param3/00-base.xml b/tests/dictionaries/10load_disabled_if_in_multi_param3/00-base.xml
index ae7b98887..6162a26ef 100644
--- a/tests/dictionaries/10load_disabled_if_in_multi_param3/00-base.xml
+++ b/tests/dictionaries/10load_disabled_if_in_multi_param3/00-base.xml
@@ -1,38 +1,35 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <services>
-        <service name="test">
-            <file filelist="afilllist">/tmp/file1</file>
-        </service>
-    </services>
-    <variables>
-        <family name="general">
-            <variable name="condition" type="string" description="No change">
-                <value>no</value>
-            </variable>
-            <variable name="condition2" type="string" description="No change">
-                <value>no</value>
-            </variable>
-            <variable name="test_variable" type="string" description="No change" hidden="True">
-                <value>no</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_not_in" source="condition">
-            <param>yes</param>
-            <param>maybe</param>
-            <target type="variable">test_variable</target>
-            <target type="filelist">afilllist</target>
-        </condition>
-        <condition name="disabled_if_in" source="condition2">
-            <param>yes</param>
-            <param>maybe</param>
-            <target type="variable">test_variable</target>
-            <target type="filelist">afilllist</target>
-        </condition>
-    </constraints>
+  <services>
+    <service name="test">
+      <file filelist="afilllist">/tmp/file1</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>no</value>
+      </variable>
+      <variable name="condition2" type="string" description="No change">
+        <value>no</value>
+      </variable>
+      <variable name="test_variable" type="string" description="No change" hidden="True">
+        <value>no</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_not_in" source="condition">
+      <param>yes</param>
+      <param>maybe</param>
+      <target type="variable">test_variable</target>
+      <target type="filelist">afilllist</target>
+    </condition>
+    <condition name="disabled_if_in" source="condition2">
+      <param>yes</param>
+      <param>maybe</param>
+      <target type="variable">test_variable</target>
+      <target type="filelist">afilllist</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param4/00-base.xml b/tests/dictionaries/10load_disabled_if_in_multi_param4/00-base.xml
index 13d996be5..efd763d3b 100644
--- a/tests/dictionaries/10load_disabled_if_in_multi_param4/00-base.xml
+++ b/tests/dictionaries/10load_disabled_if_in_multi_param4/00-base.xml
@@ -1,38 +1,35 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <services>
-        <service name="test">
-            <file filelist="afilllist">/tmp/file1</file>
-        </service>
-    </services>
-    <variables>
-        <family name="general">
-            <variable name="condition" type="string" description="No change">
-                <value>yes</value>
-            </variable>
-            <variable name="condition2" type="string" description="No change">
-                <value>no</value>
-            </variable>
-            <variable name="test_variable" type="string" description="No change" hidden="True">
-                <value>no</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_not_in" source="condition">
-            <param>yes</param>
-            <param>maybe</param>
-            <target type="variable">test_variable</target>
-            <target type="filelist">afilllist</target>
-        </condition>
-        <condition name="disabled_if_in" source="condition2">
-            <param>yes</param>
-            <param>maybe</param>
-            <target type="variable">test_variable</target>
-            <target type="filelist">afilllist</target>
-        </condition>
-    </constraints>
+  <services>
+    <service name="test">
+      <file filelist="afilllist">/tmp/file1</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>yes</value>
+      </variable>
+      <variable name="condition2" type="string" description="No change">
+        <value>no</value>
+      </variable>
+      <variable name="test_variable" type="string" description="No change" hidden="True">
+        <value>no</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_not_in" source="condition">
+      <param>yes</param>
+      <param>maybe</param>
+      <target type="variable">test_variable</target>
+      <target type="filelist">afilllist</target>
+    </condition>
+    <condition name="disabled_if_in" source="condition2">
+      <param>yes</param>
+      <param>maybe</param>
+      <target type="variable">test_variable</target>
+      <target type="filelist">afilllist</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param5/00-base.xml b/tests/dictionaries/10load_disabled_if_in_multi_param5/00-base.xml
index e84d34d99..927f5011a 100644
--- a/tests/dictionaries/10load_disabled_if_in_multi_param5/00-base.xml
+++ b/tests/dictionaries/10load_disabled_if_in_multi_param5/00-base.xml
@@ -1,38 +1,35 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <services>
-        <service name="test">
-            <file filelist="afilllist">/tmp/file1</file>
-        </service>
-    </services>
-    <variables>
-        <family name="general">
-            <variable name="condition" type="string" description="No change">
-                <value>yes</value>
-            </variable>
-            <variable name="condition2" type="string" description="No change">
-                <value>yes</value>
-            </variable>
-            <variable name="test_variable" type="string" description="No change" hidden="True">
-                <value>no</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_not_in" source="condition">
-            <param>yes</param>
-            <param>maybe</param>
-            <target type="variable">test_variable</target>
-            <target type="filelist">afilllist</target>
-        </condition>
-        <condition name="disabled_if_in" source="condition2">
-            <param>yes</param>
-            <param>maybe</param>
-            <target type="variable">test_variable</target>
-            <target type="filelist">afilllist</target>
-        </condition>
-    </constraints>
+  <services>
+    <service name="test">
+      <file filelist="afilllist">/tmp/file1</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>yes</value>
+      </variable>
+      <variable name="condition2" type="string" description="No change">
+        <value>yes</value>
+      </variable>
+      <variable name="test_variable" type="string" description="No change" hidden="True">
+        <value>no</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_not_in" source="condition">
+      <param>yes</param>
+      <param>maybe</param>
+      <target type="variable">test_variable</target>
+      <target type="filelist">afilllist</target>
+    </condition>
+    <condition name="disabled_if_in" source="condition2">
+      <param>yes</param>
+      <param>maybe</param>
+      <target type="variable">test_variable</target>
+      <target type="filelist">afilllist</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param6/00-base.xml b/tests/dictionaries/10load_disabled_if_in_multi_param6/00-base.xml
index ccd8dc9d5..260193cd2 100644
--- a/tests/dictionaries/10load_disabled_if_in_multi_param6/00-base.xml
+++ b/tests/dictionaries/10load_disabled_if_in_multi_param6/00-base.xml
@@ -1,38 +1,35 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <services>
-        <service name="test">
-            <file filelist="afilllist">/tmp/file1</file>
-        </service>
-    </services>
-    <variables>
-        <family name="general">
-            <variable name="condition" type="string" description="No change">
-                <value>no</value>
-            </variable>
-            <variable name="condition2" type="string" description="No change">
-                <value>yes</value>
-            </variable>
-            <variable name="test_variable" type="string" description="No change" hidden="True">
-                <value>no</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_not_in" source="condition">
-            <param>yes</param>
-            <param>maybe</param>
-            <target type="variable">test_variable</target>
-            <target type="filelist">afilllist</target>
-        </condition>
-        <condition name="disabled_if_in" source="condition2">
-            <param>yes</param>
-            <param>maybe</param>
-            <target type="variable">test_variable</target>
-            <target type="filelist">afilllist</target>
-        </condition>
-    </constraints>
+  <services>
+    <service name="test">
+      <file filelist="afilllist">/tmp/file1</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>no</value>
+      </variable>
+      <variable name="condition2" type="string" description="No change">
+        <value>yes</value>
+      </variable>
+      <variable name="test_variable" type="string" description="No change" hidden="True">
+        <value>no</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_not_in" source="condition">
+      <param>yes</param>
+      <param>maybe</param>
+      <target type="variable">test_variable</target>
+      <target type="filelist">afilllist</target>
+    </condition>
+    <condition name="disabled_if_in" source="condition2">
+      <param>yes</param>
+      <param>maybe</param>
+      <target type="variable">test_variable</target>
+      <target type="filelist">afilllist</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param_disabled/00-base.xml b/tests/dictionaries/10load_disabled_if_in_multi_param_disabled/00-base.xml
index 66ba77d28..08b06a1ac 100644
--- a/tests/dictionaries/10load_disabled_if_in_multi_param_disabled/00-base.xml
+++ b/tests/dictionaries/10load_disabled_if_in_multi_param_disabled/00-base.xml
@@ -1,33 +1,30 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <services>
-        <service name="test">
-            <file filelist="afilllist">/tmp/file1</file>
-        </service>
-    </services>
-    <variables>
-        <family name="general">
-            <variable name="condition" type="string" description="No change">
-                <value>oui</value>
-            </variable>
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_in" source="condition">
-            <param>oui</param>
-            <param>maybe</param>
-            <target type="variable">mode_conteneur_actif</target>
-            <target type="variable">mode_conteneur_actif2</target>
-            <target type="filelist">afilllist</target>
-        </condition>
-    </constraints>
+  <services>
+    <service name="test">
+      <file filelist="afilllist">/tmp/file1</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>oui</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>oui</param>
+      <param>maybe</param>
+      <target type="variable">mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+      <target type="filelist">afilllist</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10load_disabled_if_in_none/00-base.xml b/tests/dictionaries/10load_disabled_if_in_none/00-base.xml
index f173c8544..800f3a579 100644
--- a/tests/dictionaries/10load_disabled_if_in_none/00-base.xml
+++ b/tests/dictionaries/10load_disabled_if_in_none/00-base.xml
@@ -1,26 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="condition" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_in" source="condition">
-            <param type="nil"/>
-            <target type="variable">mode_conteneur_actif</target>
-            <target type="variable">mode_conteneur_actif2</target>
-        </condition>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param type="nil"/>
+      <target type="variable">mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10load_disabled_if_in_twice/00-base.xml b/tests/dictionaries/10load_disabled_if_in_twice/00-base.xml
index 1eb5e7069..62b61a966 100644
--- a/tests/dictionaries/10load_disabled_if_in_twice/00-base.xml
+++ b/tests/dictionaries/10load_disabled_if_in_twice/00-base.xml
@@ -1,27 +1,24 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <variable name="my_var1">
-            <value>no</value>
-        </variable>
-        <variable name="my_var2">
-            <value>no</value>
-        </variable>
-        <variable name="my_var3">
-            <value>no</value>
-        </variable>
-    </variables>
-
-    <constraints>
-      <condition name="disabled_if_in" source="my_var1">
-          <param>no</param>
-          <target type="variable">my_var2</target>
-      </condition>
-      <condition name="disabled_if_in" source="my_var2">
-          <param>no</param>
-          <target type="variable">my_var3</target>
-      </condition>
-    </constraints>
+  <variables>
+    <variable name="my_var1">
+      <value>no</value>
+    </variable>
+    <variable name="my_var2">
+      <value>no</value>
+    </variable>
+    <variable name="my_var3">
+      <value>no</value>
+    </variable>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="my_var1">
+      <param>no</param>
+      <target type="variable">my_var2</target>
+    </condition>
+    <condition name="disabled_if_in" source="my_var2">
+      <param>no</param>
+      <target type="variable">my_var3</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10load_disabled_if_in_variable/00-base.xml b/tests/dictionaries/10load_disabled_if_in_variable/00-base.xml
index 91654996f..72bcbb58b 100644
--- a/tests/dictionaries/10load_disabled_if_in_variable/00-base.xml
+++ b/tests/dictionaries/10load_disabled_if_in_variable/00-base.xml
@@ -1,34 +1,28 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-
-    <variables>
-        <family name='general'>
-            <variable name='condition' type='string' description="No change">
-                <value>tous</value>
-            </variable>
-            <variable name='mode_conteneur_actif' type='string' description="No change">
-                <value>tous</value>
-            </variable>
-            <variable name='mode_conteneur_actif2' type='string' description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_enum">
-            <param>tous</param>
-            <param>authentifié</param>
-            <param>aucun</param>
-            <target>condition</target>
-        </check>
-        <condition name='disabled_if_in' source='condition'>
-            <param type="variable">mode_conteneur_actif</param>
-            <target type='variable'>mode_conteneur_actif2</target>
-        </condition>
-    </constraints>
-
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>tous</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>tous</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>tous</param>
+      <param>authentifié</param>
+      <param>aucun</param>
+      <target>condition</target>
+    </check>
+    <condition name="disabled_if_in" source="condition">
+      <param type="variable">mode_conteneur_actif</param>
+      <target type="variable">mode_conteneur_actif2</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10load_disabled_if_in_variable2/00-base.xml b/tests/dictionaries/10load_disabled_if_in_variable2/00-base.xml
index 6c6468abd..8ffd2b0f4 100644
--- a/tests/dictionaries/10load_disabled_if_in_variable2/00-base.xml
+++ b/tests/dictionaries/10load_disabled_if_in_variable2/00-base.xml
@@ -1,34 +1,28 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-
-    <variables>
-        <family name='general'>
-            <variable name='condition' type='string' description="No change">
-                <value>tous</value>
-            </variable>
-            <variable name='mode_conteneur_actif' type='string' description="No change">
-                <value>aucun</value>
-            </variable>
-            <variable name='mode_conteneur_actif2' type='string' description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_enum">
-            <param>tous</param>
-            <param>authentifié</param>
-            <param>aucun</param>
-            <target>condition</target>
-        </check>
-        <condition name='disabled_if_in' source='condition'>
-            <param type="variable">mode_conteneur_actif</param>
-            <target type='variable'>mode_conteneur_actif2</target>
-        </condition>
-    </constraints>
-
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>tous</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>aucun</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>tous</param>
+      <param>authentifié</param>
+      <param>aucun</param>
+      <target>condition</target>
+    </check>
+    <condition name="disabled_if_in" source="condition">
+      <param type="variable">mode_conteneur_actif</param>
+      <target type="variable">mode_conteneur_actif2</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10load_disabled_if_not_in_fallback/00-base.xml b/tests/dictionaries/10load_disabled_if_not_in_fallback/00-base.xml
index 481a47381..71ba8102a 100644
--- a/tests/dictionaries/10load_disabled_if_not_in_fallback/00-base.xml
+++ b/tests/dictionaries/10load_disabled_if_not_in_fallback/00-base.xml
@@ -1,27 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <services>
-        <service name="test">
-            <file filelist="afilllist">/tmp/file1</file>
-        </service>
-    </services>
-    <variables>
-        <family name="general">
-            <variable name="condition" type="string" description="No change">
-                <value>no</value>
-            </variable>
-            <variable name="disable_variable" type="string" description="No change">
-                <value>no</value>
-            </variable>
-        </family>
-    </variables>
-    <constraints>
-        <condition name="disabled_if_not_in" source="unknown" optional="True">
-            <param>no</param>
-            <target type="variable">disable_variable</target>
-            <target type="filelist">afilllist</target>
-        </condition>
-    </constraints>
+  <services>
+    <service name="test">
+      <file filelist="afilllist">/tmp/file1</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>no</value>
+      </variable>
+      <variable name="disable_variable" type="string" description="No change">
+        <value>no</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_not_in" source="unknown" optional="True">
+      <param>no</param>
+      <target type="variable">disable_variable</target>
+      <target type="filelist">afilllist</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10load_disabled_if_not_in_fallback_force/00-base.xml b/tests/dictionaries/10load_disabled_if_not_in_fallback_force/00-base.xml
index ea27633e9..9946d5791 100644
--- a/tests/dictionaries/10load_disabled_if_not_in_fallback_force/00-base.xml
+++ b/tests/dictionaries/10load_disabled_if_not_in_fallback_force/00-base.xml
@@ -1,31 +1,28 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="condition" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_not_in" source="unknown" apply_on_fallback="True" optional="True">
-            <param>oui</param>
-            <target type="variable">mode_conteneur_actif</target>
-            <target type="variable">mode_conteneur_actif2</target>
-            <target type="filelist">afilllist</target>
-        </condition>
-        <condition name="disabled_if_not_in" source="activer_client_ldap" optional="True">
-            <param>non</param>
-            <target type="variable">mode_conteneur_actif</target>
-        </condition>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_not_in" source="unknown" apply_on_fallback="True" optional="True">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+      <target type="filelist">afilllist</target>
+    </condition>
+    <condition name="disabled_if_not_in" source="activer_client_ldap" optional="True">
+      <param>non</param>
+      <target type="variable">mode_conteneur_actif</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10load_disabledifin_fallback/00-base.xml b/tests/dictionaries/10load_disabledifin_fallback/00-base.xml
index 2c0b1d3e2..8a0518386 100644
--- a/tests/dictionaries/10load_disabledifin_fallback/00-base.xml
+++ b/tests/dictionaries/10load_disabledifin_fallback/00-base.xml
@@ -1,30 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="condition" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_in" source="condition">
-            <param>oui</param>
-            <target type="variable">mode_conteneur_actif</target>
-            <target type="variable">mode_conteneur_actif2</target>
-        </condition>
-        <condition name="disabled_if_in" source="activer_client_ldap" optional="True">
-            <param>non</param>
-            <target type="variable">mode_conteneur_actif</target>
-        </condition>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+    </condition>
+    <condition name="disabled_if_in" source="activer_client_ldap" optional="True">
+      <param>non</param>
+      <target type="variable">mode_conteneur_actif</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10load_disabledifin_fallback_force/00-base.xml b/tests/dictionaries/10load_disabledifin_fallback_force/00-base.xml
index 9cf6a79f0..16602a40b 100644
--- a/tests/dictionaries/10load_disabledifin_fallback_force/00-base.xml
+++ b/tests/dictionaries/10load_disabledifin_fallback_force/00-base.xml
@@ -1,30 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="condition" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_in" source="condition">
-            <param>oui</param>
-            <target type="variable">mode_conteneur_actif</target>
-            <target type="variable">mode_conteneur_actif2</target>
-        </condition>
-        <condition name="disabled_if_in" source="activer_client_ldap" optional="True" apply_on_fallback="False">
-            <param>non</param>
-            <target type="variable">mode_conteneur_actif</target>
-        </condition>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+    </condition>
+    <condition name="disabled_if_in" source="activer_client_ldap" optional="True" apply_on_fallback="False">
+      <param>non</param>
+      <target type="variable">mode_conteneur_actif</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10load_disabledifin_whithouttype/00-base.xml b/tests/dictionaries/10load_disabledifin_whithouttype/00-base.xml
index a2c402823..c94d39491 100644
--- a/tests/dictionaries/10load_disabledifin_whithouttype/00-base.xml
+++ b/tests/dictionaries/10load_disabledifin_whithouttype/00-base.xml
@@ -1,26 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="condition" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_in" source="condition">
-            <param>oui</param>
-            <target>mode_conteneur_actif</target>
-            <target type="variable">mode_conteneur_actif2</target>
-        </condition>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>oui</param>
+      <target>mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10load_emptyvalue/00-base.xml b/tests/dictionaries/10load_emptyvalue/00-base.xml
index 121dd396b..8e7d9ed6d 100644
--- a/tests/dictionaries/10load_emptyvalue/00-base.xml
+++ b/tests/dictionaries/10load_emptyvalue/00-base.xml
@@ -1,15 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value></value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="string" description="No change">
-                <value/>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value/>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value/>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10load_frozenifin/00-base.xml b/tests/dictionaries/10load_frozenifin/00-base.xml
index 5d9bde1ae..7e7959f64 100644
--- a/tests/dictionaries/10load_frozenifin/00-base.xml
+++ b/tests/dictionaries/10load_frozenifin/00-base.xml
@@ -1,26 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="condition" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="hidden_if_in" source="condition">
-            <param>oui</param>
-            <target type="variable">mode_conteneur_actif</target>
-            <target type="variable">mode_conteneur_actif2</target>
-        </condition>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="hidden_if_in" source="condition">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10load_frozenifin_auto/00-base.xml b/tests/dictionaries/10load_frozenifin_auto/00-base.xml
index 8b18838a2..1d11682ab 100644
--- a/tests/dictionaries/10load_frozenifin_auto/00-base.xml
+++ b/tests/dictionaries/10load_frozenifin_auto/00-base.xml
@@ -1,30 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="condition" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="hidden_if_in" source="condition">
-            <param>oui</param>
-            <target type="variable">mode_conteneur_actif</target>
-            <target type="variable">mode_conteneur_actif2</target>
-        </condition>
-        <fill name="calc_val">
-            <param>non</param>
-            <target>mode_conteneur_actif</target>
-        </fill>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="hidden_if_in" source="condition">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+    </condition>
+    <fill name="calc_val">
+      <param>non</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10load_frozenifin_multiparam/00-base.xml b/tests/dictionaries/10load_frozenifin_multiparam/00-base.xml
index e41ba0a4a..8a2d5d837 100644
--- a/tests/dictionaries/10load_frozenifin_multiparam/00-base.xml
+++ b/tests/dictionaries/10load_frozenifin_multiparam/00-base.xml
@@ -1,33 +1,30 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="condition" type="string" description="No change">
-                <value>tous</value>
-            </variable>
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_enum">
-            <param>tous</param>
-            <param>authentifié</param>
-            <param>aucun</param>
-            <target>condition</target>
-        </check>
-        <condition name="hidden_if_in" source="condition">
-            <param>tous</param>
-            <param>authentifié</param>
-            <target type="variable">mode_conteneur_actif</target>
-            <target type="variable">mode_conteneur_actif2</target>
-        </condition>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>tous</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>tous</param>
+      <param>authentifié</param>
+      <param>aucun</param>
+      <target>condition</target>
+    </check>
+    <condition name="hidden_if_in" source="condition">
+      <param>tous</param>
+      <param>authentifié</param>
+      <target type="variable">mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10load_frozenifin_noexist/00-base.xml b/tests/dictionaries/10load_frozenifin_noexist/00-base.xml
index 28f164101..83cac4d60 100644
--- a/tests/dictionaries/10load_frozenifin_noexist/00-base.xml
+++ b/tests/dictionaries/10load_frozenifin_noexist/00-base.xml
@@ -1,36 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-
-    <variables>
-        <family name='general'>
-            <variable name='condition' type='string' description="No change">
-                <value>tous</value>
-            </variable>
-            <variable name='mode_conteneur_actif' type='string' description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name='mode_conteneur_actif2' type='string' description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_enum">
-            <param>tous</param>
-            <param>authentifié</param>
-            <param>aucun</param>
-            <target>condition</target>
-        </check>
-        <condition name='hidden_if_in' source='condition'>
-            <param>oui</param>
-            <param>non</param>
-            <target type='variable'>mode_conteneur_actif</target>
-            <target type='variable'>mode_conteneur_actif2</target>
-        </condition>
-    </constraints>
-
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>tous</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>tous</param>
+      <param>authentifié</param>
+      <param>aucun</param>
+      <target>condition</target>
+    </check>
+    <condition name="hidden_if_in" source="condition">
+      <param>oui</param>
+      <param>non</param>
+      <target type="variable">mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10load_frozenifin_variable/00-base.xml b/tests/dictionaries/10load_frozenifin_variable/00-base.xml
index fd053cf33..907f6450a 100644
--- a/tests/dictionaries/10load_frozenifin_variable/00-base.xml
+++ b/tests/dictionaries/10load_frozenifin_variable/00-base.xml
@@ -1,34 +1,28 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-
-    <variables>
-        <family name='general'>
-            <variable name='condition' type='string' description="No change">
-                <value>tous</value>
-            </variable>
-            <variable name='mode_conteneur_actif' type='string' description="No change">
-                <value>tous</value>
-            </variable>
-            <variable name='mode_conteneur_actif2' type='string' description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_enum">
-            <param>tous</param>
-            <param>authentifié</param>
-            <param>aucun</param>
-            <target>condition</target>
-        </check>
-        <condition name='hidden_if_in' source='condition'>
-            <param type="variable">mode_conteneur_actif</param>
-            <target type='variable'>mode_conteneur_actif2</target>
-        </condition>
-    </constraints>
-
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>tous</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>tous</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>tous</param>
+      <param>authentifié</param>
+      <param>aucun</param>
+      <target>condition</target>
+    </check>
+    <condition name="hidden_if_in" source="condition">
+      <param type="variable">mode_conteneur_actif</param>
+      <target type="variable">mode_conteneur_actif2</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10load_frozenifnotin/00-base.xml b/tests/dictionaries/10load_frozenifnotin/00-base.xml
index 1758e16b3..cbd3f7f22 100644
--- a/tests/dictionaries/10load_frozenifnotin/00-base.xml
+++ b/tests/dictionaries/10load_frozenifnotin/00-base.xml
@@ -1,26 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="condition" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="hidden_if_not_in" source="condition">
-            <param>oui</param>
-            <target type="variable">mode_conteneur_actif</target>
-            <target type="variable">mode_conteneur_actif2</target>
-        </condition>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="hidden_if_not_in" source="condition">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10load_frozenifnotin_noexist/00-base.xml b/tests/dictionaries/10load_frozenifnotin_noexist/00-base.xml
index 8fa441159..931722a45 100644
--- a/tests/dictionaries/10load_frozenifnotin_noexist/00-base.xml
+++ b/tests/dictionaries/10load_frozenifnotin_noexist/00-base.xml
@@ -1,36 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-
-    <variables>
-        <family name='general'>
-            <variable name='condition' type='string' description="No change">
-                <value>tous</value>
-            </variable>
-            <variable name='mode_conteneur_actif' type='string' description="No change">
-                <value>non</value>
-            </variable>
-            <variable name='mode_conteneur_actif2' type='string' description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_enum">
-            <param>tous</param>
-            <param>authentifié</param>
-            <param>aucun</param>
-            <target>condition</target>
-        </check>
-        <condition name='hidden_if_not_in' source='condition'>
-            <param>oui</param>
-            <param>non</param>
-            <target type='variable'>mode_conteneur_actif</target>
-            <target type='variable'>mode_conteneur_actif2</target>
-        </condition>
-    </constraints>
-
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>tous</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>tous</param>
+      <param>authentifié</param>
+      <param>aucun</param>
+      <target>condition</target>
+    </check>
+    <condition name="hidden_if_not_in" source="condition">
+      <param>oui</param>
+      <param>non</param>
+      <target type="variable">mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10load_hidden_if_empty_family/00-base.xml b/tests/dictionaries/10load_hidden_if_empty_family/00-base.xml
index 77f84247b..d1cdaf066 100644
--- a/tests/dictionaries/10load_hidden_if_empty_family/00-base.xml
+++ b/tests/dictionaries/10load_hidden_if_empty_family/00-base.xml
@@ -1,29 +1,26 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general" description="Général">
-            <variable name="condition" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif" type="string" description="No change" >
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="string" description="No change">
-                <value>non</value>
-            </variable>
+  <variables>
+    <family name="general" description="Général">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="general2" description="Général2">
         </family>
-        <family name="general2" description="Général2">
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="hidden_if_in" source="condition">
-            <param>oui</param>
-            <target type="variable">mode_conteneur_actif</target>
-            <target type="variable">mode_conteneur_actif2</target>
-            <target type="family">general2</target>
-        </condition>
-    </constraints>
+  </variables>
+  <constraints>
+    <condition name="hidden_if_in" source="condition">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+      <target type="family">general2</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10load_hidden_if_family/00-base.xml b/tests/dictionaries/10load_hidden_if_family/00-base.xml
index 85ea05f15..8442dc855 100644
--- a/tests/dictionaries/10load_hidden_if_family/00-base.xml
+++ b/tests/dictionaries/10load_hidden_if_family/00-base.xml
@@ -1,32 +1,29 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general" description="Général">
-            <variable name="condition" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif" type="string" description="No change" >
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="general2" description="Général2">
-            <variable name="mode_conteneur_actif3" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="hidden_if_in" source="condition">
-            <param>oui</param>
-            <target type="variable">mode_conteneur_actif</target>
-            <target type="variable">mode_conteneur_actif2</target>
-            <target type="family">general2</target>
-        </condition>
-    </constraints>
+  <variables>
+    <family name="general" description="Général">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="general2" description="Général2">
+      <variable name="mode_conteneur_actif3" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="hidden_if_in" source="condition">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+      <target type="family">general2</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10load_leadership/00-base.xml b/tests/dictionaries/10load_leadership/00-base.xml
index a1c29b993..2b7726a56 100644
--- a/tests/dictionaries/10load_leadership/00-base.xml
+++ b/tests/dictionaries/10load_leadership/00-base.xml
@@ -1,30 +1,29 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="general1">
-            <variable name="leader" type="string" description="leader" multi="True"/>
-            <variable name="follower1" type="string" description="follower1"/>
-            <variable name="follower2" type="string" description="follower2"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param name="valeur">valfill</param>
-	    <target>follower1</target>
-        </fill>
-        <fill name="calc_val">
-            <param type="variable">follower1</param>
-	    <target>follower2</target>
-        </fill>
-        <group leader="leader">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="general1">
+      <variable name="leader" type="string" description="leader" multi="True"/>
+      <variable name="follower1" type="string" description="follower1"/>
+      <variable name="follower2" type="string" description="follower2"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valfill</param>
+      <target>follower1</target>
+    </fill>
+    <fill name="calc_val">
+      <param type="variable">follower1</param>
+      <target>follower2</target>
+    </fill>
+    <group leader="leader">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+    </group>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/10load_leadership_default_multi/00-base.xml b/tests/dictionaries/10load_leadership_default_multi/00-base.xml
index de492d17e..f84037546 100644
--- a/tests/dictionaries/10load_leadership_default_multi/00-base.xml
+++ b/tests/dictionaries/10load_leadership_default_multi/00-base.xml
@@ -1,22 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="leader" multi="True">
-                <value>non</value>
-            </variable>
-            <variable name="leader" type="string" description="leader" multi="True"/>
-            <variable name="follower1" type="string" description="follower1">
-                <value>value</value>
-            </variable>
-            <variable name="follower2" type="string" description="follower2"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <group leader="leader">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="leader" multi="True">
+        <value>non</value>
+      </variable>
+      <variable name="leader" type="string" description="leader" multi="True"/>
+      <variable name="follower1" type="string" description="follower1">
+        <value>value</value>
+      </variable>
+      <variable name="follower2" type="string" description="follower2"/>
+    </family>
+  </variables>
+  <constraints>
+    <group leader="leader">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+    </group>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/10load_leadership_default_submulti/00-base.xml b/tests/dictionaries/10load_leadership_default_submulti/00-base.xml
index 81d841822..13ff6f102 100644
--- a/tests/dictionaries/10load_leadership_default_submulti/00-base.xml
+++ b/tests/dictionaries/10load_leadership_default_submulti/00-base.xml
@@ -1,27 +1,26 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="leader" multi="True">
-                <value>non</value>
-            </variable>
-            <variable name="leader" type="string" description="leader" multi="True">
-                <value>leader</value>
-            </variable>
-            <variable name="follower1" type="string" description="follower1" multi="True">
-               <value>value</value>
-            </variable>
-            <variable name="follower2" type="string" description="follower2" multi="True">
-               <value>value1</value>
-               <value>value2</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <group leader="leader">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="leader" multi="True">
+        <value>non</value>
+      </variable>
+      <variable name="leader" type="string" description="leader" multi="True">
+        <value>leader</value>
+      </variable>
+      <variable name="follower1" type="string" description="follower1" multi="True">
+        <value>value</value>
+      </variable>
+      <variable name="follower2" type="string" description="follower2" multi="True">
+        <value>value1</value>
+        <value>value2</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <group leader="leader">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+    </group>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/10load_leadership_defaultmulti_leader/00-base.xml b/tests/dictionaries/10load_leadership_defaultmulti_leader/00-base.xml
index e2fb8c4ff..921e2ad62 100644
--- a/tests/dictionaries/10load_leadership_defaultmulti_leader/00-base.xml
+++ b/tests/dictionaries/10load_leadership_defaultmulti_leader/00-base.xml
@@ -1,22 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-          <variable name="mode_conteneur_actif" type="string" description="leader" multi="True">
-            <value>non</value>
-          </variable>
-          <variable name="leader" type="string" description="leader" multi="True">
-           <value>value</value>
-          </variable>
-          <variable name="follower1" type="string" description="follower1"/>
-          <variable name="follower2" type="string" description="follower2"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <group leader="leader">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="leader" multi="True">
+        <value>non</value>
+      </variable>
+      <variable name="leader" type="string" description="leader" multi="True">
+        <value>value</value>
+      </variable>
+      <variable name="follower1" type="string" description="follower1"/>
+      <variable name="follower2" type="string" description="follower2"/>
+    </family>
+  </variables>
+  <constraints>
+    <group leader="leader">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+    </group>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/10load_leadership_description/00-base.xml b/tests/dictionaries/10load_leadership_description/00-base.xml
index f27ad339f..87b476171 100644
--- a/tests/dictionaries/10load_leadership_description/00-base.xml
+++ b/tests/dictionaries/10load_leadership_description/00-base.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name='general'>
-            <variable name='mode_conteneur_actif' type='string' description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name='general1'>
-            <variable name='leader' type='string' description="leader" multi="True"/>
-            <variable name='follower1' type='string' description="follower1"/>
-            <variable name='follower2' type='string' description="follower2"/>
-        </family>
-    </variables>
-    <constraints>
-        <fill name='calc_val'>
-            <param name='valeur'>valfill</param>
- 	    <target>follower1</target>
-        </fill>
-        <fill name='calc_val'>
-            <param type='variable'>follower1</param>
- 	    <target>follower2</target>
-        </fill>
-        <group leader='leader' description="other description">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="general1">
+      <variable name="leader" type="string" description="leader" multi="True"/>
+      <variable name="follower1" type="string" description="follower1"/>
+      <variable name="follower2" type="string" description="follower2"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valfill</param>
+      <target>follower1</target>
+    </fill>
+    <fill name="calc_val">
+      <param type="variable">follower1</param>
+      <target>follower2</target>
+    </fill>
+    <group leader="leader" description="other description">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+    </group>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/10load_leadership_name/00-base.xml b/tests/dictionaries/10load_leadership_name/00-base.xml
index 9d75b1783..2af2d0d45 100644
--- a/tests/dictionaries/10load_leadership_name/00-base.xml
+++ b/tests/dictionaries/10load_leadership_name/00-base.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name='general'>
-            <variable name='mode_conteneur_actif' type='string' description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name='general1'>
-            <variable name='leader' type='string' description="leader" multi="True"/>
-            <variable name='follower1' type='string' description="follower1"/>
-            <variable name='follower2' type='string' description="follower2"/>
-        </family>
-    </variables>
-    <constraints>
-        <fill name='calc_val'>
-            <param name='valeur'>valfill</param>
- 	    <target>follower1</target>
-        </fill>
-        <fill name='calc_val'>
-            <param type='variable'>follower1</param>
- 	    <target>follower2</target>
-        </fill>
-        <group leader='leader' name="other_name">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="general1">
+      <variable name="leader" type="string" description="leader" multi="True"/>
+      <variable name="follower1" type="string" description="follower1"/>
+      <variable name="follower2" type="string" description="follower2"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valfill</param>
+      <target>follower1</target>
+    </fill>
+    <fill name="calc_val">
+      <param type="variable">follower1</param>
+      <target>follower2</target>
+    </fill>
+    <group leader="leader" name="other_name">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+    </group>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/10load_leadership_submulti/00-base.xml b/tests/dictionaries/10load_leadership_submulti/00-base.xml
index 35dca2411..caa3dbeec 100644
--- a/tests/dictionaries/10load_leadership_submulti/00-base.xml
+++ b/tests/dictionaries/10load_leadership_submulti/00-base.xml
@@ -1,30 +1,29 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="general1">
-            <variable name="leader" type="string" description="leader" multi="True"/>
-            <variable name="follower1" type="string" description="follower1"/>
-            <variable name="follower2" type="string" description="follower2" multi="True"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param name="valeur">valfill</param>
- 	    <target>follower1</target>
-        </fill>
-        <fill name="calc_val">
-            <param type="variable">follower1</param>
- 	    <target>follower2</target>
-        </fill>
-        <group leader="leader">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="general1">
+      <variable name="leader" type="string" description="leader" multi="True"/>
+      <variable name="follower1" type="string" description="follower1"/>
+      <variable name="follower2" type="string" description="follower2" multi="True"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valfill</param>
+      <target>follower1</target>
+    </fill>
+    <fill name="calc_val">
+      <param type="variable">follower1</param>
+      <target>follower2</target>
+    </fill>
+    <group leader="leader">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+    </group>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/10load_mandatoryifin/00-base.xml b/tests/dictionaries/10load_mandatoryifin/00-base.xml
index 1ba37c14b..810f14f77 100644
--- a/tests/dictionaries/10load_mandatoryifin/00-base.xml
+++ b/tests/dictionaries/10load_mandatoryifin/00-base.xml
@@ -1,26 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="condition" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="mandatory_if_in" source="condition">
-            <param>oui</param>
-            <target type="variable">mode_conteneur_actif</target>
-            <target type="variable">mode_conteneur_actif2</target>
-        </condition>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="mandatory_if_in" source="condition">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10load_mandatoryifnotin_noexist/00-base.xml b/tests/dictionaries/10load_mandatoryifnotin_noexist/00-base.xml
index 36588ca95..c1bc13ee1 100644
--- a/tests/dictionaries/10load_mandatoryifnotin_noexist/00-base.xml
+++ b/tests/dictionaries/10load_mandatoryifnotin_noexist/00-base.xml
@@ -1,36 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-
-    <variables>
-        <family name='general'>
-            <variable name='condition' type='string' description="No change">
-                <value>tous</value>
-            </variable>
-            <variable name='mode_conteneur_actif' type='string' description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name='mode_conteneur_actif2' type='string' description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_enum">
-            <param>tous</param>
-            <param>authentifié</param>
-            <param>aucun</param>
-            <target>condition</target>
-        </check>
-        <condition name='mandatory_if_not_in' source='condition'>
-            <param>oui</param>
-            <param>non</param>
-            <target type='variable'>mode_conteneur_actif</target>
-            <target type='variable'>mode_conteneur_actif2</target>
-        </condition>
-    </constraints>
-
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>tous</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>tous</param>
+      <param>authentifié</param>
+      <param>aucun</param>
+      <target>condition</target>
+    </check>
+    <condition name="mandatory_if_not_in" source="condition">
+      <param>oui</param>
+      <param>non</param>
+      <target type="variable">mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10load_multivalue/00-base.xml b/tests/dictionaries/10load_multivalue/00-base.xml
index 938a8ac93..298d92927 100644
--- a/tests/dictionaries/10load_multivalue/00-base.xml
+++ b/tests/dictionaries/10load_multivalue/00-base.xml
@@ -1,13 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True" multi="True">
-                <value>non</value>
-                <value>oui</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True" multi="True">
+        <value>non</value>
+        <value>oui</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10valid_enum_accent/00-base.xml b/tests/dictionaries/10valid_enum_accent/00-base.xml
index f9982b365..1731282d2 100644
--- a/tests/dictionaries/10valid_enum_accent/00-base.xml
+++ b/tests/dictionaries/10valid_enum_accent/00-base.xml
@@ -1,27 +1,24 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general" mode="expert">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="enumfam" mode="expert">
-            <variable name="enumvar" type="string" description="multi" help="bla bla bla">
-                <value>c</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_enum">
-            <param>a</param>
-            <param>b</param>
-            <param>c</param>
-            <param>é</param>
-            <target>enumvar</target>
-        </check>
-    </constraints>
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="enumfam" mode="expert">
+      <variable name="enumvar" type="string" description="multi" help="bla bla bla">
+        <value>c</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>a</param>
+      <param>b</param>
+      <param>c</param>
+      <param>é</param>
+      <target>enumvar</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10valid_enum_base/00-base.xml b/tests/dictionaries/10valid_enum_base/00-base.xml
index 307b21ce0..070b9df41 100644
--- a/tests/dictionaries/10valid_enum_base/00-base.xml
+++ b/tests/dictionaries/10valid_enum_base/00-base.xml
@@ -1,26 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general" mode="expert">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="enumfam" mode="expert">
-            <variable name="enumvar" type="string" description="multi" help="bla bla bla">
-                <value>c</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_enum">
-            <param>a</param>
-            <param>b</param>
-            <param>c</param>
-            <target>enumvar</target>
-        </check>
-    </constraints>
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="enumfam" mode="expert">
+      <variable name="enumvar" type="string" description="multi" help="bla bla bla">
+        <value>c</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>a</param>
+      <param>b</param>
+      <param>c</param>
+      <target>enumvar</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10valid_enum_base_no_mandatory/00-base.xml b/tests/dictionaries/10valid_enum_base_no_mandatory/00-base.xml
index 275d9f18f..2727a9467 100644
--- a/tests/dictionaries/10valid_enum_base_no_mandatory/00-base.xml
+++ b/tests/dictionaries/10valid_enum_base_no_mandatory/00-base.xml
@@ -1,26 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general" mode="expert">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="enumfam" mode="expert">
-            <variable name="enumvar" mandatory="False">
-                <value>c</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_enum">
-            <param>a</param>
-            <param>b</param>
-            <param>c</param>
-            <target>enumvar</target>
-        </check>
-    </constraints>
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="enumfam" mode="expert">
+      <variable name="enumvar" mandatory="False">
+        <value>c</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>a</param>
+      <param>b</param>
+      <param>c</param>
+      <target>enumvar</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10valid_enum_base_redefine/00-base.xml b/tests/dictionaries/10valid_enum_base_redefine/00-base.xml
index 45f6e4375..a38f6a0d4 100644
--- a/tests/dictionaries/10valid_enum_base_redefine/00-base.xml
+++ b/tests/dictionaries/10valid_enum_base_redefine/00-base.xml
@@ -1,35 +1,32 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general" mode="expert">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="enumfam" mode="expert">
-            <variable name="enumvar2" type="string" description="multi">
-                <value>c</value>
-            </variable>
-            <variable name="enumvar" type="string" description="multi" help="bla bla bla">
-                <value>c</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_enum">
-            <param>a</param>
-            <param>b</param>
-            <param>c</param>
-            <target>enumvar</target>
-        </check>
-        <check name="valid_enum">
-            <param>a</param>
-            <param>b</param>
-            <param>c</param>
-            <target>enumvar2</target>
-        </check>
-    </constraints>
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="enumfam" mode="expert">
+      <variable name="enumvar2" type="string" description="multi">
+        <value>c</value>
+      </variable>
+      <variable name="enumvar" type="string" description="multi" help="bla bla bla">
+        <value>c</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>a</param>
+      <param>b</param>
+      <param>c</param>
+      <target>enumvar</target>
+    </check>
+    <check name="valid_enum">
+      <param>a</param>
+      <param>b</param>
+      <param>c</param>
+      <target>enumvar2</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10valid_enum_base_redefine/01-base.xml b/tests/dictionaries/10valid_enum_base_redefine/01-base.xml
index 9d572c95e..c542d3c6f 100644
--- a/tests/dictionaries/10valid_enum_base_redefine/01-base.xml
+++ b/tests/dictionaries/10valid_enum_base_redefine/01-base.xml
@@ -1,20 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="enumfam" mode="expert">
-            <variable name="enumvar" redefine="True" remove_check="True">
-                <value>c</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_enum">
-            <param>a</param>
-            <param>c</param>
-            <target>enumvar</target>
-        </check>
-    </constraints>
+  <variables>
+    <family name="enumfam" mode="expert">
+      <variable name="enumvar" redefine="True" remove_check="True">
+        <value>c</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>a</param>
+      <param>c</param>
+      <target>enumvar</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10valid_enum_leader/00-base.xml b/tests/dictionaries/10valid_enum_leader/00-base.xml
index c90911feb..d0b5a3694 100644
--- a/tests/dictionaries/10valid_enum_leader/00-base.xml
+++ b/tests/dictionaries/10valid_enum_leader/00-base.xml
@@ -1,28 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="leader" type="string" description="leader" multi="True"/>
-            <variable name="follower1" type="string" description="follower1"/>
-            <variable name="follower2" type="string" description="follower2"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_enum">
-            <param>a</param>
-            <param>b</param>
-            <param>c</param>
-            <target>follower1</target>
-        </check>
-        <group leader="leader">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="leader" type="string" description="leader" multi="True"/>
+      <variable name="follower1" type="string" description="follower1"/>
+      <variable name="follower2" type="string" description="follower2"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>a</param>
+      <param>b</param>
+      <param>c</param>
+      <target>follower1</target>
+    </check>
+    <group leader="leader">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+    </group>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10valid_enum_mandatory/00-base.xml b/tests/dictionaries/10valid_enum_mandatory/00-base.xml
index 595c91491..89daeab9f 100644
--- a/tests/dictionaries/10valid_enum_mandatory/00-base.xml
+++ b/tests/dictionaries/10valid_enum_mandatory/00-base.xml
@@ -1,25 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <services/>
-    <variables>
-        <family name="general" mode="expert">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="enumfam" mode="expert">
-            <variable name="enumvar" type="string" description="multi" mandatory="True"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_enum">
-            <param>a</param>
-            <param>b</param>
-            <param>c</param>
-            <target>enumvar</target>
-        </check>
-    </constraints>
+  <services/>
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="enumfam" mode="expert">
+      <variable name="enumvar" type="string" description="multi" mandatory="True"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>a</param>
+      <param>b</param>
+      <param>c</param>
+      <target>enumvar</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10valid_enum_multi/00-base.xml b/tests/dictionaries/10valid_enum_multi/00-base.xml
index 8e75b7baf..d3bdd736b 100644
--- a/tests/dictionaries/10valid_enum_multi/00-base.xml
+++ b/tests/dictionaries/10valid_enum_multi/00-base.xml
@@ -1,22 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="multi" type="string" description="multi" multi="True"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_enum">
-            <param>a</param>
-            <param>b</param>
-            <param>c</param>
-            <target>multi</target>
-        </check>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="multi" type="string" description="multi" multi="True"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>a</param>
+      <param>b</param>
+      <param>c</param>
+      <target>multi</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10valid_enum_none/00-base.xml b/tests/dictionaries/10valid_enum_none/00-base.xml
index 289af7012..e8d463271 100644
--- a/tests/dictionaries/10valid_enum_none/00-base.xml
+++ b/tests/dictionaries/10valid_enum_none/00-base.xml
@@ -1,26 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general" mode="expert">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="enumfam" mode="expert">
-            <variable name="enumvar" type="string" description="multi" help="bla bla bla" mandatory="False">
-                <value>b</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_enum">
-            <param>a</param>
-            <param>b</param>
-            <param></param>
-            <target>enumvar</target>
-        </check>
-    </constraints>
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="enumfam" mode="expert">
+      <variable name="enumvar" type="string" description="multi" help="bla bla bla" mandatory="False">
+        <value>b</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>a</param>
+      <param>b</param>
+      <param/>
+      <target>enumvar</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10valid_enum_number/00-base.xml b/tests/dictionaries/10valid_enum_number/00-base.xml
index 58d54d999..fb8b66d9b 100644
--- a/tests/dictionaries/10valid_enum_number/00-base.xml
+++ b/tests/dictionaries/10valid_enum_number/00-base.xml
@@ -1,25 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general" mode="expert">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="enumfam" mode="expert">
-            <variable name="enumvar" type="number" description="enumvar" help="bla bla bla"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_enum">
-            <param>1</param>
-            <param>2</param>
-            <param>3</param>
-            <target>enumvar</target>
-        </check>
-    </constraints>
-
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="enumfam" mode="expert">
+      <variable name="enumvar" type="number" description="enumvar" help="bla bla bla"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>1</param>
+      <param>2</param>
+      <param>3</param>
+      <target>enumvar</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10valid_enum_numberdefault/00-base.xml b/tests/dictionaries/10valid_enum_numberdefault/00-base.xml
index 3975516d6..a02d91bf5 100644
--- a/tests/dictionaries/10valid_enum_numberdefault/00-base.xml
+++ b/tests/dictionaries/10valid_enum_numberdefault/00-base.xml
@@ -1,26 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general" mode="expert">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="enumfam" mode="expert">
-            <variable name="enumvar" type="number" description="enumvar" help="bla bla bla">
-                <value>3</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_enum">
-            <param>1</param>
-            <param>2</param>
-            <param>3</param>
-            <target>enumvar</target>
-        </check>
-    </constraints>
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="enumfam" mode="expert">
+      <variable name="enumvar" type="number" description="enumvar" help="bla bla bla">
+        <value>3</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>1</param>
+      <param>2</param>
+      <param>3</param>
+      <target>enumvar</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10valid_enum_param_empty/00-base.xml b/tests/dictionaries/10valid_enum_param_empty/00-base.xml
index 1e2cd8ed3..23831823a 100644
--- a/tests/dictionaries/10valid_enum_param_empty/00-base.xml
+++ b/tests/dictionaries/10valid_enum_param_empty/00-base.xml
@@ -1,22 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general" mode="expert">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="enumfam" mode="expert">
-            <variable name="enumvar" type="string" description="multi" help="bla bla bla"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_enum">
-            <param type='nil'></param>
-            <target>enumvar</target>
-        </check>
-    </constraints>
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="enumfam" mode="expert">
+      <variable name="enumvar" type="string" description="multi" help="bla bla bla"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param type="nil"/>
+      <target>enumvar</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10valid_enum_param_empty2/00-base.xml b/tests/dictionaries/10valid_enum_param_empty2/00-base.xml
index 2bfd69bf1..23831823a 100644
--- a/tests/dictionaries/10valid_enum_param_empty2/00-base.xml
+++ b/tests/dictionaries/10valid_enum_param_empty2/00-base.xml
@@ -1,22 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general" mode="expert">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="enumfam" mode="expert">
-            <variable name="enumvar" type="string" description="multi" help="bla bla bla"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_enum">
-            <param type='nil'/>
-            <target>enumvar</target>
-        </check>
-    </constraints>
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="enumfam" mode="expert">
+      <variable name="enumvar" type="string" description="multi" help="bla bla bla"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param type="nil"/>
+      <target>enumvar</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10valid_enum_quote/00-base.xml b/tests/dictionaries/10valid_enum_quote/00-base.xml
index 1614931b1..d8e1f824d 100644
--- a/tests/dictionaries/10valid_enum_quote/00-base.xml
+++ b/tests/dictionaries/10valid_enum_quote/00-base.xml
@@ -1,24 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general" mode="expert">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="enumfam" mode="expert">
-            <variable name="enumvar" type="string" description="multi" help="bla bla bla"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_enum">
-            <param>quote'</param>
-            <param>quote"</param>
-            <param>quote"'</param>
-            <target>enumvar</target>
-        </check>
-    </constraints>
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="enumfam" mode="expert">
+      <variable name="enumvar" type="string" description="multi" help="bla bla bla"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>quote'</param>
+      <param>quote"</param>
+      <param>quote"'</param>
+      <target>enumvar</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/10valid_enum_value/00-base.xml b/tests/dictionaries/10valid_enum_value/00-base.xml
index a55be036a..4ace18912 100644
--- a/tests/dictionaries/10valid_enum_value/00-base.xml
+++ b/tests/dictionaries/10valid_enum_value/00-base.xml
@@ -1,21 +1,18 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>b</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_enum">
-            <param>a</param>
-            <param>b</param>
-            <param>c</param>
-            <target>mode_conteneur_actif</target>
-        </check>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>b</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>a</param>
+      <param>b</param>
+      <param>c</param>
+      <target>mode_conteneur_actif</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/11disabled_if_in_filelist/00-base.xml b/tests/dictionaries/11disabled_if_in_filelist/00-base.xml
index 8a0fb898a..dc6be1919 100644
--- a/tests/dictionaries/11disabled_if_in_filelist/00-base.xml
+++ b/tests/dictionaries/11disabled_if_in_filelist/00-base.xml
@@ -1,32 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-
-    <services>
-        <service name="test">
-            <file filelist="afilllist">/etc/file</file>
-        </service>
-    </services>
-
-    <variables>
-        <family name="general">
-            <variable name="condition" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="boolean" description="No change"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_in" source="condition">
-            <param>oui</param>
-            <target type="variable">mode_conteneur_actif</target>
-            <target type="variable">mode_conteneur_actif2</target>
-            <target type="filelist">afilllist</target>
-        </condition>
-    </constraints>
+  <services>
+    <service name="test">
+      <file filelist="afilllist">/etc/file</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="boolean" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+      <target type="filelist">afilllist</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/11disabled_if_in_filelist_boolean/00-base.xml b/tests/dictionaries/11disabled_if_in_filelist_boolean/00-base.xml
index 1898469e4..a74e53316 100644
--- a/tests/dictionaries/11disabled_if_in_filelist_boolean/00-base.xml
+++ b/tests/dictionaries/11disabled_if_in_filelist_boolean/00-base.xml
@@ -1,22 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <services>
-        <service name="test">
-            <file filelist="afilllist">/tmp/file1</file>
-        </service>
-    </services>
-    <variables>
-        <family name="general">
-            <variable name="condition" type="boolean"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_in" source="condition">
-            <param type="boolean">True</param>
-            <target type="filelist">afilllist</target>
-        </condition>
-    </constraints>
+  <services>
+    <service name="test">
+      <file filelist="afilllist">/tmp/file1</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="condition" type="boolean"/>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param type="boolean">True</param>
+      <target type="filelist">afilllist</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/11disabled_if_in_filelist_boolean2/00-base.xml b/tests/dictionaries/11disabled_if_in_filelist_boolean2/00-base.xml
index b78688090..a3f201174 100644
--- a/tests/dictionaries/11disabled_if_in_filelist_boolean2/00-base.xml
+++ b/tests/dictionaries/11disabled_if_in_filelist_boolean2/00-base.xml
@@ -1,24 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <services>
-        <service name="test">
-            <file filelist="afilllist">/tmp/file1</file>
-        </service>
-    </services>
-    <variables>
-        <family name="general">
-            <variable name="condition" type="boolean">
-                <value>False</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_in" source="condition">
-            <param>True</param>
-            <target type="filelist">afilllist</target>
-        </condition>
-    </constraints>
+  <services>
+    <service name="test">
+      <file filelist="afilllist">/tmp/file1</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="condition" type="boolean">
+        <value>False</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>True</param>
+      <target type="filelist">afilllist</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/11disabled_if_in_filelist_disabled/00-base.xml b/tests/dictionaries/11disabled_if_in_filelist_disabled/00-base.xml
index 950d9a779..c9283603e 100644
--- a/tests/dictionaries/11disabled_if_in_filelist_disabled/00-base.xml
+++ b/tests/dictionaries/11disabled_if_in_filelist_disabled/00-base.xml
@@ -1,34 +1,29 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-
-    <services>
-        <service name="test">
-            <file filelist="afilllist">/etc/file</file>
-        </service>
-    </services>
-
-    <variables>
-        <family name="general">
-            <variable name="condition" type="string" description="No change">
-                <value>oui</value>
-            </variable>
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_in" source="condition">
-            <param>oui</param>
-            <target type="variable">mode_conteneur_actif</target>
-            <target type="variable">mode_conteneur_actif2</target>
-            <target type="filelist">afilllist</target>
-        </condition>
-    </constraints>
+  <services>
+    <service name="test">
+      <file filelist="afilllist">/etc/file</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>oui</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+      <target type="filelist">afilllist</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/11disabled_if_in_filelist_multi/00-base.xml b/tests/dictionaries/11disabled_if_in_filelist_multi/00-base.xml
index fdca7b2af..43a9b82bd 100644
--- a/tests/dictionaries/11disabled_if_in_filelist_multi/00-base.xml
+++ b/tests/dictionaries/11disabled_if_in_filelist_multi/00-base.xml
@@ -1,35 +1,30 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-
-    <services>
-        <service name="test">
-            <file filelist="afilllist">/tmp/file1</file>
-            <file filelist="afilllist">/tmp/file2</file>
-        </service>
-    </services>
-
-    <variables>
-        <family name="general">
-            <variable name="condition" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_in" source="condition">
-            <param>oui</param>
-            <target type="variable">mode_conteneur_actif</target>
-            <target type="variable">mode_conteneur_actif2</target>
-            <target type="filelist">afilllist</target>
-        </condition>
-    </constraints>
+  <services>
+    <service name="test">
+      <file filelist="afilllist">/tmp/file1</file>
+      <file filelist="afilllist">/tmp/file2</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+      <target type="filelist">afilllist</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/11disabledifin_filelist_notexist/00-base.xml b/tests/dictionaries/11disabledifin_filelist_notexist/00-base.xml
index ccc7fa128..373e6cfca 100644
--- a/tests/dictionaries/11disabledifin_filelist_notexist/00-base.xml
+++ b/tests/dictionaries/11disabledifin_filelist_notexist/00-base.xml
@@ -1,32 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-
-    <services>
-        <service name="test">
-            <file filelist="afilllist">/tmp/file</file>
-        </service>
-    </services>
-
-    <variables>
-        <family name="general">
-            <variable name="condition" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_not_in" source="condition">
-            <param>unpossible</param>
-            <target type="filelist">afilllist</target>
-        </condition>
-    </constraints>
+  <services>
+    <service name="test">
+      <file filelist="afilllist">/tmp/file</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_not_in" source="condition">
+      <param>unpossible</param>
+      <target type="filelist">afilllist</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/11disabledifnotin_filelist_notexist/00-base.xml b/tests/dictionaries/11disabledifnotin_filelist_notexist/00-base.xml
index ce128737d..373e6cfca 100644
--- a/tests/dictionaries/11disabledifnotin_filelist_notexist/00-base.xml
+++ b/tests/dictionaries/11disabledifnotin_filelist_notexist/00-base.xml
@@ -1,31 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-
-    <services>
-        <service name="test">
-            <file filelist="afilllist">/tmp/file</file>
-        </service>
-    </services>
-    <variables>
-        <family name="general">
-            <variable name="condition" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_not_in" source="condition">
-            <param>unpossible</param>
-            <target type="filelist">afilllist</target>
-        </condition>
-    </constraints>
+  <services>
+    <service name="test">
+      <file filelist="afilllist">/tmp/file</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_not_in" source="condition">
+      <param>unpossible</param>
+      <target type="filelist">afilllist</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/00-base.xml b/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/00-base.xml
index fe5b9ef6b..9d8e3356f 100644
--- a/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/00-base.xml
+++ b/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/00-base.xml
@@ -1,36 +1,31 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-
-    <services>
-        <service name="test">
-            <file filelist="afilllist">/tmp/file</file>
-        </service>
-    </services>
-
-    <variables>
-        <family name="general">
-            <variable name="condition" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_not_in" source="condition">
-            <param>unpossible</param>
-            <target type="filelist">afilllist</target>
-        </condition>
-        <condition name="disabled_if_not_in" source="mode_conteneur_actif2">
-            <param>oui</param>
-            <target type="filelist">afilllist</target>
-        </condition>
-    </constraints>
+  <services>
+    <service name="test">
+      <file filelist="afilllist">/tmp/file</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_not_in" source="condition">
+      <param>unpossible</param>
+      <target type="filelist">afilllist</target>
+    </condition>
+    <condition name="disabled_if_not_in" source="mode_conteneur_actif2">
+      <param>oui</param>
+      <target type="filelist">afilllist</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/00-base.xml b/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/00-base.xml
index 0f614bfa7..e82e5b27e 100644
--- a/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/00-base.xml
+++ b/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/00-base.xml
@@ -1,35 +1,32 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-
-    <services>
-        <service name="test">
-            <file filelist="afilllist">/tmp/file</file>
-        </service>
-    </services>
-
-    <variables>
-        <family name="general">
-            <variable name="condition" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_enum">
-            <param>non</param>
-            <param>statique</param>
-	    <target>condition</target>
-        </check>
-        <condition name="disabled_if_not_in" source="condition">
-            <param>statique</param>
-            <target type="filelist">afilllist</target>
-        </condition>
-    </constraints>
+  <services>
+    <service name="test">
+      <file filelist="afilllist">/tmp/file</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>non</param>
+      <param>statique</param>
+      <target>condition</target>
+    </check>
+    <condition name="disabled_if_not_in" source="condition">
+      <param>statique</param>
+      <target type="filelist">afilllist</target>
+    </condition>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/11multi_disabled_if_in_filelist/00-base.xml b/tests/dictionaries/11multi_disabled_if_in_filelist/00-base.xml
index 71af616d7..52a2c9458 100644
--- a/tests/dictionaries/11multi_disabled_if_in_filelist/00-base.xml
+++ b/tests/dictionaries/11multi_disabled_if_in_filelist/00-base.xml
@@ -1,33 +1,28 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-
-    <services>
-        <service name="test">
-            <file filelist="afilllist">/tmp/file1</file>
-        </service>
-    </services>
-
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="condition" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_in" source="activer_clam" optional="True">
-            <param>non</param>
-            <target type="filelist">afilllist</target>
-        </condition>
-        <condition name="disabled_if_in" source="condition">
-            <param>non</param>
-            <target type="filelist">afilllist</target>
-        </condition>
-    </constraints>
+  <services>
+    <service name="test">
+      <file filelist="afilllist">/tmp/file1</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="activer_clam" optional="True">
+      <param>non</param>
+      <target type="filelist">afilllist</target>
+    </condition>
+    <condition name="disabled_if_in" source="condition">
+      <param>non</param>
+      <target type="filelist">afilllist</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/11valid_enum_function/00-base.xml b/tests/dictionaries/11valid_enum_function/00-base.xml
index 81bbe2fac..8d022f335 100644
--- a/tests/dictionaries/11valid_enum_function/00-base.xml
+++ b/tests/dictionaries/11valid_enum_function/00-base.xml
@@ -1,20 +1,18 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="var" type="number" description="New variable">
-                <value>9</value>
-            </variable>
-        </family>
-    </variables>
-    <constraints>
-        <check name="valid_enum">
-            <param type="function">trange</param>
-            <param type="number">0</param>
-            <param type="number">10</param>
-            <target>var</target>
-        </check>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="var" type="number" description="New variable">
+        <value>9</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param type="function">trange</param>
+      <param type="number">0</param>
+      <param type="number">10</param>
+      <target>var</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/11valid_enum_variable/00-base.xml b/tests/dictionaries/11valid_enum_variable/00-base.xml
index 046adf76d..aacb3e1ef 100644
--- a/tests/dictionaries/11valid_enum_variable/00-base.xml
+++ b/tests/dictionaries/11valid_enum_variable/00-base.xml
@@ -1,23 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>a</value>
-            </variable>
-            <variable name="var" type="string" description="New variable" multi="True">
-                <value>a</value>
-                <value>b</value>
-                <value>c</value>
-            </variable>
-        </family>
-    </variables>
-    <constraints>
-        <check name="valid_enum">
-            <param type="variable">var</param>
-            <target>mode_conteneur_actif</target>
-        </check>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>a</value>
+      </variable>
+      <variable name="var" type="string" description="New variable" multi="True">
+        <value>a</value>
+        <value>b</value>
+        <value>c</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param type="variable">var</param>
+      <target>mode_conteneur_actif</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/20family_append/00-base.xml b/tests/dictionaries/20family_append/00-base.xml
index 0e6d4337b..ccf8e4dd4 100644
--- a/tests/dictionaries/20family_append/00-base.xml
+++ b/tests/dictionaries/20family_append/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/20family_append/01-base.xml b/tests/dictionaries/20family_append/01-base.xml
index ce4a2ad3c..8bd81834e 100644
--- a/tests/dictionaries/20family_append/01-base.xml
+++ b/tests/dictionaries/20family_append/01-base.xml
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif1" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif1" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/20family_dynamic/00-base.xml b/tests/dictionaries/20family_dynamic/00-base.xml
index 243f828a5..ca18543d3 100644
--- a/tests/dictionaries/20family_dynamic/00-base.xml
+++ b/tests/dictionaries/20family_dynamic/00-base.xml
@@ -1,15 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name='general'>
-            <variable name='varname' type='string' description="No change" multi="True">
-                <value>val1</value>
-                <value>val2</value>
-            </variable>
-        </family>
-        <family name='dyn' dynamic="varname">
-            <variable name='vardyn' type='string' description="No change"/>
-        </family>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="varname" type="string" description="No change" multi="True">
+        <value>val1</value>
+        <value>val2</value>
+      </variable>
+    </family>
+    <family name="dyn" dynamic="varname">
+      <variable name="vardyn" type="string" description="No change"/>
+    </family>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/20family_dynamic_calc/00-base.xml b/tests/dictionaries/20family_dynamic_calc/00-base.xml
index 74053acb1..81390f862 100644
--- a/tests/dictionaries/20family_dynamic_calc/00-base.xml
+++ b/tests/dictionaries/20family_dynamic_calc/00-base.xml
@@ -1,26 +1,25 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name='general'>
-            <variable name='varname' type='string' description="No change" multi="True">
-                <value>val1</value>
-                <value>val2</value>
-            </variable>
-        </family>
-        <family name='dyn' dynamic="varname">
-            <variable name='vardyn' type='string' description="No change">
-                <value>val</value>
-            </variable>
-        </family>
-        <family name='new'>
-            <variable name='newvar' type='string' description="No change"/>
-        </family>
-    </variables>
-    <constraints>
-        <fill name="calc_val">
-            <param type="variable">vardynval1</param>
- 	    <target>newvar</target>
-        </fill>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="varname" type="string" description="No change" multi="True">
+        <value>val1</value>
+        <value>val2</value>
+      </variable>
+    </family>
+    <family name="dyn" dynamic="varname">
+      <variable name="vardyn" type="string" description="No change">
+        <value>val</value>
+      </variable>
+    </family>
+    <family name="new">
+      <variable name="newvar" type="string" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="variable">vardynval1</param>
+      <target>newvar</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/20family_dynamic_calc2/00-base.xml b/tests/dictionaries/20family_dynamic_calc2/00-base.xml
index e12821b2d..b74388845 100644
--- a/tests/dictionaries/20family_dynamic_calc2/00-base.xml
+++ b/tests/dictionaries/20family_dynamic_calc2/00-base.xml
@@ -1,26 +1,25 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name='general'>
-            <variable name='varname' type='string' description="No change" multi="True">
-                <value>val1</value>
-                <value>val2</value>
-            </variable>
-        </family>
-        <family name='dyn' dynamic="varname">
-            <variable name='vardyn' type='string' description="No change">
-                <value>val</value>
-            </variable>
-        </family>
-        <family name='new'>
-            <variable name='newvar' type='string' description="No change"/>
-        </family>
-    </variables>
-    <constraints>
-        <condition name="hidden_if_in" source="newvar">
-            <param>non</param>
-            <target type="family">dyn</target>
-        </condition>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="varname" type="string" description="No change" multi="True">
+        <value>val1</value>
+        <value>val2</value>
+      </variable>
+    </family>
+    <family name="dyn" dynamic="varname">
+      <variable name="vardyn" type="string" description="No change">
+        <value>val</value>
+      </variable>
+    </family>
+    <family name="new">
+      <variable name="newvar" type="string" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="hidden_if_in" source="newvar">
+      <param>non</param>
+      <target type="family">dyn</target>
+    </condition>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/20family_dynamic_calc_suffix/00-base.xml b/tests/dictionaries/20family_dynamic_calc_suffix/00-base.xml
index 123a6ed54..f0dcaf6a4 100644
--- a/tests/dictionaries/20family_dynamic_calc_suffix/00-base.xml
+++ b/tests/dictionaries/20family_dynamic_calc_suffix/00-base.xml
@@ -1,26 +1,25 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name='general'>
-            <variable name='varname' type='string' description="No change" multi="True">
-                <value>val1</value>
-                <value>val2</value>
-            </variable>
-        </family>
-        <family name='dyn' dynamic="varname">
-            <variable name='vardyn' type='string' description="No change">
-                <value>val</value>
-            </variable>
-        </family>
-        <family name='new'>
-            <variable name='newvar' type='string' description="No change"/>
-        </family>
-    </variables>
-    <constraints>
-        <fill name="calc_val">
-            <param type="suffix"/>
-	    <target>vardyn</target>
-        </fill>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="varname" type="string" description="No change" multi="True">
+        <value>val1</value>
+        <value>val2</value>
+      </variable>
+    </family>
+    <family name="dyn" dynamic="varname">
+      <variable name="vardyn" type="string" description="No change">
+        <value>val</value>
+      </variable>
+    </family>
+    <family name="new">
+      <variable name="newvar" type="string" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="suffix"/>
+      <target>vardyn</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/20family_dynamic_description/00-base.xml b/tests/dictionaries/20family_dynamic_description/00-base.xml
index a342a028d..39c223320 100644
--- a/tests/dictionaries/20family_dynamic_description/00-base.xml
+++ b/tests/dictionaries/20family_dynamic_description/00-base.xml
@@ -1,15 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name='general'>
-            <variable name='varname' type='string' description="No change" multi="True">
-                <value>val1</value>
-                <value>val2</value>
-            </variable>
-        </family>
-        <family name='dyn' description='Dyn ' dynamic="varname">
-            <variable name='vardyn' type='string' description="No change"/>
-        </family>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="varname" type="string" description="No change" multi="True">
+        <value>val1</value>
+        <value>val2</value>
+      </variable>
+    </family>
+    <family name="dyn" description="Dyn " dynamic="varname">
+      <variable name="vardyn" type="string" description="No change"/>
+    </family>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/20family_dynamic_number/00-base.xml b/tests/dictionaries/20family_dynamic_number/00-base.xml
index d13b35520..807034700 100644
--- a/tests/dictionaries/20family_dynamic_number/00-base.xml
+++ b/tests/dictionaries/20family_dynamic_number/00-base.xml
@@ -1,26 +1,25 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name='general'>
-            <variable name='varname' type='number' description="No change" multi="True">
-                <value>1</value>
-                <value>2</value>
-            </variable>
-        </family>
-        <family name='dyn' dynamic="varname">
-            <variable name='vardyn' type='string' description="No change">
-                <value>val</value>
-            </variable>
-        </family>
-        <family name='new'>
-            <variable name='newvar' type='string' description="No change"/>
-        </family>
-    </variables>
-    <constraints>
-        <fill name="calc_val">
-            <param type="variable">vardyn1</param>
-	    <target>newvar</target>
-        </fill>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="varname" type="number" description="No change" multi="True">
+        <value>1</value>
+        <value>2</value>
+      </variable>
+    </family>
+    <family name="dyn" dynamic="varname">
+      <variable name="vardyn" type="string" description="No change">
+        <value>val</value>
+      </variable>
+    </family>
+    <family name="new">
+      <variable name="newvar" type="string" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="variable">vardyn1</param>
+      <target>newvar</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/20family_empty/00-base.xml b/tests/dictionaries/20family_empty/00-base.xml
index ee74f3991..2611894b3 100644
--- a/tests/dictionaries/20family_empty/00-base.xml
+++ b/tests/dictionaries/20family_empty/00-base.xml
@@ -1,13 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" mode="basic">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="general2" help="family"/>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" mode="basic">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="general2" help="family"/>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/20family_hidden/00-base.xml b/tests/dictionaries/20family_hidden/00-base.xml
index 0e6d4337b..ccf8e4dd4 100644
--- a/tests/dictionaries/20family_hidden/00-base.xml
+++ b/tests/dictionaries/20family_hidden/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/20family_hidden/01-base.xml b/tests/dictionaries/20family_hidden/01-base.xml
index f8ae611f7..8556985bb 100644
--- a/tests/dictionaries/20family_hidden/01-base.xml
+++ b/tests/dictionaries/20family_hidden/01-base.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general" hidden="True"/>
-    </variables>
+  <variables>
+    <family name="general" hidden="True"/>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/20family_mode/00-base.xml b/tests/dictionaries/20family_mode/00-base.xml
index 20053c694..adc550df4 100644
--- a/tests/dictionaries/20family_mode/00-base.xml
+++ b/tests/dictionaries/20family_mode/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" mode="basic">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" mode="basic">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/20family_modeleadership/00-base.xml b/tests/dictionaries/20family_modeleadership/00-base.xml
index 890996b45..43e729762 100644
--- a/tests/dictionaries/20family_modeleadership/00-base.xml
+++ b/tests/dictionaries/20family_modeleadership/00-base.xml
@@ -1,22 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="leader" type="string" description="leader" multi="True"/>
-            <variable name="follower1" type="string" description="follower1"/>
-            <variable name="follower2" type="string" description="follower2" mode="basic"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <group leader="leader">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="leader" type="string" description="leader" multi="True"/>
+      <variable name="follower1" type="string" description="follower1"/>
+      <variable name="follower2" type="string" description="follower2" mode="basic"/>
+    </family>
+  </variables>
+  <constraints>
+    <group leader="leader">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+    </group>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/20notemplating/00-base.xml b/tests/dictionaries/20notemplating/00-base.xml
index 67637a508..df71ebe27 100644
--- a/tests/dictionaries/20notemplating/00-base.xml
+++ b/tests/dictionaries/20notemplating/00-base.xml
@@ -1,19 +1,15 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-
-    <services>
-        <service name="test">
-            <file engine="none">/etc/file</file>
-        </service>
-    </services>
-
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <services>
+    <service name="test">
+      <file engine="none">/etc/file</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/20override/00-base.xml b/tests/dictionaries/20override/00-base.xml
index 010e20219..3b380b576 100644
--- a/tests/dictionaries/20override/00-base.xml
+++ b/tests/dictionaries/20override/00-base.xml
@@ -1,22 +1,18 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-
-    <services>
-        <service name="test">
-            <override/>
-        </service>
-        <service name="test2">
-            <override engine="jinja2"/>
-        </service>
-    </services>
-
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <services>
+    <service name="test">
+      <override/>
+    </service>
+    <service name="test2">
+      <override engine="jinja2"/>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/20override_no_templating/00-base.xml b/tests/dictionaries/20override_no_templating/00-base.xml
index ed5be6658..8348d11a7 100644
--- a/tests/dictionaries/20override_no_templating/00-base.xml
+++ b/tests/dictionaries/20override_no_templating/00-base.xml
@@ -1,19 +1,15 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-
-    <services>
-        <service name="test">
-            <override engine="none"/>
-        </service>
-    </services>
-
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <services>
+    <service name="test">
+      <override engine="none"/>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/20override_source/00-base.xml b/tests/dictionaries/20override_source/00-base.xml
index 50ada9d0a..acf3748b8 100644
--- a/tests/dictionaries/20override_source/00-base.xml
+++ b/tests/dictionaries/20override_source/00-base.xml
@@ -1,19 +1,15 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-
-    <services>
-        <service name="test">
-            <override source="test2.service"/>
-        </service>
-    </services>
-
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <services>
+    <service name="test">
+      <override source="test2.service"/>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/21family_empty/00-base.xml b/tests/dictionaries/21family_empty/00-base.xml
index 64d577b02..b628e39b7 100644
--- a/tests/dictionaries/21family_empty/00-base.xml
+++ b/tests/dictionaries/21family_empty/00-base.xml
@@ -1,14 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="general1">
         </family>
-        <family name="general1">
-        </family>
-    </variables>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/30mandatory_withoutvalue/00-base.xml b/tests/dictionaries/30mandatory_withoutvalue/00-base.xml
index 301f4e9f4..dd8cc45f6 100644
--- a/tests/dictionaries/30mandatory_withoutvalue/00-base.xml
+++ b/tests/dictionaries/30mandatory_withoutvalue/00-base.xml
@@ -1,10 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" mandatory="True"/>
-        </family>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" mandatory="True"/>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/30mandatory_withoutvaluecalc/00-base.xml b/tests/dictionaries/30mandatory_withoutvaluecalc/00-base.xml
index cff37ba57..74ac4379f 100644
--- a/tests/dictionaries/30mandatory_withoutvaluecalc/00-base.xml
+++ b/tests/dictionaries/30mandatory_withoutvaluecalc/00-base.xml
@@ -1,16 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True"/>
-        </family>
-    </variables>
-    <constraints>
-        <fill name="calc_val">
-            <param>value</param>
-            <target>mode_conteneur_actif</target>
-        </fill>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param>value</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/30mandatory_withvalue/00-base.xml b/tests/dictionaries/30mandatory_withvalue/00-base.xml
index 8cb1d8414..cfbe7ed05 100644
--- a/tests/dictionaries/30mandatory_withvalue/00-base.xml
+++ b/tests/dictionaries/30mandatory_withvalue/00-base.xml
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>value</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>value</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/30mandatory_withvaluecalc/00-base.xml b/tests/dictionaries/30mandatory_withvaluecalc/00-base.xml
index 49605379c..899ce4dd1 100644
--- a/tests/dictionaries/30mandatory_withvaluecalc/00-base.xml
+++ b/tests/dictionaries/30mandatory_withvaluecalc/00-base.xml
@@ -1,14 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change"/>
-        </family>
-    </variables>
-    <constraints>
-        <fill name="calc_val">
-            <param>value</param>
-            <target>mode_conteneur_actif</target>
-        </fill>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param>value</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/40condition_base/00-base.xml b/tests/dictionaries/40condition_base/00-base.xml
index 3136dfdbd..c4aa968ac 100644
--- a/tests/dictionaries/40condition_base/00-base.xml
+++ b/tests/dictionaries/40condition_base/00-base.xml
@@ -1,29 +1,26 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="condition" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif1" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition optional="True" name="disabled_if_in" source="condition">
-            <param>oui</param>
-            <target type="variable">mode_conteneur_actif1</target>
-            <target type="variable" optional="True">mode_conteneur_actif2</target>
-        </condition>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition optional="True" name="disabled_if_in" source="condition">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif1</target>
+      <target type="variable" optional="True">mode_conteneur_actif2</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/40condition_base_add/00-base.xml b/tests/dictionaries/40condition_base_add/00-base.xml
index 3136dfdbd..c4aa968ac 100644
--- a/tests/dictionaries/40condition_base_add/00-base.xml
+++ b/tests/dictionaries/40condition_base_add/00-base.xml
@@ -1,29 +1,26 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="condition" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif1" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition optional="True" name="disabled_if_in" source="condition">
-            <param>oui</param>
-            <target type="variable">mode_conteneur_actif1</target>
-            <target type="variable" optional="True">mode_conteneur_actif2</target>
-        </condition>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition optional="True" name="disabled_if_in" source="condition">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif1</target>
+      <target type="variable" optional="True">mode_conteneur_actif2</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/40condition_base_add/01-base.xml b/tests/dictionaries/40condition_base_add/01-base.xml
index 3218d12b1..cca063ed2 100644
--- a/tests/dictionaries/40condition_base_add/01-base.xml
+++ b/tests/dictionaries/40condition_base_add/01-base.xml
@@ -1,19 +1,15 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="condition" redefine="True" remove_condition="True"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition optional="True" name="disabled_if_in" source="condition">
-            <param>oui</param>
-            <target type="variable">mode_conteneur_actif1</target>
-            <target type="variable" optional="True">mode_conteneur_actif2</target>
-        </condition>
-    </constraints>
-
+  <variables>
+    <family name="general">
+      <variable name="condition" redefine="True" remove_condition="True"/>
+    </family>
+  </variables>
+  <constraints>
+    <condition optional="True" name="disabled_if_in" source="condition">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif1</target>
+      <target type="variable" optional="True">mode_conteneur_actif2</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/40condition_fallback/00-base.xml b/tests/dictionaries/40condition_fallback/00-base.xml
index 8c7ae0ba7..4b3dcbb55 100644
--- a/tests/dictionaries/40condition_fallback/00-base.xml
+++ b/tests/dictionaries/40condition_fallback/00-base.xml
@@ -1,32 +1,29 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif1" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="disabled_family">
-            <variable name="mode_conteneur_actif3" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition optional="True" name="disabled_if_in" source="condition">
-            <param>oui</param>
-            <target type="variable">mode_conteneur_actif1</target>
-            <target type="variable" optional="True">mode_conteneur_actif2</target>
-            <target type="family">disabled_family</target>
-        </condition>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="disabled_family">
+      <variable name="mode_conteneur_actif3" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition optional="True" name="disabled_if_in" source="condition">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif1</target>
+      <target type="variable" optional="True">mode_conteneur_actif2</target>
+      <target type="family">disabled_family</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/40condition_optional/00-base.xml b/tests/dictionaries/40condition_optional/00-base.xml
index 99522be31..3190d07af 100644
--- a/tests/dictionaries/40condition_optional/00-base.xml
+++ b/tests/dictionaries/40condition_optional/00-base.xml
@@ -1,26 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="condition" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif1" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition optional="True" name="disabled_if_in" source="condition">
-            <param>oui</param>
-            <target type="variable">mode_conteneur_actif1</target>
-            <target type="variable" optional="True">mode_conteneur_actif2</target>
-        </condition>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition optional="True" name="disabled_if_in" source="condition">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif1</target>
+      <target type="variable" optional="True">mode_conteneur_actif2</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/40condition_optional_empty/00-base.xml b/tests/dictionaries/40condition_optional_empty/00-base.xml
index da22f00bc..15197d244 100644
--- a/tests/dictionaries/40condition_optional_empty/00-base.xml
+++ b/tests/dictionaries/40condition_optional_empty/00-base.xml
@@ -1,25 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="condition" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif1" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition optional="True" name="disabled_if_in" source="condition">
-            <param>oui</param>
-            <target type="variable" optional="True">mode_conteneur_actif2</target>
-        </condition>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition optional="True" name="disabled_if_in" source="condition">
+      <param>oui</param>
+      <target type="variable" optional="True">mode_conteneur_actif2</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/40condition_optional_family/00-base.xml b/tests/dictionaries/40condition_optional_family/00-base.xml
index 880841b09..8e67c7e38 100644
--- a/tests/dictionaries/40condition_optional_family/00-base.xml
+++ b/tests/dictionaries/40condition_optional_family/00-base.xml
@@ -1,19 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <variable name="condition" type="boolean"/>
-        <family name="general">
-            <variable name="my_variable"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_in" source="condition">
-            <param>True</param>
-            <target type="family" optional="True">general</target>
-            <target type="family" optional="True">general2</target>
-        </condition>
-    </constraints>
+  <variables>
+    <variable name="condition" type="boolean"/>
+    <family name="general">
+      <variable name="my_variable"/>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>True</param>
+      <target type="family" optional="True">general</target>
+      <target type="family" optional="True">general2</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/40empty_param/00_base.xml b/tests/dictionaries/40empty_param/00_base.xml
index 155081f59..43c59f4b3 100644
--- a/tests/dictionaries/40empty_param/00_base.xml
+++ b/tests/dictionaries/40empty_param/00_base.xml
@@ -1,22 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <services/>
-
-    <variables>
-        <family name="proxy_authentifie" description="proxy authentifié">
-            <variable name="toto1" type="port" description="Port d'écoute du proxy" mode="expert">
+  <services/>
+  <variables>
+    <family name="proxy_authentifie" description="proxy authentifié">
+      <variable name="toto1" type="port" description="Port d'écoute du proxy" mode="expert">
             </variable>
-            <variable name="toto2" type="port" description="Port d'écoute du proxy NTLM" mode="expert">
-                <value>3127</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_multi_condition">
-	    <param type='nil'/>
-            <target>toto1</target>
-        </fill>
-    </constraints>
-
+      <variable name="toto2" type="port" description="Port d'écoute du proxy NTLM" mode="expert">
+        <value>3127</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_multi_condition">
+      <param type="nil"/>
+      <target>toto1</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/40empty_param2/00_base.xml b/tests/dictionaries/40empty_param2/00_base.xml
index dd301fdab..93d7575bf 100644
--- a/tests/dictionaries/40empty_param2/00_base.xml
+++ b/tests/dictionaries/40empty_param2/00_base.xml
@@ -1,22 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <services/>
-
-    <variables>
-        <family name="proxy_authentifie" description="proxy authentifié">
-            <variable name="toto1" type="port" description="Port d'écoute du proxy" mode="expert">
+  <services/>
+  <variables>
+    <family name="proxy_authentifie" description="proxy authentifié">
+      <variable name="toto1" type="port" description="Port d'écoute du proxy" mode="expert">
             </variable>
-            <variable name="toto2" type="port" description="Port d'écoute du proxy NTLM" mode="expert">
-                <value>3127</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_multi_condition">
-	    <param name="value" type='nil'/>
-	    <target>toto1</target>
-        </fill>
-    </constraints>
-
+      <variable name="toto2" type="port" description="Port d'écoute du proxy NTLM" mode="expert">
+        <value>3127</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_multi_condition">
+      <param name="value" type="nil"/>
+      <target>toto1</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/40hidden_if_in_group_fallback/00-base.xml b/tests/dictionaries/40hidden_if_in_group_fallback/00-base.xml
index 8fad142b5..b12f6df90 100644
--- a/tests/dictionaries/40hidden_if_in_group_fallback/00-base.xml
+++ b/tests/dictionaries/40hidden_if_in_group_fallback/00-base.xml
@@ -1,28 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif1" type="string" description="No change" multi="True">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition optional="True" name="hidden_if_in" source="condition">
-            <param>oui</param>
-            <target type="variable">mode_conteneur_actif1</target>
-        </condition>
-        <group leader="mode_conteneur_actif1">
-            <follower>mode_conteneur_actif2</follower>
-        </group>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change" multi="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition optional="True" name="hidden_if_in" source="condition">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif1</target>
+    </condition>
+    <group leader="mode_conteneur_actif1">
+      <follower>mode_conteneur_actif2</follower>
+    </group>
+  </constraints>
 </rougail>
-<!-- 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 f2c755505..1e5ef63da 100644
--- a/tests/dictionaries/40ifin_leadership/00-base.xml
+++ b/tests/dictionaries/40ifin_leadership/00-base.xml
@@ -1,27 +1,26 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="condition" type="string" description="condition">
-                <value>oui</value>
-            </variable>
-            <variable name="leader" type="string" description="leader" multi="True"/>
-            <variable name="follower1" type="string" description="follower1"/>
-            <variable name="follower2" type="string" description="follower2"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <group leader="leader">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-        <condition name="disabled_if_in" source="condition">
-            <param>oui</param>
-            <target type="variable">follower1</target>
-        </condition>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="condition" type="string" description="condition">
+        <value>oui</value>
+      </variable>
+      <variable name="leader" type="string" description="leader" multi="True"/>
+      <variable name="follower1" type="string" description="follower1"/>
+      <variable name="follower2" type="string" description="follower2"/>
+    </family>
+  </variables>
+  <constraints>
+    <group leader="leader">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+    </group>
+    <condition name="disabled_if_in" source="condition">
+      <param>oui</param>
+      <target type="variable">follower1</target>
+    </condition>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/40ifin_leadershipauto/00-base.xml b/tests/dictionaries/40ifin_leadershipauto/00-base.xml
index 326da9309..a65384b65 100644
--- a/tests/dictionaries/40ifin_leadershipauto/00-base.xml
+++ b/tests/dictionaries/40ifin_leadershipauto/00-base.xml
@@ -1,37 +1,37 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <services>
-        <service name='test'>
-            <file>/etc/mailname</file>
-        </service>
-    </services>
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="condition" type="string" description="condition">
-                <value>oui</value>
-            </variable>
-            <variable name="leader" type="string" description="leader" multi="True">
-                <value>a</value>
-            </variable>
-            <variable name="follower1" type="string" description="follower1" hidden="True"/>
-            <variable name="follower2" type="string" description="follower2"/>
-        </family>
-    </variables>
-    <constraints>
-        <group leader="leader">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-        <fill name="calc_val">
-            <param name="valeur">valfill</param>
-	    <target>follower1</target>
-        </fill>
-        <condition name="disabled_if_in" source="condition">
-            <param>oui</param>
-            <target type="variable">follower1</target>
-        </condition>
-    </constraints>
+  <services>
+    <service name="test">
+      <file>/etc/mailname</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="condition" type="string" description="condition">
+        <value>oui</value>
+      </variable>
+      <variable name="leader" type="string" description="leader" multi="True">
+        <value>a</value>
+      </variable>
+      <variable name="follower1" type="string" description="follower1" hidden="True"/>
+      <variable name="follower2" type="string" description="follower2"/>
+    </family>
+  </variables>
+  <constraints>
+    <group leader="leader">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+    </group>
+    <fill name="calc_val">
+      <param name="valeur">valfill</param>
+      <target>follower1</target>
+    </fill>
+    <condition name="disabled_if_in" source="condition">
+      <param>oui</param>
+      <target type="variable">follower1</target>
+    </condition>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/40ifin_leadershipauto_follower/00-base.xml b/tests/dictionaries/40ifin_leadershipauto_follower/00-base.xml
index b7db45905..5de130d6c 100644
--- a/tests/dictionaries/40ifin_leadershipauto_follower/00-base.xml
+++ b/tests/dictionaries/40ifin_leadershipauto_follower/00-base.xml
@@ -1,39 +1,39 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <services>
-        <service name='test'>
-            <file>/etc/mailname</file>
-            <file engine="jinja2">/etc/mailname2</file>
-        </service>
-    </services>
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="condition" type="string" description="condition">
-                <value>oui</value>
-            </variable>
-            <variable name="leader" type="string" description="leader" multi="True">
-                <value>a</value>
-                <value>b</value>
-            </variable>
-            <variable name="follower1" type="string" description="follower1"/>
-            <variable name="follower2" type="string" description="follower2"/>
-        </family>
-    </variables>
-    <constraints>
-        <group leader="leader">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-	<fill name="calc_val">
-            <param name="valeur">valfill</param>
-	    <target>follower1</target>
-        </fill>
-        <condition name="disabled_if_in" source="leader">
-            <param>a</param>
-            <target type="variable">follower1</target>
-        </condition>
-    </constraints>
+  <services>
+    <service name="test">
+      <file>/etc/mailname</file>
+      <file engine="jinja2">/etc/mailname2</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="condition" type="string" description="condition">
+        <value>oui</value>
+      </variable>
+      <variable name="leader" type="string" description="leader" multi="True">
+        <value>a</value>
+        <value>b</value>
+      </variable>
+      <variable name="follower1" type="string" description="follower1"/>
+      <variable name="follower2" type="string" description="follower2"/>
+    </family>
+  </variables>
+  <constraints>
+    <group leader="leader">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+    </group>
+    <fill name="calc_val">
+      <param name="valeur">valfill</param>
+      <target>follower1</target>
+    </fill>
+    <condition name="disabled_if_in" source="leader">
+      <param>a</param>
+      <target type="variable">follower1</target>
+    </condition>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/40ifin_multi/00-base.xml b/tests/dictionaries/40ifin_multi/00-base.xml
index a4a6d391a..4b95acc80 100644
--- a/tests/dictionaries/40ifin_multi/00-base.xml
+++ b/tests/dictionaries/40ifin_multi/00-base.xml
@@ -1,31 +1,28 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="general2" hidden="True">
-            <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif3" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_in" source="mode_conteneur_actif">
-            <param>oui</param>
-            <target type="variable">mode_conteneur_actif3</target>
-        </condition>
-        <condition name="disabled_if_in" source="mode_conteneur_actif2">
-            <param>oui</param>
-            <target type="variable">mode_conteneur_actif3</target>
-        </condition>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="general2" hidden="True">
+      <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif3" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="mode_conteneur_actif">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif3</target>
+    </condition>
+    <condition name="disabled_if_in" source="mode_conteneur_actif2">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif3</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/40ifin_multi2/00-base.xml b/tests/dictionaries/40ifin_multi2/00-base.xml
index 498b2c083..035c1c1bd 100644
--- a/tests/dictionaries/40ifin_multi2/00-base.xml
+++ b/tests/dictionaries/40ifin_multi2/00-base.xml
@@ -1,31 +1,28 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="general2" hidden="True">
-            <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
-                <value>oui</value>
-            </variable>
-            <variable name="mode_conteneur_actif3" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_in" source="mode_conteneur_actif">
-            <param>oui</param>
-            <target type="variable">mode_conteneur_actif3</target>
-        </condition>
-        <condition name="disabled_if_in" source="mode_conteneur_actif2">
-            <param>oui</param>
-            <target type="variable">mode_conteneur_actif3</target>
-        </condition>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="general2" hidden="True">
+      <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
+        <value>oui</value>
+      </variable>
+      <variable name="mode_conteneur_actif3" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="mode_conteneur_actif">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif3</target>
+    </condition>
+    <condition name="disabled_if_in" source="mode_conteneur_actif2">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif3</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/40ifin_validenum/00-base.xml b/tests/dictionaries/40ifin_validenum/00-base.xml
index 5311ee9df..6754639bc 100644
--- a/tests/dictionaries/40ifin_validenum/00-base.xml
+++ b/tests/dictionaries/40ifin_validenum/00-base.xml
@@ -1,34 +1,32 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="general2" hidden="True">
-            <variable name="mode_conteneur_actif2" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif3" type="string" description="No change"/>
-        </family>
-    </variables>
-    <constraints>
-        <check name="valid_enum">
-            <param>a</param>
-            <param>b</param>
-            <param>c</param>
-            <target>mode_conteneur_actif3</target>
-        </check>
-        <condition name="disabled_if_in" source="mode_conteneur_actif3">
-            <param>d</param>
-            <target type="variable">mode_conteneur_actif</target>
-        </condition>
-        <condition name="disabled_if_not_in" source="mode_conteneur_actif3">
-            <param>d</param>
-            <target type="variable">mode_conteneur_actif2</target>
-        </condition>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="general2" hidden="True">
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif3" type="string" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>a</param>
+      <param>b</param>
+      <param>c</param>
+      <target>mode_conteneur_actif3</target>
+    </check>
+    <condition name="disabled_if_in" source="mode_conteneur_actif3">
+      <param>d</param>
+      <target type="variable">mode_conteneur_actif</target>
+    </condition>
+    <condition name="disabled_if_not_in" source="mode_conteneur_actif3">
+      <param>d</param>
+      <target type="variable">mode_conteneur_actif2</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/45extra_without_family/00-base.xml b/tests/dictionaries/45extra_without_family/00-base.xml
index 5a64ea264..2d0b52c96 100644
--- a/tests/dictionaries/45extra_without_family/00-base.xml
+++ b/tests/dictionaries/45extra_without_family/00-base.xml
@@ -1,15 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <services>
-        <service name="test">
-            <file>/etc/file</file>
-        </service>
-    </services>
-    <variables>
-        <variable name="my_var">
-            <value>rougail</value>
-        </variable>
-    </variables>
+  <services>
+    <service name="test">
+      <file>/etc/file</file>
+    </service>
+  </services>
+  <variables>
+    <variable name="my_var">
+      <value>rougail</value>
+    </variable>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/45extra_without_family/extra_dirs/extra/00-base.xml b/tests/dictionaries/45extra_without_family/extra_dirs/extra/00-base.xml
index 120d11a2c..73fe80607 100644
--- a/tests/dictionaries/45extra_without_family/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/45extra_without_family/extra_dirs/extra/00-base.xml
@@ -1,13 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <variable name="my_var"/>
-    </variables>
-    <constraints>
-        <fill name='calc_multi_condition'>
-            <param>non</param>
-            <target>extra.my_var</target>
-        </fill>
-    </constraints>
+  <variables>
+    <variable name="my_var"/>
+  </variables>
+  <constraints>
+    <fill name="calc_multi_condition">
+      <param>non</param>
+      <target>extra.my_var</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/45multi_family/00-base.xml b/tests/dictionaries/45multi_family/00-base.xml
index dfe147200..4f5d86b6d 100644
--- a/tests/dictionaries/45multi_family/00-base.xml
+++ b/tests/dictionaries/45multi_family/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="base">
-            <family name="subfamily">
-                <variable name="variable"/>
-            </family>
-        </family>
-    </variables>
+  <variables>
+    <family name="base">
+      <family name="subfamily">
+        <variable name="variable"/>
+      </family>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/45multi_family_basic/00-base.xml b/tests/dictionaries/45multi_family_basic/00-base.xml
index 8b009a15a..831c04364 100644
--- a/tests/dictionaries/45multi_family_basic/00-base.xml
+++ b/tests/dictionaries/45multi_family_basic/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="base">
-            <family name="subfamily">
-                <variable name="variable" mode="basic"/>
-            </family>
-        </family>
-    </variables>
+  <variables>
+    <family name="base">
+      <family name="subfamily">
+        <variable name="variable" mode="basic"/>
+      </family>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/45multi_family_expert/00-base.xml b/tests/dictionaries/45multi_family_expert/00-base.xml
index 72c06f5ef..307757d25 100644
--- a/tests/dictionaries/45multi_family_expert/00-base.xml
+++ b/tests/dictionaries/45multi_family_expert/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="base" mode="expert">
-            <family name="subfamily">
-                <variable name="variable"/>
-            </family>
-        </family>
-    </variables>
+  <variables>
+    <family name="base" mode="expert">
+      <family name="subfamily">
+        <variable name="variable"/>
+      </family>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/45multi_family_order/00-base.xml b/tests/dictionaries/45multi_family_order/00-base.xml
index cd0c86e42..b04d9937c 100644
--- a/tests/dictionaries/45multi_family_order/00-base.xml
+++ b/tests/dictionaries/45multi_family_order/00-base.xml
@@ -1,15 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <variable name="variable1"/>
-        <family name="base">
-            <variable name="variable2"/>
-            <family name="subfamily">
-                <variable name="variable3"/>
-            </family>
-            <variable name="variable4"/>
-        </family>
-    </variables>
+  <variables>
+    <variable name="variable1"/>
+    <family name="base">
+      <variable name="variable2"/>
+      <family name="subfamily">
+        <variable name="variable3"/>
+      </family>
+      <variable name="variable4"/>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/45without_family/00-base.xml b/tests/dictionaries/45without_family/00-base.xml
index f35c38619..4d3f27155 100644
--- a/tests/dictionaries/45without_family/00-base.xml
+++ b/tests/dictionaries/45without_family/00-base.xml
@@ -1,8 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <variable name="variable"/>
-    </variables>
+  <variables>
+    <variable name="variable"/>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/50exists_exists/00-base.xml b/tests/dictionaries/50exists_exists/00-base.xml
index 10cb29e47..8d03cb4e5 100644
--- a/tests/dictionaries/50exists_exists/00-base.xml
+++ b/tests/dictionaries/50exists_exists/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Description" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Description" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/50exists_exists/01-base.xml b/tests/dictionaries/50exists_exists/01-base.xml
index 00c05dad5..518de7561 100644
--- a/tests/dictionaries/50exists_exists/01-base.xml
+++ b/tests/dictionaries/50exists_exists/01-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="New description" exists="False">
-                <value>oui</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="New description" exists="False">
+        <value>oui</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/50redefine_description/00-base.xml b/tests/dictionaries/50redefine_description/00-base.xml
index 9ea330305..8c9d801f9 100644
--- a/tests/dictionaries/50redefine_description/00-base.xml
+++ b/tests/dictionaries/50redefine_description/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/50redefine_description/01-redefine.xml b/tests/dictionaries/50redefine_description/01-redefine.xml
index 0ee2789be..758bd2f2f 100644
--- a/tests/dictionaries/50redefine_description/01-redefine.xml
+++ b/tests/dictionaries/50redefine_description/01-redefine.xml
@@ -1,10 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" redefine="True" description="Redefined"/>
-        </family>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" redefine="True" description="Redefined"/>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/51exists_nonexists/00-base.xml b/tests/dictionaries/51exists_nonexists/00-base.xml
index 688267876..6d475995c 100644
--- a/tests/dictionaries/51exists_nonexists/00-base.xml
+++ b/tests/dictionaries/51exists_nonexists/00-base.xml
@@ -1,15 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Description">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif1" type="string" description="Description" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Description">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="Description" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/51exists_nonexists/01-base.xml b/tests/dictionaries/51exists_nonexists/01-base.xml
index fd4dd26d8..59583fe19 100644
--- a/tests/dictionaries/51exists_nonexists/01-base.xml
+++ b/tests/dictionaries/51exists_nonexists/01-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif2" type="string" description="New description" exists="False">
-                <value>oui</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif2" type="string" description="New description" exists="False">
+        <value>oui</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/51exists_redefine/00-base.xml b/tests/dictionaries/51exists_redefine/00-base.xml
index 10cb29e47..8d03cb4e5 100644
--- a/tests/dictionaries/51exists_redefine/00-base.xml
+++ b/tests/dictionaries/51exists_redefine/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Description" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Description" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/51exists_redefine/01-base.xml b/tests/dictionaries/51exists_redefine/01-base.xml
index 73028b97c..61c054295 100644
--- a/tests/dictionaries/51exists_redefine/01-base.xml
+++ b/tests/dictionaries/51exists_redefine/01-base.xml
@@ -1,15 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" redefine="True" exists="True">
-                <value>oui</value>
-            </variable>
-            <variable name="mode_conteneur_actif1" redefine="True" exists="True">
-                <value>oui</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" redefine="True" exists="True">
+        <value>oui</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" redefine="True" exists="True">
+        <value>oui</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/51redefine_auto/00-base.xml b/tests/dictionaries/51redefine_auto/00-base.xml
index 9155e418f..1195d9fe7 100644
--- a/tests/dictionaries/51redefine_auto/00-base.xml
+++ b/tests/dictionaries/51redefine_auto/00-base.xml
@@ -1,19 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param name="valeur">non</param>
-            <target>mode_conteneur_actif</target>
-        </fill>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">non</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/51redefine_auto/01-base.xml b/tests/dictionaries/51redefine_auto/01-base.xml
index c45f1e0a8..698aed491 100644
--- a/tests/dictionaries/51redefine_auto/01-base.xml
+++ b/tests/dictionaries/51redefine_auto/01-base.xml
@@ -1,15 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" redefine="True"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="concat">
-            <param name="valeur">non</param>
-            <target>mode_conteneur_actif</target>
-        </fill>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" redefine="True"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="concat">
+      <param name="valeur">non</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/51redefine_autofill/00-base.xml b/tests/dictionaries/51redefine_autofill/00-base.xml
index e34cc1cb4..0da7cab19 100644
--- a/tests/dictionaries/51redefine_autofill/00-base.xml
+++ b/tests/dictionaries/51redefine_autofill/00-base.xml
@@ -1,19 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param name="valeur">oui</param>
-            <target>mode_conteneur_actif</target>
-        </fill>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">oui</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/51redefine_autofill/01-base.xml b/tests/dictionaries/51redefine_autofill/01-base.xml
index 741e0d310..28881d84f 100644
--- a/tests/dictionaries/51redefine_autofill/01-base.xml
+++ b/tests/dictionaries/51redefine_autofill/01-base.xml
@@ -1,15 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" redefine="True" hidden="False"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="concat">
-            <param name="valeur">non</param>
-            <target>mode_conteneur_actif</target>
-        </fill>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" redefine="True" hidden="False"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="concat">
+      <param name="valeur">non</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/51redefine_family/00-base.xml b/tests/dictionaries/51redefine_family/00-base.xml
index 5eeb4f942..458057f26 100644
--- a/tests/dictionaries/51redefine_family/00-base.xml
+++ b/tests/dictionaries/51redefine_family/00-base.xml
@@ -1,24 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="general2" hidden="True">
-            <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_in" source="mode_conteneur_actif">
-            <param>oui</param>
-            <target type="family">general2</target>
-        </condition>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="general2" hidden="True">
+      <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="mode_conteneur_actif">
+      <param>oui</param>
+      <target type="family">general2</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/51redefine_family/01-base.xml b/tests/dictionaries/51redefine_family/01-base.xml
index a7d681039..dc45e35ed 100644
--- a/tests/dictionaries/51redefine_family/01-base.xml
+++ b/tests/dictionaries/51redefine_family/01-base.xml
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" redefine="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" redefine="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/51redefine_fill/00-base.xml b/tests/dictionaries/51redefine_fill/00-base.xml
index e34cc1cb4..0da7cab19 100644
--- a/tests/dictionaries/51redefine_fill/00-base.xml
+++ b/tests/dictionaries/51redefine_fill/00-base.xml
@@ -1,19 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param name="valeur">oui</param>
-            <target>mode_conteneur_actif</target>
-        </fill>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">oui</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/51redefine_fill/01-base.xml b/tests/dictionaries/51redefine_fill/01-base.xml
index c45f1e0a8..698aed491 100644
--- a/tests/dictionaries/51redefine_fill/01-base.xml
+++ b/tests/dictionaries/51redefine_fill/01-base.xml
@@ -1,15 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" redefine="True"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="concat">
-            <param name="valeur">non</param>
-            <target>mode_conteneur_actif</target>
-        </fill>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" redefine="True"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="concat">
+      <param name="valeur">non</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/51redefine_fillauto/00-base.xml b/tests/dictionaries/51redefine_fillauto/00-base.xml
index 75cf7960e..9373d5171 100644
--- a/tests/dictionaries/51redefine_fillauto/00-base.xml
+++ b/tests/dictionaries/51redefine_fillauto/00-base.xml
@@ -1,19 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param name="valeur">oui</param>
-            <target>mode_conteneur_actif</target>
-        </fill>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">oui</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/51redefine_fillauto/01-base.xml b/tests/dictionaries/51redefine_fillauto/01-base.xml
index 6e85da2f1..f295968dd 100644
--- a/tests/dictionaries/51redefine_fillauto/01-base.xml
+++ b/tests/dictionaries/51redefine_fillauto/01-base.xml
@@ -1,15 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" redefine="True" hidden="True"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="concat">
-            <param name="valeur">non</param>
-            <target>mode_conteneur_actif</target>
-        </fill>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" redefine="True" hidden="True"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="concat">
+      <param name="valeur">non</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/51redefine_help/00-base.xml b/tests/dictionaries/51redefine_help/00-base.xml
index 7d3c54096..c39693ee6 100644
--- a/tests/dictionaries/51redefine_help/00-base.xml
+++ b/tests/dictionaries/51redefine_help/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general" help="redefine help family">
-            <variable name="mode_conteneur_actif" type="string" description="redefine help" hidden="True" help="redefine help">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general" help="redefine help family">
+      <variable name="mode_conteneur_actif" type="string" description="redefine help" hidden="True" help="redefine help">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/51redefine_help/01-base.xml b/tests/dictionaries/51redefine_help/01-base.xml
index 9a3aab1eb..f6ea98445 100644
--- a/tests/dictionaries/51redefine_help/01-base.xml
+++ b/tests/dictionaries/51redefine_help/01-base.xml
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general" help="redefine help family ok">
-            <variable name="mode_conteneur_actif" redefine="True" hidden="True" help="redefine help ok">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general" help="redefine help family ok">
+      <variable name="mode_conteneur_actif" redefine="True" hidden="True" help="redefine help ok">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/51redefine_hidden/00-base.xml b/tests/dictionaries/51redefine_hidden/00-base.xml
index 4708db543..ccab2d183 100644
--- a/tests/dictionaries/51redefine_hidden/00-base.xml
+++ b/tests/dictionaries/51redefine_hidden/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Redefine hidden">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Redefine hidden">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/51redefine_hidden/01-redefine.xml b/tests/dictionaries/51redefine_hidden/01-redefine.xml
index 07359c716..31eef0530 100644
--- a/tests/dictionaries/51redefine_hidden/01-redefine.xml
+++ b/tests/dictionaries/51redefine_hidden/01-redefine.xml
@@ -1,10 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" redefine="True" hidden="True"/>
-        </family>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" redefine="True" hidden="True"/>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/51redefine_multi/00-base.xml b/tests/dictionaries/51redefine_multi/00-base.xml
index 9ea330305..8c9d801f9 100644
--- a/tests/dictionaries/51redefine_multi/00-base.xml
+++ b/tests/dictionaries/51redefine_multi/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/51redefine_multi/01-redefine.xml b/tests/dictionaries/51redefine_multi/01-redefine.xml
index fee1b09ce..df4f28e5c 100644
--- a/tests/dictionaries/51redefine_multi/01-redefine.xml
+++ b/tests/dictionaries/51redefine_multi/01-redefine.xml
@@ -1,10 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" redefine="True" multi="True"/>
-        </family>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" redefine="True" multi="True"/>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/51redefine_remove_check/00-base.xml b/tests/dictionaries/51redefine_remove_check/00-base.xml
index d63018515..9dc96e514 100644
--- a/tests/dictionaries/51redefine_remove_check/00-base.xml
+++ b/tests/dictionaries/51redefine_remove_check/00-base.xml
@@ -1,19 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_enum">
-            <param>a</param>
-            <param>b</param>
-            <param>c</param>
-            <target>mode_conteneur_actif</target>
-        </check>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>a</param>
+      <param>b</param>
+      <param>c</param>
+      <target>mode_conteneur_actif</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/51redefine_remove_check/01-base.xml b/tests/dictionaries/51redefine_remove_check/01-base.xml
index 1d0aa09e3..5ef05ee98 100644
--- a/tests/dictionaries/51redefine_remove_check/01-base.xml
+++ b/tests/dictionaries/51redefine_remove_check/01-base.xml
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" redefine="True" remove_check="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" redefine="True" remove_check="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/51redefine_remove_condition/00-base.xml b/tests/dictionaries/51redefine_remove_condition/00-base.xml
index ff3f67bd2..4d3a9bcea 100644
--- a/tests/dictionaries/51redefine_remove_condition/00-base.xml
+++ b/tests/dictionaries/51redefine_remove_condition/00-base.xml
@@ -1,29 +1,26 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="condition" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif1" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_in" source="condition">
-            <param>oui</param>
-            <target type="variable">mode_conteneur_actif1</target>
-            <target type="variable">mode_conteneur_actif2</target>
-        </condition>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif1</target>
+      <target type="variable">mode_conteneur_actif2</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/51redefine_remove_condition/01-base.xml b/tests/dictionaries/51redefine_remove_condition/01-base.xml
index be01a6ec5..5b96406b9 100644
--- a/tests/dictionaries/51redefine_remove_condition/01-base.xml
+++ b/tests/dictionaries/51redefine_remove_condition/01-base.xml
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="condition" redefine="True" remove_condition="True"/>
-        </family>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="condition" redefine="True" remove_condition="True"/>
+    </family>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/51redefine_removecondition_nonautofreeze/00-base.xml b/tests/dictionaries/51redefine_removecondition_nonautofreeze/00-base.xml
index 3b1f3b455..a3471e442 100644
--- a/tests/dictionaries/51redefine_removecondition_nonautofreeze/00-base.xml
+++ b/tests/dictionaries/51redefine_removecondition_nonautofreeze/00-base.xml
@@ -1,30 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <variable name="my_var" auto_freeze="True">
-            <value>no</value>
-        </variable>
-        <variable name="condition">
-            <value>no</value>
-        </variable>
-        <variable name="my_var1" hidden="True">
-            <value>no</value>
-        </variable>
-        <variable name="my_var2">
-            <value>no</value>
-        </variable>
-        <variable name="server_deployed" type="boolean" hidden="True">
-            <value>False</value>
-        </variable>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_in" source="condition">
-            <param>yes</param>
-            <target type="variable">my_var1</target>
-            <target type="variable">my_var2</target>
-        </condition>
-    </constraints>
+  <variables>
+    <variable name="my_var" auto_freeze="True">
+      <value>no</value>
+    </variable>
+    <variable name="condition">
+      <value>no</value>
+    </variable>
+    <variable name="my_var1" hidden="True">
+      <value>no</value>
+    </variable>
+    <variable name="my_var2">
+      <value>no</value>
+    </variable>
+    <variable name="server_deployed" type="boolean" hidden="True">
+      <value>False</value>
+    </variable>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>yes</param>
+      <target type="variable">my_var1</target>
+      <target type="variable">my_var2</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/51redefine_removecondition_nonautofreeze/01-base.xml b/tests/dictionaries/51redefine_removecondition_nonautofreeze/01-base.xml
index e9ee21158..2798de04b 100644
--- a/tests/dictionaries/51redefine_removecondition_nonautofreeze/01-base.xml
+++ b/tests/dictionaries/51redefine_removecondition_nonautofreeze/01-base.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <variable name="condition" redefine="True" remove_condition="True"/>
-    </variables>
+  <variables>
+    <variable name="condition" redefine="True" remove_condition="True"/>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/51redefine_type/00-base.xml b/tests/dictionaries/51redefine_type/00-base.xml
index 9ea330305..8c9d801f9 100644
--- a/tests/dictionaries/51redefine_type/00-base.xml
+++ b/tests/dictionaries/51redefine_type/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/51redefine_type/01-redefine.xml b/tests/dictionaries/51redefine_type/01-redefine.xml
index 930995cc6..cf1a2adbe 100644
--- a/tests/dictionaries/51redefine_type/01-redefine.xml
+++ b/tests/dictionaries/51redefine_type/01-redefine.xml
@@ -1,10 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" redefine="True" type="number"/>
-        </family>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" redefine="True" type="number"/>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/51redefine_validenum/00-base.xml b/tests/dictionaries/51redefine_validenum/00-base.xml
index b2933fe2e..9d3c5cf02 100644
--- a/tests/dictionaries/51redefine_validenum/00-base.xml
+++ b/tests/dictionaries/51redefine_validenum/00-base.xml
@@ -1,18 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True"/>
-        </family>
-    </variables>
-    <constraints>
-        <check name="valid_enum">
-            <param>a</param>
-            <param>b</param>
-            <param>c</param>
-            <target>mode_conteneur_actif</target>
-        </check>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>a</param>
+      <param>b</param>
+      <param>c</param>
+      <target>mode_conteneur_actif</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/51redefine_validenum/01-redefine.xml b/tests/dictionaries/51redefine_validenum/01-redefine.xml
index fce1d510e..1e5e21099 100644
--- a/tests/dictionaries/51redefine_validenum/01-redefine.xml
+++ b/tests/dictionaries/51redefine_validenum/01-redefine.xml
@@ -1,17 +1,15 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" redefine="True" remove_check="True"/>
-        </family>
-    </variables>
-    <constraints>
-        <check name="valid_enum">
-            <param>a</param>
-            <param>b</param>
-            <target>mode_conteneur_actif</target>
-        </check>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" redefine="True" remove_check="True"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>a</param>
+      <param>b</param>
+      <target>mode_conteneur_actif</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/51redefine_value/00-base.xml b/tests/dictionaries/51redefine_value/00-base.xml
index 305b1d084..e1bf475ec 100644
--- a/tests/dictionaries/51redefine_value/00-base.xml
+++ b/tests/dictionaries/51redefine_value/00-base.xml
@@ -1,15 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Redefine value">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif1" type="string" description="Redefine value" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Redefine value">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="Redefine value" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/51redefine_value/01-redefine.xml b/tests/dictionaries/51redefine_value/01-redefine.xml
index 2d384c416..4fe7dc59e 100644
--- a/tests/dictionaries/51redefine_value/01-redefine.xml
+++ b/tests/dictionaries/51redefine_value/01-redefine.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif1" redefine="True">
-                <value>oui</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif1" redefine="True">
+        <value>oui</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/51remove_fill/00-base.xml b/tests/dictionaries/51remove_fill/00-base.xml
index 725d6f152..d99bdfb07 100644
--- a/tests/dictionaries/51remove_fill/00-base.xml
+++ b/tests/dictionaries/51remove_fill/00-base.xml
@@ -1,22 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>oui</value>
-            </variable>
-            <variable name="mode_conteneur_actif1" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param type="variable">mode_conteneur_actif1</param>
-            <target>mode_conteneur_actif</target>
-        </fill>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>oui</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="variable">mode_conteneur_actif1</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/51remove_fill/01-base.xml b/tests/dictionaries/51remove_fill/01-base.xml
index f607fb190..f404ec788 100644
--- a/tests/dictionaries/51remove_fill/01-base.xml
+++ b/tests/dictionaries/51remove_fill/01-base.xml
@@ -1,10 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" redefine="True" remove_fill="True"/>
-        </family>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" redefine="True" remove_fill="True"/>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/52exists_redefine/00-base.xml b/tests/dictionaries/52exists_redefine/00-base.xml
index 39bc3a7bd..192bba8ab 100644
--- a/tests/dictionaries/52exists_redefine/00-base.xml
+++ b/tests/dictionaries/52exists_redefine/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Description" hidden="True">
-                <value>oui</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Description" hidden="True">
+        <value>oui</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/52exists_redefine/01-base.xml b/tests/dictionaries/52exists_redefine/01-base.xml
index 1dbe1da79..793e4d2eb 100644
--- a/tests/dictionaries/52exists_redefine/01-base.xml
+++ b/tests/dictionaries/52exists_redefine/01-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" description="New description" exists="False" redefine="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" description="New description" exists="False" redefine="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/60action_external/00-base.xml b/tests/dictionaries/60action_external/00-base.xml
index 46d871318..849130906 100644
--- a/tests/dictionaries/60action_external/00-base.xml
+++ b/tests/dictionaries/60action_external/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general" description="général">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/60action_external/extra_dirs/extra/00-base.xml b/tests/dictionaries/60action_external/extra_dirs/extra/00-base.xml
index f547fc6ea..5beae659c 100644
--- a/tests/dictionaries/60action_external/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/60action_external/extra_dirs/extra/00-base.xml
@@ -1,18 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="test">	
-            <variable name="delay" type="number" description="délai en minutes avant lancement">
-                <value>0</value>
-            </variable>
-            <variable name="calc_url" type="web_address" description="domain" hidden="True">
-                <value>0</value>
-            </variable>
-        </family>
-    </variables>
-    <constraints>
-        <fill name="calc_val">
-            <param>http://localhost/</param>
-            <target>extra.test.calc_url</target>
-        </fill>
-    </constraints>
+  <variables>
+    <family name="test">
+      <variable name="delay" type="number" description="délai en minutes avant lancement">
+        <value>0</value>
+      </variable>
+      <variable name="calc_url" type="web_address" description="domain" hidden="True">
+        <value>0</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param>http://localhost/</param>
+      <target>extra.test.calc_url</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/60extra_externalspacecondition/00-base.xml b/tests/dictionaries/60extra_externalspacecondition/00-base.xml
index a525e91a3..cd3769c6f 100644
--- a/tests/dictionaries/60extra_externalspacecondition/00-base.xml
+++ b/tests/dictionaries/60extra_externalspacecondition/00-base.xml
@@ -1,18 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general" description="général">
-            <variable name="my_var" auto_freeze="True">
-                <value>no</value>
-            </variable>
-            <variable name="my_var1" hidden="True">
-                <value>no</value>
-            </variable>
-            <variable name="server_deployed" type="boolean" hidden="True">
-                <value>False</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general" description="général">
+      <variable name="my_var" auto_freeze="True">
+        <value>no</value>
+      </variable>
+      <variable name="my_var1" hidden="True">
+        <value>no</value>
+      </variable>
+      <variable name="server_deployed" type="boolean" hidden="True">
+        <value>False</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/60extra_externalspacecondition/extra_dirs/extra/00-base.xml b/tests/dictionaries/60extra_externalspacecondition/extra_dirs/extra/00-base.xml
index 26e4174a3..52089bf34 100644
--- a/tests/dictionaries/60extra_externalspacecondition/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/60extra_externalspacecondition/extra_dirs/extra/00-base.xml
@@ -1,15 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name='ejabberd'>
-            <variable name="description" type="string">
-                <value>Exportation de la base de ejabberd</value>
-            </variable>
-            <variable name="day" type="schedule"></variable>
-            <variable name="mode" type="schedulemod">
-                <value>pre</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="ejabberd">
+      <variable name="description" type="string">
+        <value>Exportation de la base de ejabberd</value>
+      </variable>
+      <variable name="day" type="schedule"/>
+      <variable name="mode" type="schedulemod">
+        <value>pre</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/60extra_externalspacecondition/extra_dirs/extra1/00-base.xml b/tests/dictionaries/60extra_externalspacecondition/extra_dirs/extra1/00-base.xml
index 87424efae..f5a5d7091 100644
--- a/tests/dictionaries/60extra_externalspacecondition/extra_dirs/extra1/00-base.xml
+++ b/tests/dictionaries/60extra_externalspacecondition/extra_dirs/extra1/00-base.xml
@@ -1,17 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name='external'>
-            <variable name="description" type="string">
-                <value>test</value>
-            </variable>
-        </family>
-    </variables>
-    <constraints>
-        <condition name ='disabled_if_in' source='extra.ejabberd.description'>
-            <param>non</param>
-            <target type='family'>extra1.external</target>
-        </condition>
-    </constraints>
+  <variables>
+    <family name="external">
+      <variable name="description" type="string">
+        <value>test</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="extra.ejabberd.description">
+      <param>non</param>
+      <target type="family">extra1.external</target>
+    </condition>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/60extra_group/00-base.xml b/tests/dictionaries/60extra_group/00-base.xml
index 268c2024d..22be25899 100644
--- a/tests/dictionaries/60extra_group/00-base.xml
+++ b/tests/dictionaries/60extra_group/00-base.xml
@@ -1,19 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <services>
-        <service name='test'>
-            <file>/etc/mailname</file>
-            <file engine="jinja2">/etc/mailname2</file>
-        </service>
-    </services>
-    <variables>
-        <family name="general" description="général">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <services>
+    <service name="test">
+      <file>/etc/mailname</file>
+      <file engine="jinja2">/etc/mailname2</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/60extra_group/extra_dirs/extra/00-base.xml b/tests/dictionaries/60extra_group/extra_dirs/extra/00-base.xml
index 080fdf123..91f69946d 100644
--- a/tests/dictionaries/60extra_group/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/60extra_group/extra_dirs/extra/00-base.xml
@@ -1,19 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name='ejabberd'>
-            <variable name="description" type="string" multi="True">
-                <value>test</value>
-            </variable>
-            <variable name="mode" type="string">
-                <value>pre</value>
-            </variable>
-        </family>
-    </variables>
-    <constraints>
-        <group leader="extra.ejabberd.description">
-            <follower>mode</follower>
-        </group>
-    </constraints>
+  <variables>
+    <family name="ejabberd">
+      <variable name="description" type="string" multi="True">
+        <value>test</value>
+      </variable>
+      <variable name="mode" type="string">
+        <value>pre</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <group leader="extra.ejabberd.description">
+      <follower>mode</follower>
+    </group>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/60extra_group_name/00-base.xml b/tests/dictionaries/60extra_group_name/00-base.xml
index 268c2024d..22be25899 100644
--- a/tests/dictionaries/60extra_group_name/00-base.xml
+++ b/tests/dictionaries/60extra_group_name/00-base.xml
@@ -1,19 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <services>
-        <service name='test'>
-            <file>/etc/mailname</file>
-            <file engine="jinja2">/etc/mailname2</file>
-        </service>
-    </services>
-    <variables>
-        <family name="general" description="général">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <services>
+    <service name="test">
+      <file>/etc/mailname</file>
+      <file engine="jinja2">/etc/mailname2</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/60extra_group_name/extra_dirs/extra/00-base.xml b/tests/dictionaries/60extra_group_name/extra_dirs/extra/00-base.xml
index 6a507abe3..8b03d0769 100644
--- a/tests/dictionaries/60extra_group_name/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/60extra_group_name/extra_dirs/extra/00-base.xml
@@ -1,19 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name='ejabberd'>
-            <variable name="description" type="string" multi="True">
-                <value>test</value>
-            </variable>
-            <variable name="mode" type="string">
-                <value>pre</value>
-            </variable>
-        </family>
-    </variables>
-    <constraints>
-        <group leader="extra.ejabberd.description" name="new_name">
-            <follower>mode</follower>
-        </group>
-    </constraints>
+  <variables>
+    <family name="ejabberd">
+      <variable name="description" type="string" multi="True">
+        <value>test</value>
+      </variable>
+      <variable name="mode" type="string">
+        <value>pre</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <group leader="extra.ejabberd.description" name="new_name">
+      <follower>mode</follower>
+    </group>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/60extra_help/00-base.xml b/tests/dictionaries/60extra_help/00-base.xml
index d8156c278..5299dde1a 100644
--- a/tests/dictionaries/60extra_help/00-base.xml
+++ b/tests/dictionaries/60extra_help/00-base.xml
@@ -1,22 +1,18 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-
-    <services>
-        <service name='test'>
-            <file>/etc/mailname</file>
-        </service>
-    </services>
-
-    <variables>
-        <family name="general" description="général">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <services>
+    <service name="test">
+      <file>/etc/mailname</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/60extra_help/extra_dirs/extra/00-base.xml b/tests/dictionaries/60extra_help/extra_dirs/extra/00-base.xml
index e49575c34..dff47ea37 100644
--- a/tests/dictionaries/60extra_help/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/60extra_help/extra_dirs/extra/00-base.xml
@@ -1,24 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name='ejabberd'>
-            <variable name="description" type="string">
-                <value>Exportation de la base de ejabberd</value>
-            </variable>
-            <variable name="day" type="schedule" help="Test help"></variable>
-            <variable name="mode" type="schedulemod">
-                <value>pre</value>
-            </variable>
-        </family>
-    </variables>
-    <constraints>
-        <fill name='calc_multi_condition'>
-            <param>non</param>
-            <param type='variable' name='condition_1' propertyerror='False'>activer_ejabberd</param>
-            <param name='match'>none</param>
-            <param name='mismatch'>daily</param>
-	    <target>extra.ejabberd.day</target>
-        </fill>
-    </constraints>
+  <variables>
+    <family name="ejabberd">
+      <variable name="description" type="string">
+        <value>Exportation de la base de ejabberd</value>
+      </variable>
+      <variable name="day" type="schedule" help="Test help"/>
+      <variable name="mode" type="schedulemod">
+        <value>pre</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_multi_condition">
+      <param>non</param>
+      <param type="variable" name="condition_1" propertyerror="False">activer_ejabberd</param>
+      <param name="match">none</param>
+      <param name="mismatch">daily</param>
+      <target>extra.ejabberd.day</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/60extra_load/00-base.xml b/tests/dictionaries/60extra_load/00-base.xml
index 32dae3d3b..8c0f3365c 100644
--- a/tests/dictionaries/60extra_load/00-base.xml
+++ b/tests/dictionaries/60extra_load/00-base.xml
@@ -1,15 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general" description="général">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/60extra_load/extra_dirs/extra/00-base.xml b/tests/dictionaries/60extra_load/extra_dirs/extra/00-base.xml
index ac0557b08..a11e423b2 100644
--- a/tests/dictionaries/60extra_load/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/60extra_load/extra_dirs/extra/00-base.xml
@@ -1,24 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name='ejabberd'>
-            <variable name="description" type="string">
-                <value>Exportation de la base de ejabberd</value>
-            </variable>
-            <variable name="day" type="schedule"></variable>
-            <variable name="mode" type="schedulemod">
-                <value>pre</value>
-            </variable>
-        </family>
-    </variables>
-    <constraints>
-        <fill name='calc_multi_condition'>
-            <param>non</param>
-            <param type='variable' name='condition_1' propertyerror='False'>activer_ejabberd</param>
-            <param name='match'>none</param>
-            <param name='mismatch'>daily</param>
-	    <target>extra.ejabberd.day</target>
-        </fill>
-    </constraints>
+  <variables>
+    <family name="ejabberd">
+      <variable name="description" type="string">
+        <value>Exportation de la base de ejabberd</value>
+      </variable>
+      <variable name="day" type="schedule"/>
+      <variable name="mode" type="schedulemod">
+        <value>pre</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_multi_condition">
+      <param>non</param>
+      <param type="variable" name="condition_1" propertyerror="False">activer_ejabberd</param>
+      <param name="match">none</param>
+      <param name="mismatch">daily</param>
+      <target>extra.ejabberd.day</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/60extra_mandatory/00-base.xml b/tests/dictionaries/60extra_mandatory/00-base.xml
index 32dae3d3b..8c0f3365c 100644
--- a/tests/dictionaries/60extra_mandatory/00-base.xml
+++ b/tests/dictionaries/60extra_mandatory/00-base.xml
@@ -1,15 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general" description="général">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/60extra_mandatory/extra_dirs/extra/00-base.xml b/tests/dictionaries/60extra_mandatory/extra_dirs/extra/00-base.xml
index c14290532..fd6e7405b 100644
--- a/tests/dictionaries/60extra_mandatory/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/60extra_mandatory/extra_dirs/extra/00-base.xml
@@ -1,23 +1,22 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name='ejabberd'>
-            <variable name="description" type="string">
-                <value>Exportation de la base de ejabberd</value>
-            </variable>
-	    <variable name="day" type="schedule" mandatory="True"/>
-	    <variable name="mode" type="schedulemod" mandatory="True"/>
-	    <variable name="var1" type="string" mandatory="True"/>
-        </family>
-    </variables>
-    <constraints>
-        <fill name='calc_multi_condition'>
-            <param>non</param>
-            <param type='variable' name='condition_1' propertyerror='False'>activer_ejabberd</param>
-            <param name='match'>none</param>
-            <param name='mismatch'>daily</param>
-	    <target>extra.ejabberd.day</target>
-        </fill>
-    </constraints>
+  <variables>
+    <family name="ejabberd">
+      <variable name="description" type="string">
+        <value>Exportation de la base de ejabberd</value>
+      </variable>
+      <variable name="day" type="schedule" mandatory="True"/>
+      <variable name="mode" type="schedulemod" mandatory="True"/>
+      <variable name="var1" type="string" mandatory="True"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_multi_condition">
+      <param>non</param>
+      <param type="variable" name="condition_1" propertyerror="False">activer_ejabberd</param>
+      <param name="match">none</param>
+      <param name="mismatch">daily</param>
+      <target>extra.ejabberd.day</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/60extra_name_family/00-base.xml b/tests/dictionaries/60extra_name_family/00-base.xml
index 5f321110e..2279aa8d5 100644
--- a/tests/dictionaries/60extra_name_family/00-base.xml
+++ b/tests/dictionaries/60extra_name_family/00-base.xml
@@ -1,15 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="extra">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="extra">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/60extra_name_family/extra_dirs/extra/00-base.xml b/tests/dictionaries/60extra_name_family/extra_dirs/extra/00-base.xml
index ac0557b08..a11e423b2 100644
--- a/tests/dictionaries/60extra_name_family/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/60extra_name_family/extra_dirs/extra/00-base.xml
@@ -1,24 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name='ejabberd'>
-            <variable name="description" type="string">
-                <value>Exportation de la base de ejabberd</value>
-            </variable>
-            <variable name="day" type="schedule"></variable>
-            <variable name="mode" type="schedulemod">
-                <value>pre</value>
-            </variable>
-        </family>
-    </variables>
-    <constraints>
-        <fill name='calc_multi_condition'>
-            <param>non</param>
-            <param type='variable' name='condition_1' propertyerror='False'>activer_ejabberd</param>
-            <param name='match'>none</param>
-            <param name='mismatch'>daily</param>
-	    <target>extra.ejabberd.day</target>
-        </fill>
-    </constraints>
+  <variables>
+    <family name="ejabberd">
+      <variable name="description" type="string">
+        <value>Exportation de la base de ejabberd</value>
+      </variable>
+      <variable name="day" type="schedule"/>
+      <variable name="mode" type="schedulemod">
+        <value>pre</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_multi_condition">
+      <param>non</param>
+      <param type="variable" name="condition_1" propertyerror="False">activer_ejabberd</param>
+      <param name="match">none</param>
+      <param name="mismatch">daily</param>
+      <target>extra.ejabberd.day</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/60extra_no_condition/00-base.xml b/tests/dictionaries/60extra_no_condition/00-base.xml
index 4e809b8b0..791dcd424 100644
--- a/tests/dictionaries/60extra_no_condition/00-base.xml
+++ b/tests/dictionaries/60extra_no_condition/00-base.xml
@@ -1,18 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general" description="général">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="module_instancie" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="module_instancie" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/60extra_no_condition/extra_dirs/extra/00-base.xml b/tests/dictionaries/60extra_no_condition/extra_dirs/extra/00-base.xml
index 26e4174a3..52089bf34 100644
--- a/tests/dictionaries/60extra_no_condition/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/60extra_no_condition/extra_dirs/extra/00-base.xml
@@ -1,15 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name='ejabberd'>
-            <variable name="description" type="string">
-                <value>Exportation de la base de ejabberd</value>
-            </variable>
-            <variable name="day" type="schedule"></variable>
-            <variable name="mode" type="schedulemod">
-                <value>pre</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="ejabberd">
+      <variable name="description" type="string">
+        <value>Exportation de la base de ejabberd</value>
+      </variable>
+      <variable name="day" type="schedule"/>
+      <variable name="mode" type="schedulemod">
+        <value>pre</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/60extra_redefine/00-base.xml b/tests/dictionaries/60extra_redefine/00-base.xml
index 32dae3d3b..8c0f3365c 100644
--- a/tests/dictionaries/60extra_redefine/00-base.xml
+++ b/tests/dictionaries/60extra_redefine/00-base.xml
@@ -1,15 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general" description="général">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/60extra_redefine/extra_dirs/extra/00-base.xml b/tests/dictionaries/60extra_redefine/extra_dirs/extra/00-base.xml
index ac0557b08..a11e423b2 100644
--- a/tests/dictionaries/60extra_redefine/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/60extra_redefine/extra_dirs/extra/00-base.xml
@@ -1,24 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name='ejabberd'>
-            <variable name="description" type="string">
-                <value>Exportation de la base de ejabberd</value>
-            </variable>
-            <variable name="day" type="schedule"></variable>
-            <variable name="mode" type="schedulemod">
-                <value>pre</value>
-            </variable>
-        </family>
-    </variables>
-    <constraints>
-        <fill name='calc_multi_condition'>
-            <param>non</param>
-            <param type='variable' name='condition_1' propertyerror='False'>activer_ejabberd</param>
-            <param name='match'>none</param>
-            <param name='mismatch'>daily</param>
-	    <target>extra.ejabberd.day</target>
-        </fill>
-    </constraints>
+  <variables>
+    <family name="ejabberd">
+      <variable name="description" type="string">
+        <value>Exportation de la base de ejabberd</value>
+      </variable>
+      <variable name="day" type="schedule"/>
+      <variable name="mode" type="schedulemod">
+        <value>pre</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_multi_condition">
+      <param>non</param>
+      <param type="variable" name="condition_1" propertyerror="False">activer_ejabberd</param>
+      <param name="match">none</param>
+      <param name="mismatch">daily</param>
+      <target>extra.ejabberd.day</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/60extra_redefine/extra_dirs/extra/01-redefine.xml b/tests/dictionaries/60extra_redefine/extra_dirs/extra/01-redefine.xml
index e1760cca0..9103416e8 100644
--- a/tests/dictionaries/60extra_redefine/extra_dirs/extra/01-redefine.xml
+++ b/tests/dictionaries/60extra_redefine/extra_dirs/extra/01-redefine.xml
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name='ejabberd'>
-	    <variable name="description" redefine="True" hidden="True"/>
-        </family>
-    </variables>
+  <variables>
+    <family name="ejabberd">
+      <variable name="description" redefine="True" hidden="True"/>
+    </family>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/60extra_variable_name_extra/00-base.xml b/tests/dictionaries/60extra_variable_name_extra/00-base.xml
index 32dae3d3b..8c0f3365c 100644
--- a/tests/dictionaries/60extra_variable_name_extra/00-base.xml
+++ b/tests/dictionaries/60extra_variable_name_extra/00-base.xml
@@ -1,15 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general" description="général">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/60extra_variable_name_extra/extra_dirs/extra/00-base.xml b/tests/dictionaries/60extra_variable_name_extra/extra_dirs/extra/00-base.xml
index 0ba12c010..1b43cfb79 100644
--- a/tests/dictionaries/60extra_variable_name_extra/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/60extra_variable_name_extra/extra_dirs/extra/00-base.xml
@@ -1,7 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <variable name="extra"/>
-    </variables>
+  <variables>
+    <variable name="extra"/>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/60familyaction/00-base.xml b/tests/dictionaries/60familyaction/00-base.xml
index 46d871318..849130906 100644
--- a/tests/dictionaries/60familyaction/00-base.xml
+++ b/tests/dictionaries/60familyaction/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general" description="général">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/60familyaction/extra_dirs/extra/00-base.xml b/tests/dictionaries/60familyaction/extra_dirs/extra/00-base.xml
index 03e2ed734..9fcc64782 100644
--- a/tests/dictionaries/60familyaction/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/60familyaction/extra_dirs/extra/00-base.xml
@@ -1,9 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="test">	
-            <variable name="delay" type="number" description="délai en minutes avant lancement">
-                <value>0</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="test">
+      <variable name="delay" type="number" description="délai en minutes avant lancement">
+        <value>0</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/60familyaction_mandatory/00-base.xml b/tests/dictionaries/60familyaction_mandatory/00-base.xml
index 46d871318..849130906 100644
--- a/tests/dictionaries/60familyaction_mandatory/00-base.xml
+++ b/tests/dictionaries/60familyaction_mandatory/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general" description="général">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/60familyaction_mandatory/extra_dirs/extra/00-base.xml b/tests/dictionaries/60familyaction_mandatory/extra_dirs/extra/00-base.xml
index 1692f0fcb..35fecda4e 100644
--- a/tests/dictionaries/60familyaction_mandatory/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/60familyaction_mandatory/extra_dirs/extra/00-base.xml
@@ -1,10 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="test">	
-            <variable name="delay" type="number" description="délai en minutes avant lancement">
-                <value>0</value>
-            </variable>
-            <variable name="day" type="number" description="day avant lancement" mandatory="True"/>
-        </family>
-    </variables>
+  <variables>
+    <family name="test">
+      <variable name="delay" type="number" description="délai en minutes avant lancement">
+        <value>0</value>
+      </variable>
+      <variable name="day" type="number" description="day avant lancement" mandatory="True"/>
+    </family>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/61extra_auto_freeze/00-base.xml b/tests/dictionaries/61extra_auto_freeze/00-base.xml
index a41f67c6a..0ab77a367 100644
--- a/tests/dictionaries/61extra_auto_freeze/00-base.xml
+++ b/tests/dictionaries/61extra_auto_freeze/00-base.xml
@@ -1,13 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general" description="général">
-            <variable name="server_deployed" type="boolean" description="No change"/>
-            <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general" description="général">
+      <variable name="server_deployed" type="boolean" description="No change"/>
+      <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/61extra_auto_freeze/extra_dirs/extra/00-base.xml b/tests/dictionaries/61extra_auto_freeze/extra_dirs/extra/00-base.xml
index 1c1559f5f..3d92c2c93 100644
--- a/tests/dictionaries/61extra_auto_freeze/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/61extra_auto_freeze/extra_dirs/extra/00-base.xml
@@ -1,11 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name='ejabberd'>
-            <variable name="mode" type="string" auto_freeze="True">
-                <value>pre</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="ejabberd">
+      <variable name="mode" type="string" auto_freeze="True">
+        <value>pre</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/61extra_dyn/00-base.xml b/tests/dictionaries/61extra_dyn/00-base.xml
index 81f687819..95b534064 100644
--- a/tests/dictionaries/61extra_dyn/00-base.xml
+++ b/tests/dictionaries/61extra_dyn/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general" description="général">
-            <variable name="varname" type="string" description="No change" multi="True">
-                <value>a</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general" description="général">
+      <variable name="varname" type="string" description="No change" multi="True">
+        <value>a</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/61extra_dyn/extra_dirs/extra/00-base.xml b/tests/dictionaries/61extra_dyn/extra_dirs/extra/00-base.xml
index e60a1bd8a..84709bfea 100644
--- a/tests/dictionaries/61extra_dyn/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/61extra_dyn/extra_dirs/extra/00-base.xml
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name='ejabberd' dynamic="varname">
-            <variable name="mode" type="string"/>
-        </family>
-    </variables>
+  <variables>
+    <family name="ejabberd" dynamic="varname">
+      <variable name="mode" type="string"/>
+    </family>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/61extra_dyn_extra/00-base.xml b/tests/dictionaries/61extra_dyn_extra/00-base.xml
index 81f687819..95b534064 100644
--- a/tests/dictionaries/61extra_dyn_extra/00-base.xml
+++ b/tests/dictionaries/61extra_dyn_extra/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general" description="général">
-            <variable name="varname" type="string" description="No change" multi="True">
-                <value>a</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general" description="général">
+      <variable name="varname" type="string" description="No change" multi="True">
+        <value>a</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/61extra_dyn_extra/extra_dirs/extra/00-base.xml b/tests/dictionaries/61extra_dyn_extra/extra_dirs/extra/00-base.xml
index eb77f2df0..96ab370d3 100644
--- a/tests/dictionaries/61extra_dyn_extra/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/61extra_dyn_extra/extra_dirs/extra/00-base.xml
@@ -1,14 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general" description="général">
-            <variable name="varname" type="string" description="No change" multi="True">
-                <value>a</value>
-            </variable>
-        </family>
-        <family name='ejabberd' dynamic="extra.general.varname">
-            <variable name="mode" type="string"/>
-        </family>
-    </variables>
+  <variables>
+    <family name="general" description="général">
+      <variable name="varname" type="string" description="No change" multi="True">
+        <value>a</value>
+      </variable>
+    </family>
+    <family name="ejabberd" dynamic="extra.general.varname">
+      <variable name="mode" type="string"/>
+    </family>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/70container_files/00-base.xml b/tests/dictionaries/70container_files/00-base.xml
index 182a35e7b..48ce7ce04 100644
--- a/tests/dictionaries/70container_files/00-base.xml
+++ b/tests/dictionaries/70container_files/00-base.xml
@@ -1,18 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <services> 
-        <service name='test'>
-            <file>/etc/mailname</file>
-            <file>/rougail.conf</file>
-        </service>
-    </services>
-    <variables>
-        <family name="general" description="général">
-            <variable name='mode_conteneur_actif' type='string' description="No change" hidden="True">
-                <value>oui</value>
-            </variable>
-        </family>
-    </variables>
+  <services>
+    <service name="test">
+      <file>/etc/mailname</file>
+      <file>/rougail.conf</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>oui</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/70container_files_symlink_multi/00-base.xml b/tests/dictionaries/70container_files_symlink_multi/00-base.xml
index 94c9cb9d6..6cdab5227 100644
--- a/tests/dictionaries/70container_files_symlink_multi/00-base.xml
+++ b/tests/dictionaries/70container_files_symlink_multi/00-base.xml
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <services> 
-        <service name='test'>
-            <file file_type="variable" source="mailname">file_name</file>
-            <file file_type="variable" source="mailname2" engine="jinja2">file_name2</file>
-        </service>
-    </services>
-    <variables>
-        <variable name='file_name' type='filename' multi='True'>
-            <value>/etc/mailname</value>
-            <value>/etc/mailname2</value>
-        </variable>
-        <variable name='file_name2' type='filename' multi='True'>
-            <value>/etc/mailname3</value>
-            <value>/etc/mailname4</value>
-        </variable>
-    </variables>
+  <services>
+    <service name="test">
+      <file file_type="variable" source="mailname">file_name</file>
+      <file file_type="variable" source="mailname2" engine="jinja2">file_name2</file>
+    </service>
+  </services>
+  <variables>
+    <variable name="file_name" type="filename" multi="True">
+      <value>/etc/mailname</value>
+      <value>/etc/mailname2</value>
+    </variable>
+    <variable name="file_name2" type="filename" multi="True">
+      <value>/etc/mailname3</value>
+      <value>/etc/mailname4</value>
+    </variable>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/70container_files_symlink_multi_variable/00-base.xml b/tests/dictionaries/70container_files_symlink_multi_variable/00-base.xml
index 4e29e1bf4..3270dc101 100644
--- a/tests/dictionaries/70container_files_symlink_multi_variable/00-base.xml
+++ b/tests/dictionaries/70container_files_symlink_multi_variable/00-base.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <services> 
-        <service name='test'>
-            <file file_type="variable" source="mailname" variable="var">file_name</file>
-            <file file_type="variable" source="mailname2" variable="var" engine="jinja2">file_name2</file>
-        </service>
-    </services>
-    <variables>
-        <variable name='file_name' type='filename' multi='True'>
-            <value>/etc/mailname</value>
-            <value>/etc/mailname2</value>
-        </variable>
-        <variable name='file_name2' type='filename' multi='True'>
-            <value>/etc/mailname3</value>
-            <value>/etc/mailname4</value>
-        </variable>
-        <variable name='var' type='string' multi='True'>
-            <value>mailname</value>
-            <value>mailname2</value>
-        </variable>
-    </variables>
+  <services>
+    <service name="test">
+      <file file_type="variable" source="mailname" variable="var">file_name</file>
+      <file file_type="variable" source="mailname2" variable="var" engine="jinja2">file_name2</file>
+    </service>
+  </services>
+  <variables>
+    <variable name="file_name" type="filename" multi="True">
+      <value>/etc/mailname</value>
+      <value>/etc/mailname2</value>
+    </variable>
+    <variable name="file_name2" type="filename" multi="True">
+      <value>/etc/mailname3</value>
+      <value>/etc/mailname4</value>
+    </variable>
+    <variable name="var" type="string" multi="True">
+      <value>mailname</value>
+      <value>mailname2</value>
+    </variable>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/70container_files_symlink_variable/00-base.xml b/tests/dictionaries/70container_files_symlink_variable/00-base.xml
index e765c5cc1..19f77a673 100644
--- a/tests/dictionaries/70container_files_symlink_variable/00-base.xml
+++ b/tests/dictionaries/70container_files_symlink_variable/00-base.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <services> 
-        <service name='test'>
-            <file file_type="variable" source="mailname" variable="var">file_name</file>
-        </service>
-    </services>
-    <variables>
-        <variable name='file_name' type='filename'>
-            <value>/etc/mailname</value>
-        </variable>
-        <variable name='var' type='string'>
-            <value>mailname</value>
-        </variable>
-    </variables>
+  <services>
+    <service name="test">
+      <file file_type="variable" source="mailname" variable="var">file_name</file>
+    </service>
+  </services>
+  <variables>
+    <variable name="file_name" type="filename">
+      <value>/etc/mailname</value>
+    </variable>
+    <variable name="var" type="string">
+      <value>mailname</value>
+    </variable>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/70container_files_twice/00-base.xml b/tests/dictionaries/70container_files_twice/00-base.xml
index 3e49ccf97..b817d912c 100644
--- a/tests/dictionaries/70container_files_twice/00-base.xml
+++ b/tests/dictionaries/70container_files_twice/00-base.xml
@@ -1,19 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <services> 
-        <service name='test'>
-            <file>/etc/mailname</file>
-            <file>/etc/eole/mailname</file>
-            <file>/rougail.conf</file>
-        </service>
-    </services>
-    <variables>
-        <family name="general" description="général">
-            <variable name='mode_conteneur_actif' type='string' description="No change" hidden="True">
-                <value>oui</value>
-            </variable>
-        </family>
-    </variables>
+  <services>
+    <service name="test">
+      <file>/etc/mailname</file>
+      <file>/etc/eole/mailname</file>
+      <file>/rougail.conf</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>oui</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/70container_filesmulti/00-base.xml b/tests/dictionaries/70container_filesmulti/00-base.xml
index aa0e9ec64..517f4d9d8 100644
--- a/tests/dictionaries/70container_filesmulti/00-base.xml
+++ b/tests/dictionaries/70container_filesmulti/00-base.xml
@@ -1,18 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <services> 
-        <service name='test'>
-            <file>/etc/mailname</file>
-            <file>/etc/mailname2</file>
-        </service>
-    </services>
-    <variables>
-        <family name="general" description="général">
-            <variable name='mode_conteneur_actif' type='string' description="No change" hidden="True">
-                <value>oui</value>
-            </variable>
-        </family>
-    </variables>
+  <services>
+    <service name="test">
+      <file>/etc/mailname</file>
+      <file>/etc/mailname2</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>oui</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/70container_filesredefine/00-base.xml b/tests/dictionaries/70container_filesredefine/00-base.xml
index 33b6a9c4f..7a9c4c735 100644
--- a/tests/dictionaries/70container_filesredefine/00-base.xml
+++ b/tests/dictionaries/70container_filesredefine/00-base.xml
@@ -1,17 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <services> 
-        <service name='test'>
-            <file>/etc/mailname</file>
-        </service>
-    </services>
-    <variables>
-        <family name="general" description="général">
-            <variable name='mode_conteneur_actif' type='string' description="No change" hidden="True">
-                <value>oui</value>
-            </variable>
-        </family>
-    </variables>
+  <services>
+    <service name="test">
+      <file>/etc/mailname</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>oui</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/70container_filesredefine/01-base.xml b/tests/dictionaries/70container_filesredefine/01-base.xml
index dd33c3575..185b44d07 100644
--- a/tests/dictionaries/70container_filesredefine/01-base.xml
+++ b/tests/dictionaries/70container_filesredefine/01-base.xml
@@ -1,12 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <services> 
-        <service name='test'>
-            <file source="mailname.new" redefine="True">/etc/mailname</file>
-        </service>
-    </services>
+  <services>
+    <service name="test">
+      <file source="mailname.new" redefine="True">/etc/mailname</file>
+    </service>
+  </services>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
-
diff --git a/tests/dictionaries/70container_new/00-base.xml b/tests/dictionaries/70container_new/00-base.xml
index 1c386e7ad..8e6a7e366 100644
--- a/tests/dictionaries/70container_new/00-base.xml
+++ b/tests/dictionaries/70container_new/00-base.xml
@@ -1,16 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <services> 
-        <service name='test'>
+  <services>
+    <service name="test">
         </service>
-    </services>
-    <variables>
-        <family name="general" description="général">
-            <variable name='mode_conteneur_actif' type='string' description="No change" hidden="True">
-                <value>oui</value>
-            </variable>
-        </family>
-    </variables>
+  </services>
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>oui</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/70container_newnocont/00-base.xml b/tests/dictionaries/70container_newnocont/00-base.xml
index d3a94b62f..3cd49c193 100644
--- a/tests/dictionaries/70container_newnocont/00-base.xml
+++ b/tests/dictionaries/70container_newnocont/00-base.xml
@@ -1,16 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <services> 
-        <service name='test'>
+  <services>
+    <service name="test">
         </service>
-    </services>
-    <variables>
-        <family name="general" description="général">
-            <variable name='mode_conteneur_actif' type='string' description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  </services>
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/70container_newwithip/00-base.xml b/tests/dictionaries/70container_newwithip/00-base.xml
index 309151e60..20d12315a 100644
--- a/tests/dictionaries/70container_newwithip/00-base.xml
+++ b/tests/dictionaries/70container_newwithip/00-base.xml
@@ -1,17 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <services> 
-        <service name='test'>
+  <services>
+    <service name="test">
         </service>
-    </services>
-    <variables>
-        <family name="general" description="général">
-            <variable name='mode_conteneur_actif' type='string' description="No change" hidden="True">
-                <value>oui</value>
-            </variable>
-            <variable name='adresse_ip_test' type='ip' description="No change"/>
-        </family>
-    </variables>
+  </services>
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>oui</value>
+      </variable>
+      <variable name="adresse_ip_test" type="ip" description="No change"/>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/70container_save/00-base.xml b/tests/dictionaries/70container_save/00-base.xml
index e4f3b05c6..ffcda8839 100644
--- a/tests/dictionaries/70container_save/00-base.xml
+++ b/tests/dictionaries/70container_save/00-base.xml
@@ -1,13 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general" description="général">
-            <variable name='mode_conteneur_actif' type='string' description="No change" hidden="True">
-                <value>oui</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>oui</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/70service_base/00-base.xml b/tests/dictionaries/70service_base/00-base.xml
index e8475d9ea..d82671d79 100644
--- a/tests/dictionaries/70service_base/00-base.xml
+++ b/tests/dictionaries/70service_base/00-base.xml
@@ -1,18 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-
-    <services>
-        <service name='testsrv'>
+  <services>
+    <service name="testsrv">
         </service>
-    </services>
-    <variables>
-        <family name="general" description="général">
-            <variable name='mode_conteneur_actif' type='string' description="No change" hidden="True">
-                <value>oui</value>
-            </variable>
-        </family>
-    </variables>
+  </services>
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>oui</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/70service_not_managed/00-base.xml b/tests/dictionaries/70service_not_managed/00-base.xml
index 8b00831f8..cb3e5b5a5 100644
--- a/tests/dictionaries/70service_not_managed/00-base.xml
+++ b/tests/dictionaries/70service_not_managed/00-base.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <services> 
-        <service name='test' manage="False">
-            <file>/tmp/test</file>
-        </service>
-    </services>
-    <variables>
-        <variable name='var' type='string'>
-            <value>mailname</value>
-        </variable>
-    </variables>
+  <services>
+    <service name="test" manage="False">
+      <file>/tmp/test</file>
+    </service>
+  </services>
+  <variables>
+    <variable name="var" type="string">
+      <value>mailname</value>
+    </variable>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/70service_servicelist/00-base.xml b/tests/dictionaries/70service_servicelist/00-base.xml
index e06cbe6be..800cad3ce 100644
--- a/tests/dictionaries/70service_servicelist/00-base.xml
+++ b/tests/dictionaries/70service_servicelist/00-base.xml
@@ -1,22 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-
-    <services>
-        <service name='test' servicelist="test">
+  <services>
+    <service name="test" servicelist="test">
         </service>
-    </services>
-    <variables>
-        <variable name="condition">
-            <value>no</value>
-        </variable>
-    </variables>
-    <constraints>
-        <condition name="disabled_if_in" source="condition">
-            <param>yes</param>
-            <target type="servicelist">test</target>
-        </condition>
-    </constraints>
+  </services>
+  <variables>
+    <variable name="condition">
+      <value>no</value>
+    </variable>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>yes</param>
+      <target type="servicelist">test</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/70service_servicelist_disabled_if_in/00-base.xml b/tests/dictionaries/70service_servicelist_disabled_if_in/00-base.xml
index 0e21a232d..8a68f585b 100644
--- a/tests/dictionaries/70service_servicelist_disabled_if_in/00-base.xml
+++ b/tests/dictionaries/70service_servicelist_disabled_if_in/00-base.xml
@@ -1,29 +1,25 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-
-    <services>
-        <service name='test' servicelist="test">
+  <services>
+    <service name="test" servicelist="test">
         </service>
-    </services>
-    <variables>
-        <variable name="condition1">
-            <value>no</value>
-        </variable>
-        <variable name="condition2">
-            <value>no</value>
-        </variable>
-    </variables>
-    <constraints>
-        <condition name="disabled_if_in" source="condition1">
-            <param>no</param>
-            <target>condition2</target>
-        </condition>
-        <condition name="disabled_if_in" source="condition2">
-            <param>yes</param>
-            <target type="servicelist">test</target>
-        </condition>
-    </constraints>
+  </services>
+  <variables>
+    <variable name="condition1">
+      <value>no</value>
+    </variable>
+    <variable name="condition2">
+      <value>no</value>
+    </variable>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition1">
+      <param>no</param>
+      <target>condition2</target>
+    </condition>
+    <condition name="disabled_if_in" source="condition2">
+      <param>yes</param>
+      <target type="servicelist">test</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/70service_servicelist_file/00-base.xml b/tests/dictionaries/70service_servicelist_file/00-base.xml
index 8136e01d8..b74620b45 100644
--- a/tests/dictionaries/70service_servicelist_file/00-base.xml
+++ b/tests/dictionaries/70service_servicelist_file/00-base.xml
@@ -1,24 +1,22 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <services>
-        <service name='test' servicelist="test">
-            <file>/etc/file</file>
-        </service>
-    </services>
-    <variables>
-        <variable name="condition">
-            <value>no</value>
-        </variable>
-        <variable name="nut_monitor_host" type="ip" mandatory='True'>
-            <value>192.168.0.1</value>
-        </variable>
-    </variables>
-    <constraints>
-        <condition name="disabled_if_in" source="condition">
-            <param>no</param>
-            <target type="servicelist">test</target>
-        </condition>
-    </constraints>
+  <services>
+    <service name="test" servicelist="test">
+      <file>/etc/file</file>
+    </service>
+  </services>
+  <variables>
+    <variable name="condition">
+      <value>no</value>
+    </variable>
+    <variable name="nut_monitor_host" type="ip" mandatory="True">
+      <value>192.168.0.1</value>
+    </variable>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>no</param>
+      <target type="servicelist">test</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/70service_servicelist_ip/00-base.xml b/tests/dictionaries/70service_servicelist_ip/00-base.xml
index 0eee58a5b..fe7fe7483 100644
--- a/tests/dictionaries/70service_servicelist_ip/00-base.xml
+++ b/tests/dictionaries/70service_servicelist_ip/00-base.xml
@@ -1,24 +1,22 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <services>
-        <service name='test' servicelist="test">
-            <ip>nut_monitor_host</ip>
-        </service>
-    </services>
-    <variables>
-        <variable name="condition">
-            <value>no</value>
-        </variable>
-        <variable name="nut_monitor_host" type="ip" mandatory='True'>
-            <value>192.168.0.1</value>
-        </variable>
-    </variables>
-    <constraints>
-        <condition name="disabled_if_in" source="condition">
-            <param>no</param>
-            <target type="servicelist">test</target>
-        </condition>
-    </constraints>
+  <services>
+    <service name="test" servicelist="test">
+      <ip>nut_monitor_host</ip>
+    </service>
+  </services>
+  <variables>
+    <variable name="condition">
+      <value>no</value>
+    </variable>
+    <variable name="nut_monitor_host" type="ip" mandatory="True">
+      <value>192.168.0.1</value>
+    </variable>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>no</param>
+      <target type="servicelist">test</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/70service_servicelist_not_managed/00-base.xml b/tests/dictionaries/70service_servicelist_not_managed/00-base.xml
index f9fc0eb51..88e0e411b 100644
--- a/tests/dictionaries/70service_servicelist_not_managed/00-base.xml
+++ b/tests/dictionaries/70service_servicelist_not_managed/00-base.xml
@@ -1,22 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-
-    <services>
-        <service name='test' servicelist="test" manage="False">
+  <services>
+    <service name="test" servicelist="test" manage="False">
         </service>
-    </services>
-    <variables>
-        <variable name="condition">
-            <value>no</value>
-        </variable>
-    </variables>
-    <constraints>
-        <condition name="disabled_if_in" source="condition">
-            <param>yes</param>
-            <target type="servicelist">test</target>
-        </condition>
-    </constraints>
+  </services>
+  <variables>
+    <variable name="condition">
+      <value>no</value>
+    </variable>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>yes</param>
+      <target type="servicelist">test</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/70services_ip/00-base.xml b/tests/dictionaries/70services_ip/00-base.xml
index 6c06e3c61..69c6c09f0 100644
--- a/tests/dictionaries/70services_ip/00-base.xml
+++ b/tests/dictionaries/70services_ip/00-base.xml
@@ -1,18 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-
-    <services>
-        <service name='nut'>
-            <ip>nut_monitor_host</ip>
-        </service>
-    </services>
-
-    <variables>
-        <variable name="nut_monitor_host" type="ip" mandatory='True'>
-            <value>192.168.0.1</value>
-        </variable>
-    </variables>
+  <services>
+    <service name="nut">
+      <ip>nut_monitor_host</ip>
+    </service>
+  </services>
+  <variables>
+    <variable name="nut_monitor_host" type="ip" mandatory="True">
+      <value>192.168.0.1</value>
+    </variable>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/70services_ip_cidr/00-base.xml b/tests/dictionaries/70services_ip_cidr/00-base.xml
index 079b8bb1b..05fe70124 100644
--- a/tests/dictionaries/70services_ip_cidr/00-base.xml
+++ b/tests/dictionaries/70services_ip_cidr/00-base.xml
@@ -1,15 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <services>
-        <service name='nut'>
-            <ip>nut_monitor_host</ip>
-        </service>
-    </services>
-    <variables>
-        <variable name="nut_monitor_host" type="network_cidr" mandatory='True'>
-            <value>192.168.0.0/24</value>
-        </variable>
-    </variables>
+  <services>
+    <service name="nut">
+      <ip>nut_monitor_host</ip>
+    </service>
+  </services>
+  <variables>
+    <variable name="nut_monitor_host" type="network_cidr" mandatory="True">
+      <value>192.168.0.0/24</value>
+    </variable>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/70services_ip_disabled/00-base.xml b/tests/dictionaries/70services_ip_disabled/00-base.xml
index 6167071ba..5e39f5f0f 100644
--- a/tests/dictionaries/70services_ip_disabled/00-base.xml
+++ b/tests/dictionaries/70services_ip_disabled/00-base.xml
@@ -1,18 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-
-    <services>
-        <service name='nut'>
-            <ip>nut_monitor_host</ip>
-        </service>
-    </services>
-
-    <variables>
-        <variable name="nut_monitor_host" type="ip" mandatory='True' disabled="True">
-            <value>192.168.0.1</value>
-        </variable>
-    </variables>
+  <services>
+    <service name="nut">
+      <ip>nut_monitor_host</ip>
+    </service>
+  </services>
+  <variables>
+    <variable name="nut_monitor_host" type="ip" mandatory="True" disabled="True">
+      <value>192.168.0.1</value>
+    </variable>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/70services_ip_iplist/00-base.xml b/tests/dictionaries/70services_ip_iplist/00-base.xml
index 7e6bcd5a2..d3c5f4bc3 100644
--- a/tests/dictionaries/70services_ip_iplist/00-base.xml
+++ b/tests/dictionaries/70services_ip_iplist/00-base.xml
@@ -1,27 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <services>
-        <service name='nut'>
-            <ip iplist="example">nut_monitor_host</ip>
-        </service>
-    </services>
-    <variables>
-        <variable name="condition">
-            <value>no</value>
-        </variable>
-        <variable name="nut_monitor_host" type="network_cidr" mandatory='True'>
-            <value>192.168.0.0/24</value>
-        </variable>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_in" source="condition">
-            <param>yes</param>
-            <target type="iplist">example</target>
-            <target>nut_monitor_host</target>
-        </condition>
-    </constraints>
+  <services>
+    <service name="nut">
+      <ip iplist="example">nut_monitor_host</ip>
+    </service>
+  </services>
+  <variables>
+    <variable name="condition">
+      <value>no</value>
+    </variable>
+    <variable name="nut_monitor_host" type="network_cidr" mandatory="True">
+      <value>192.168.0.0/24</value>
+    </variable>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>yes</param>
+      <target type="iplist">example</target>
+      <target>nut_monitor_host</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/70services_ip_iplist2/00-base.xml b/tests/dictionaries/70services_ip_iplist2/00-base.xml
index f83760536..b98a78361 100644
--- a/tests/dictionaries/70services_ip_iplist2/00-base.xml
+++ b/tests/dictionaries/70services_ip_iplist2/00-base.xml
@@ -1,26 +1,22 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <services>
-        <service name='nut'>
-            <ip iplist="example">nut_monitor_host</ip>
-        </service>
-    </services>
-    <variables>
-        <variable name="condition">
-            <value>yes</value>
-        </variable>
-        <variable name="nut_monitor_host" type="network_cidr" mandatory='True'>
-            <value>192.168.0.0/24</value>
-        </variable>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_in" source="condition">
-            <param>yes</param>
-            <target type="iplist">example</target>
-        </condition>
-    </constraints>
+  <services>
+    <service name="nut">
+      <ip iplist="example">nut_monitor_host</ip>
+    </service>
+  </services>
+  <variables>
+    <variable name="condition">
+      <value>yes</value>
+    </variable>
+    <variable name="nut_monitor_host" type="network_cidr" mandatory="True">
+      <value>192.168.0.0/24</value>
+    </variable>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>yes</param>
+      <target type="iplist">example</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/70services_ip_leadership/00-base.xml b/tests/dictionaries/70services_ip_leadership/00-base.xml
index db5f119e9..3e45a5a3e 100644
--- a/tests/dictionaries/70services_ip_leadership/00-base.xml
+++ b/tests/dictionaries/70services_ip_leadership/00-base.xml
@@ -1,25 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <services>
-        <service name='ntp'>
-            <ip netmask='nut_monitor_netmask'>nut_monitor_host</ip>
-        </service>
-    </services>
-    <variables>
-        <family name="general" description="général">
-            <variable name="nut_monitor_netmask" type="netmask" mandatory='True' multi="True">
-                <value>255.255.255.0</value>
-            </variable>
-            <variable name="nut_monitor_host" type="network" mandatory='True'>
-                <value>192.168.1.0</value>
-            </variable>
-        </family>
-    </variables>
-    <constraints>
-        <group leader="nut_monitor_netmask">
-            <follower>nut_monitor_host</follower>
-        </group>
-    </constraints>
+  <services>
+    <service name="ntp">
+      <ip netmask="nut_monitor_netmask">nut_monitor_host</ip>
+    </service>
+  </services>
+  <variables>
+    <family name="general" description="général">
+      <variable name="nut_monitor_netmask" type="netmask" mandatory="True" multi="True">
+        <value>255.255.255.0</value>
+      </variable>
+      <variable name="nut_monitor_host" type="network" mandatory="True">
+        <value>192.168.1.0</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <group leader="nut_monitor_netmask">
+      <follower>nut_monitor_host</follower>
+    </group>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/70services_ip_multi/00-base.xml b/tests/dictionaries/70services_ip_multi/00-base.xml
index a3b5735b5..0861344eb 100644
--- a/tests/dictionaries/70services_ip_multi/00-base.xml
+++ b/tests/dictionaries/70services_ip_multi/00-base.xml
@@ -1,19 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-
-    <services>
-        <service name='nut'>
-            <ip>nut_monitor_host</ip>
-        </service>
-    </services>
-
-    <variables>
-        <variable name="nut_monitor_host" type="ip" mandatory='True' multi="True">
-            <value>192.168.0.1</value>
-            <value>192.168.0.2</value>
-        </variable>
-    </variables>
+  <services>
+    <service name="nut">
+      <ip>nut_monitor_host</ip>
+    </service>
+  </services>
+  <variables>
+    <variable name="nut_monitor_host" type="ip" mandatory="True" multi="True">
+      <value>192.168.0.1</value>
+      <value>192.168.0.2</value>
+    </variable>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/70services_ip_network/00-base.xml b/tests/dictionaries/70services_ip_network/00-base.xml
index ebe0e8dd1..b0c23c63b 100644
--- a/tests/dictionaries/70services_ip_network/00-base.xml
+++ b/tests/dictionaries/70services_ip_network/00-base.xml
@@ -1,21 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-
-    <services>
-        <service name='nut'>
-            <ip netmask='nut_monitor_netmask'>nut_monitor_host</ip>
-        </service>
-    </services>
-
-    <variables>
-        <variable name="nut_monitor_netmask" type="netmask" mandatory='True'>
-            <value>255.255.255.0</value>
-        </variable>
-        <variable name="nut_monitor_host" type="network" mandatory='True'>
-            <value>192.168.0.0</value>
-        </variable>
-    </variables>
+  <services>
+    <service name="nut">
+      <ip netmask="nut_monitor_netmask">nut_monitor_host</ip>
+    </service>
+  </services>
+  <variables>
+    <variable name="nut_monitor_netmask" type="netmask" mandatory="True">
+      <value>255.255.255.0</value>
+    </variable>
+    <variable name="nut_monitor_host" type="network" mandatory="True">
+      <value>192.168.0.0</value>
+    </variable>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/70services_ip_not_mandatory/00-base.xml b/tests/dictionaries/70services_ip_not_mandatory/00-base.xml
index 2f243aeeb..1fc47a1f4 100644
--- a/tests/dictionaries/70services_ip_not_mandatory/00-base.xml
+++ b/tests/dictionaries/70services_ip_not_mandatory/00-base.xml
@@ -1,14 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <services>
-        <service name='nut'>
-            <ip>nut_monitor_host</ip>
-        </service>
-    </services>
-    <variables>
-        <variable name="nut_monitor_host" type="ip"/>
-    </variables>
+  <services>
+    <service name="nut">
+      <ip>nut_monitor_host</ip>
+    </service>
+  </services>
+  <variables>
+    <variable name="nut_monitor_host" type="ip"/>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/70services_ip_twice/00-base.xml b/tests/dictionaries/70services_ip_twice/00-base.xml
index 16d6c77c2..94685e2f1 100644
--- a/tests/dictionaries/70services_ip_twice/00-base.xml
+++ b/tests/dictionaries/70services_ip_twice/00-base.xml
@@ -1,22 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-
-    <services>
-        <service name='nut'>
-            <ip>nut_monitor_host</ip>
-            <ip>nut_monitor_host2</ip>
-        </service>
-    </services>
-
-    <variables>
-        <variable name="nut_monitor_host" type="ip" mandatory='True'>
-            <value>192.168.0.1</value>
-        </variable>
-        <variable name="nut_monitor_host2" type="ip" mandatory='True'>
-            <value>192.168.0.2</value>
-        </variable>
-    </variables>
+  <services>
+    <service name="nut">
+      <ip>nut_monitor_host</ip>
+      <ip>nut_monitor_host2</ip>
+    </service>
+  </services>
+  <variables>
+    <variable name="nut_monitor_host" type="ip" mandatory="True">
+      <value>192.168.0.1</value>
+    </variable>
+    <variable name="nut_monitor_host2" type="ip" mandatory="True">
+      <value>192.168.0.2</value>
+    </variable>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80auto_family/00-base.xml b/tests/dictionaries/80auto_family/00-base.xml
index 3a4dcc7e9..d0783207a 100644
--- a/tests/dictionaries/80auto_family/00-base.xml
+++ b/tests/dictionaries/80auto_family/00-base.xml
@@ -1,18 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="variable" type="string" description="No change">
-                <value>no</value>
-            </variable>
-        </family>
-    </variables>
-    <constraints>
-        <fill name="calc_val">
-            <param>oui</param>
-            <target type="family">general</target>
-        </fill>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="variable" type="string" description="No change">
+        <value>no</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param>oui</param>
+      <target type="family">general</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80check_unknown/00-base.xml b/tests/dictionaries/80check_unknown/00-base.xml
index 56c314c18..6dec73cf3 100644
--- a/tests/dictionaries/80check_unknown/00-base.xml
+++ b/tests/dictionaries/80check_unknown/00-base.xml
@@ -1,21 +1,18 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>b</value>
-            </variable>
-            <variable name="int" type="number" description="No change"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="unknown">
-            <param name="mini">0</param>
-            <param name="maxi">100</param>
-            <target>int</target>
-        </check>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>b</value>
+      </variable>
+      <variable name="int" type="number" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="unknown">
+      <param name="mini">0</param>
+      <param name="maxi">100</param>
+      <target>int</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80check_unknown_var/00-base.xml b/tests/dictionaries/80check_unknown_var/00-base.xml
index 0ee17772e..3f55a4894 100644
--- a/tests/dictionaries/80check_unknown_var/00-base.xml
+++ b/tests/dictionaries/80check_unknown_var/00-base.xml
@@ -1,20 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>b</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_differ">
-            <param type="variable">int3</param>
-            <target>mode_conteneur_actif</target>
-        </check>
-
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>b</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_differ">
+      <param type="variable">int3</param>
+      <target>mode_conteneur_actif</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80check_without_target/00-base.xml b/tests/dictionaries/80check_without_target/00-base.xml
index 32dbf8473..26737bf76 100644
--- a/tests/dictionaries/80check_without_target/00-base.xml
+++ b/tests/dictionaries/80check_without_target/00-base.xml
@@ -1,20 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>b</value>
-            </variable>
-            <variable name="int" type="number" description="No change"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_entier">
-            <param name="mini">0</param>
-            <param name="maxi">100</param>
-        </check>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>b</value>
+      </variable>
+      <variable name="int" type="number" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_entier">
+      <param name="mini">0</param>
+      <param name="maxi">100</param>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80condition_itself/00-base.xml b/tests/dictionaries/80condition_itself/00-base.xml
index cec7d54fc..63ca1d570 100644
--- a/tests/dictionaries/80condition_itself/00-base.xml
+++ b/tests/dictionaries/80condition_itself/00-base.xml
@@ -1,16 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="test">
-            <variable name="replicationtype" description="replicationType"/>
-        </family>
-    </variables>
-    <constraints>
-        <condition name="disabled_if_in" source="replicationtype">
-            <param>leader-leader</param>
-            <target type="variable">replicationType</target>
-        </condition>
-    </constraints>
+  <variables>
+    <family name="test">
+      <variable name="replicationtype" description="replicationType"/>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="replicationtype">
+      <param>leader-leader</param>
+      <target type="variable">replicationType</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80condition_not_exists_error/00-base.xml b/tests/dictionaries/80condition_not_exists_error/00-base.xml
index 68ee48565..16c72b8c0 100644
--- a/tests/dictionaries/80condition_not_exists_error/00-base.xml
+++ b/tests/dictionaries/80condition_not_exists_error/00-base.xml
@@ -1,19 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="condition" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="hidden_if_in" source="condition">
-            <param>oui</param>
-            <target type="family">notexists</target>
-        </condition>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="hidden_if_in" source="condition">
+      <param>oui</param>
+      <target type="family">notexists</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80condition_not_exists_error_var/00-base.xml b/tests/dictionaries/80condition_not_exists_error_var/00-base.xml
index 0780b0374..1062bfdd4 100644
--- a/tests/dictionaries/80condition_not_exists_error_var/00-base.xml
+++ b/tests/dictionaries/80condition_not_exists_error_var/00-base.xml
@@ -1,19 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="condition" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="hidden_if_in" source="condition">
-            <param>oui</param>
-            <target>notexists</target>
-        </condition>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="hidden_if_in" source="condition">
+      <param>oui</param>
+      <target>notexists</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80condition_without_target/00-base.xml b/tests/dictionaries/80condition_without_target/00-base.xml
index cea032709..e8f86ab8d 100644
--- a/tests/dictionaries/80condition_without_target/00-base.xml
+++ b/tests/dictionaries/80condition_without_target/00-base.xml
@@ -1,27 +1,24 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="condition" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif1" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition optional="True" name="disabled_if_in" source="condition">
-            <param>oui</param>
-        </condition>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition optional="True" name="disabled_if_in" source="condition">
+      <param>oui</param>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80container_files_symlink_without_source/00-base.xml b/tests/dictionaries/80container_files_symlink_without_source/00-base.xml
index 2b582d740..bffa2f11d 100644
--- a/tests/dictionaries/80container_files_symlink_without_source/00-base.xml
+++ b/tests/dictionaries/80container_files_symlink_without_source/00-base.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <services> 
-        <service name='test'>
-            <file file_type="variable">file_name</file>
-        </service>
-    </services>
-    <variables>
-        <family name='general' description="général">
-            <variable name='mode_conteneur_actif' type='string' description="No change" hidden="True">
-                <value>oui</value>
-            </variable>
-            <variable name='file_name' type='string'>
-                <value>/etc/mailname</value>
-            </variable>
-        </family>
-    </variables>
+  <services>
+    <service name="test">
+      <file file_type="variable">file_name</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>oui</value>
+      </variable>
+      <variable name="file_name" type="string">
+        <value>/etc/mailname</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/80container_filesredefine_error/00-base.xml b/tests/dictionaries/80container_filesredefine_error/00-base.xml
index 2bdfa0293..7a9c4c735 100644
--- a/tests/dictionaries/80container_filesredefine_error/00-base.xml
+++ b/tests/dictionaries/80container_filesredefine_error/00-base.xml
@@ -1,17 +1,15 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <services> 
-        <service name="test">
-            <file>/etc/mailname</file>
-        </service>
-    </services>
-    <variables>
-        <family name='general' description="général">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>oui</value>
-            </variable>
-        </family>
-    </variables>
+  <services>
+    <service name="test">
+      <file>/etc/mailname</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>oui</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80container_filesredefine_error/01-base.xml b/tests/dictionaries/80container_filesredefine_error/01-base.xml
index da88e9500..439c85099 100644
--- a/tests/dictionaries/80container_filesredefine_error/01-base.xml
+++ b/tests/dictionaries/80container_filesredefine_error/01-base.xml
@@ -1,10 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <services> 
-        <service name="test">
-            <file source="mailname.new">/etc/mailname</file>
-        </service>
-    </services>
+  <services>
+    <service name="test">
+      <file source="mailname.new">/etc/mailname</file>
+    </service>
+  </services>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80empty_param_number/00_base.xml b/tests/dictionaries/80empty_param_number/00_base.xml
index ec51ecd94..94e1bed4e 100644
--- a/tests/dictionaries/80empty_param_number/00_base.xml
+++ b/tests/dictionaries/80empty_param_number/00_base.xml
@@ -1,19 +1,18 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="toto1" type="port" description="Port d'écoute du proxy" mode="expert">
+  <variables>
+    <family name="general">
+      <variable name="toto1" type="port" description="Port d'écoute du proxy" mode="expert">
             </variable>
-            <variable name="toto2" type="port" description="Port d'écoute du proxy NTLM" mode="expert">
-                <value>3127</value>
-            </variable>
-        </family>
-    </variables>
-    <constraints>
-        <fill name="calc_multi_condition">
-	    <param name="value" type="number"/>
-	    <target>toto1</target>
-        </fill>
-    </constraints>
-
+      <variable name="toto2" type="port" description="Port d'écoute du proxy NTLM" mode="expert">
+        <value>3127</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_multi_condition">
+      <param name="value" type="number"/>
+      <target>toto1</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/80empty_typeeole_eole/00_base.xml b/tests/dictionaries/80empty_typeeole_eole/00_base.xml
index 306c2d0be..af5b8f67c 100644
--- a/tests/dictionaries/80empty_typeeole_eole/00_base.xml
+++ b/tests/dictionaries/80empty_typeeole_eole/00_base.xml
@@ -1,25 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <services/>
-
-    <variables>
-        <family name="general">
-            <variable name="toto1" type="port" description="Port d'écoute du proxy" mode="expert">
+  <services/>
+  <variables>
+    <family name="general">
+      <variable name="toto1" type="port" description="Port d'écoute du proxy" mode="expert">
             </variable>
-            <variable name="toto2" type="port" description="Port d'écoute du proxy NTLM" mode="expert">
-                <value>3127</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_multi_condition">
-            <param>non</param>
-            <param type="variable" name="condition_1" propertyerror="True"/>
-            <param name="match">3128</param>
-            <param name="mismatch" type="variable" propertyerror="True">toto2</param>
-	    <target>toto1</target>
-        </fill>
-    </constraints>
-
+      <variable name="toto2" type="port" description="Port d'écoute du proxy NTLM" mode="expert">
+        <value>3127</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_multi_condition">
+      <param>non</param>
+      <param type="variable" name="condition_1" propertyerror="True"/>
+      <param name="match">3128</param>
+      <param name="mismatch" type="variable" propertyerror="True">toto2</param>
+      <target>toto1</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/80empty_typeeole_number/00_base.xml b/tests/dictionaries/80empty_typeeole_number/00_base.xml
index 41cc206a1..66f4a2246 100644
--- a/tests/dictionaries/80empty_typeeole_number/00_base.xml
+++ b/tests/dictionaries/80empty_typeeole_number/00_base.xml
@@ -1,19 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <variable name="toto1" type="port" description="Port d'écoute du proxy" mode="expert">
+  <variables>
+    <variable name="toto1" type="port" description="Port d'écoute du proxy" mode="expert">
         </variable>
-        <variable name="toto2" type="port" description="Port d'écoute du proxy NTLM" mode="expert">
-            <value>3127</value>
-        </variable>
-    </variables>
-    <constraints>
-        <fill name="calc_multi_condition">
-            <param>non</param>
-            <param type="number" name="condition_2" propertyerror="True"/>
-            <param name="match">3128</param>
-            <param name="mismatch" type="variable" propertyerror="True">toto2</param>
-            <target>toto1</target>
-        </fill>
-    </constraints>
+    <variable name="toto2" type="port" description="Port d'écoute du proxy NTLM" mode="expert">
+      <value>3127</value>
+    </variable>
+  </variables>
+  <constraints>
+    <fill name="calc_multi_condition">
+      <param>non</param>
+      <param type="number" name="condition_2" propertyerror="True"/>
+      <param name="match">3128</param>
+      <param name="mismatch" type="variable" propertyerror="True">toto2</param>
+      <target>toto1</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/80extra_externalspaceauto/00-base.xml b/tests/dictionaries/80extra_externalspaceauto/00-base.xml
index 0217e0ffb..172b74634 100644
--- a/tests/dictionaries/80extra_externalspaceauto/00-base.xml
+++ b/tests/dictionaries/80extra_externalspaceauto/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general" description="général">
-            <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general" description="général">
+      <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80extra_externalspaceauto/extra_dirs/extra/00-base.xml b/tests/dictionaries/80extra_externalspaceauto/extra_dirs/extra/00-base.xml
index 2f0455bfc..e5eb20f02 100644
--- a/tests/dictionaries/80extra_externalspaceauto/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/80extra_externalspaceauto/extra_dirs/extra/00-base.xml
@@ -1,17 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name='ejabberd'>
-            <variable name="description" type="string">
-                <value>Exportation de la base de ejabberd</value>
-            </variable>
-            <variable name="day" type="schedule"></variable>
-            <variable name="mode" type="schedulemod">
-                <value>pre</value>
-            </variable>
-        </family>
-    </variables>
-    <constraints>
+  <variables>
+    <family name="ejabberd">
+      <variable name="description" type="string">
+        <value>Exportation de la base de ejabberd</value>
+      </variable>
+      <variable name="day" type="schedule"/>
+      <variable name="mode" type="schedulemod">
+        <value>pre</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
     </constraints>
 </rougail>
diff --git a/tests/dictionaries/80extra_externalspaceauto/extra_dirs/extra1/00-base.xml b/tests/dictionaries/80extra_externalspaceauto/extra_dirs/extra1/00-base.xml
index a45c34429..3fe35d767 100644
--- a/tests/dictionaries/80extra_externalspaceauto/extra_dirs/extra1/00-base.xml
+++ b/tests/dictionaries/80extra_externalspaceauto/extra_dirs/extra1/00-base.xml
@@ -1,20 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name='external'>
-            <variable name="description" type="string">
-                <value>test</value>
-            </variable>
-        </family>
-    </variables>
-    <constraints>
-        <fill name='calc_multi_condition'>
-            <param>non</param>
-            <param type='variable' name='condition_1'>extra.ejabberd.day</param>
-            <param name='match'>none</param>
-            <param name='mismatch'>daily</param>
-	    <target>extra1.external.description</target>
-        </fill>
-    </constraints>
+  <variables>
+    <family name="external">
+      <variable name="description" type="string">
+        <value>test</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_multi_condition">
+      <param>non</param>
+      <param type="variable" name="condition_1">extra.ejabberd.day</param>
+      <param name="match">none</param>
+      <param name="mismatch">daily</param>
+      <target>extra1.external.description</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/80extra_externalspacecondition2/00-base.xml b/tests/dictionaries/80extra_externalspacecondition2/00-base.xml
index 0217e0ffb..172b74634 100644
--- a/tests/dictionaries/80extra_externalspacecondition2/00-base.xml
+++ b/tests/dictionaries/80extra_externalspacecondition2/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general" description="général">
-            <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general" description="général">
+      <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80extra_externalspacecondition2/extra_dirs/extra/00-base.xml b/tests/dictionaries/80extra_externalspacecondition2/extra_dirs/extra/00-base.xml
index 2f0455bfc..e5eb20f02 100644
--- a/tests/dictionaries/80extra_externalspacecondition2/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/80extra_externalspacecondition2/extra_dirs/extra/00-base.xml
@@ -1,17 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name='ejabberd'>
-            <variable name="description" type="string">
-                <value>Exportation de la base de ejabberd</value>
-            </variable>
-            <variable name="day" type="schedule"></variable>
-            <variable name="mode" type="schedulemod">
-                <value>pre</value>
-            </variable>
-        </family>
-    </variables>
-    <constraints>
+  <variables>
+    <family name="ejabberd">
+      <variable name="description" type="string">
+        <value>Exportation de la base de ejabberd</value>
+      </variable>
+      <variable name="day" type="schedule"/>
+      <variable name="mode" type="schedulemod">
+        <value>pre</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
     </constraints>
 </rougail>
diff --git a/tests/dictionaries/80extra_externalspacecondition2/extra_dirs/extra1/00-base.xml b/tests/dictionaries/80extra_externalspacecondition2/extra_dirs/extra1/00-base.xml
index ece8e1a79..e51651d33 100644
--- a/tests/dictionaries/80extra_externalspacecondition2/extra_dirs/extra1/00-base.xml
+++ b/tests/dictionaries/80extra_externalspacecondition2/extra_dirs/extra1/00-base.xml
@@ -1,17 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name='external'>
-            <variable name="description" type="string">
-                <value>test</value>
-            </variable>
-        </family>
-    </variables>
-    <constraints>
-        <condition name ='disabled_if_in' source='extra1.external.description'>
-            <param>non</param>
-            <target type='family'>extra.ejabberd</target>
-        </condition>
-    </constraints>
+  <variables>
+    <family name="external">
+      <variable name="description" type="string">
+        <value>test</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="extra1.external.description">
+      <param>non</param>
+      <target type="family">extra.ejabberd</target>
+    </condition>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/80extra_externalspacecondition3/00-base.xml b/tests/dictionaries/80extra_externalspacecondition3/00-base.xml
index 0217e0ffb..172b74634 100644
--- a/tests/dictionaries/80extra_externalspacecondition3/00-base.xml
+++ b/tests/dictionaries/80extra_externalspacecondition3/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general" description="général">
-            <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general" description="général">
+      <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80extra_externalspacecondition3/extra_dirs/extra/00-base.xml b/tests/dictionaries/80extra_externalspacecondition3/extra_dirs/extra/00-base.xml
index b02206e1a..a8fe29c8c 100644
--- a/tests/dictionaries/80extra_externalspacecondition3/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/80extra_externalspacecondition3/extra_dirs/extra/00-base.xml
@@ -1,17 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name='external'>
-            <variable name="description" type="string">
-                <value>test</value>
-            </variable>
-        </family>
-    </variables>
-    <constraints>
-        <condition name ='disabled_if_in' source='extra1.external.description'>
-            <param>non</param>
-            <target type='family'>general</target>
-        </condition>
-    </constraints>
+  <variables>
+    <family name="external">
+      <variable name="description" type="string">
+        <value>test</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="extra1.external.description">
+      <param>non</param>
+      <target type="family">general</target>
+    </condition>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/80extra_rougail/00-base.xml b/tests/dictionaries/80extra_rougail/00-base.xml
index d8b5f8f0f..88bab8ca4 100644
--- a/tests/dictionaries/80extra_rougail/00-base.xml
+++ b/tests/dictionaries/80extra_rougail/00-base.xml
@@ -1,15 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80extra_rougail/extra_dirs/rougail/00-base.xml b/tests/dictionaries/80extra_rougail/extra_dirs/rougail/00-base.xml
index cae3048d4..c93971917 100644
--- a/tests/dictionaries/80extra_rougail/extra_dirs/rougail/00-base.xml
+++ b/tests/dictionaries/80extra_rougail/extra_dirs/rougail/00-base.xml
@@ -1,24 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name='ejabberd'>
-            <variable name="description" type="string">
-                <value>Exportation de la base de ejabberd</value>
-            </variable>
-            <variable name="day" type="schedule"></variable>
-            <variable name="mode" type="schedulemod">
-                <value>pre</value>
-            </variable>
-        </family>
-    </variables>
-    <constraints>
-        <fill name='calc_multi_condition'>
-            <param>non</param>
-            <param type='variable' name='condition_1' propertyerror='True'>activer_ejabberd</param>
-            <param name='match'>none</param>
-            <param name='mismatch'>daily</param>
-	    <target>extra.ejabberd.day</target>
-        </fill>
-    </constraints>
+  <variables>
+    <family name="ejabberd">
+      <variable name="description" type="string">
+        <value>Exportation de la base de ejabberd</value>
+      </variable>
+      <variable name="day" type="schedule"/>
+      <variable name="mode" type="schedulemod">
+        <value>pre</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_multi_condition">
+      <param>non</param>
+      <param type="variable" name="condition_1" propertyerror="True">activer_ejabberd</param>
+      <param name="match">none</param>
+      <param name="mismatch">daily</param>
+      <target>extra.ejabberd.day</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/80extra_services/00-base.xml b/tests/dictionaries/80extra_services/00-base.xml
index d8b5f8f0f..88bab8ca4 100644
--- a/tests/dictionaries/80extra_services/00-base.xml
+++ b/tests/dictionaries/80extra_services/00-base.xml
@@ -1,15 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80extra_services/extra_dirs/services/00-base.xml b/tests/dictionaries/80extra_services/extra_dirs/services/00-base.xml
index ac0557b08..a11e423b2 100644
--- a/tests/dictionaries/80extra_services/extra_dirs/services/00-base.xml
+++ b/tests/dictionaries/80extra_services/extra_dirs/services/00-base.xml
@@ -1,24 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name='ejabberd'>
-            <variable name="description" type="string">
-                <value>Exportation de la base de ejabberd</value>
-            </variable>
-            <variable name="day" type="schedule"></variable>
-            <variable name="mode" type="schedulemod">
-                <value>pre</value>
-            </variable>
-        </family>
-    </variables>
-    <constraints>
-        <fill name='calc_multi_condition'>
-            <param>non</param>
-            <param type='variable' name='condition_1' propertyerror='False'>activer_ejabberd</param>
-            <param name='match'>none</param>
-            <param name='mismatch'>daily</param>
-	    <target>extra.ejabberd.day</target>
-        </fill>
-    </constraints>
+  <variables>
+    <family name="ejabberd">
+      <variable name="description" type="string">
+        <value>Exportation de la base de ejabberd</value>
+      </variable>
+      <variable name="day" type="schedule"/>
+      <variable name="mode" type="schedulemod">
+        <value>pre</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_multi_condition">
+      <param>non</param>
+      <param type="variable" name="condition_1" propertyerror="False">activer_ejabberd</param>
+      <param name="match">none</param>
+      <param name="mismatch">daily</param>
+      <target>extra.ejabberd.day</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/80family_appendaccent/00-base.xml b/tests/dictionaries/80family_appendaccent/00-base.xml
index eea45200a..4d4f6bda7 100644
--- a/tests/dictionaries/80family_appendaccent/00-base.xml
+++ b/tests/dictionaries/80family_appendaccent/00-base.xml
@@ -1,24 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="Général">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="Other">
-            <variable name="mode_conteneur_actif3" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_in" source="mode_conteneur_actif3">
-            <param>non</param>
-            <target type="variable">mode_conteneur_actif</target>
-        </condition>
-    </constraints>
+  <variables>
+    <family name="Général">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="Other">
+      <variable name="mode_conteneur_actif3" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="mode_conteneur_actif3">
+      <param>non</param>
+      <target type="variable">mode_conteneur_actif</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80family_appendaccent/01-base.xml b/tests/dictionaries/80family_appendaccent/01-base.xml
index b31afe125..470481fb5 100644
--- a/tests/dictionaries/80family_appendaccent/01-base.xml
+++ b/tests/dictionaries/80family_appendaccent/01-base.xml
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="Général">
-            <variable name="mode_conteneur_actif1" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="Général">
+      <variable name="mode_conteneur_actif1" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/80family_appendaccent/02-base.xml b/tests/dictionaries/80family_appendaccent/02-base.xml
index 81155361f..a5fa78a92 100644
--- a/tests/dictionaries/80family_appendaccent/02-base.xml
+++ b/tests/dictionaries/80family_appendaccent/02-base.xml
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/80family_change/00-base.xml b/tests/dictionaries/80family_change/00-base.xml
index 2c7fbadac..b98127645 100644
--- a/tests/dictionaries/80family_change/00-base.xml
+++ b/tests/dictionaries/80family_change/00-base.xml
@@ -1,15 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif1" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80family_change/01-base.xml b/tests/dictionaries/80family_change/01-base.xml
index 330752a12..362cc6b4a 100644
--- a/tests/dictionaries/80family_change/01-base.xml
+++ b/tests/dictionaries/80family_change/01-base.xml
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="other">
-            <variable name="mode_conteneur_actif1" redefine="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="other">
+      <variable name="mode_conteneur_actif1" redefine="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/80family_dynamic_calc_invalid_suffix/00-base.xml b/tests/dictionaries/80family_dynamic_calc_invalid_suffix/00-base.xml
index 7fbdd5465..776efdf40 100644
--- a/tests/dictionaries/80family_dynamic_calc_invalid_suffix/00-base.xml
+++ b/tests/dictionaries/80family_dynamic_calc_invalid_suffix/00-base.xml
@@ -1,26 +1,25 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name='general'>
-            <variable name='varname' type='string' description="No change" multi="True">
-                <value>val1</value>
-                <value>val2</value>
-            </variable>
-        </family>
-        <family name='dyn' dynamic="varname">
-            <variable name='vardyn' type='string' description="No change">
-                <value>val</value>
-            </variable>
-        </family>
-        <family name='new'>
-            <variable name='newvar' type='string' description="No change"/>
-        </family>
-    </variables>
-    <constraints>
-        <fill name="calc_val">
-            <param type="suffix">unknown</param>
-	    <target>vardyn</target>
-        </fill>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="varname" type="string" description="No change" multi="True">
+        <value>val1</value>
+        <value>val2</value>
+      </variable>
+    </family>
+    <family name="dyn" dynamic="varname">
+      <variable name="vardyn" type="string" description="No change">
+        <value>val</value>
+      </variable>
+    </family>
+    <family name="new">
+      <variable name="newvar" type="string" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="suffix">unknown</param>
+      <target>vardyn</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/80family_dynamic_check/00-base.xml b/tests/dictionaries/80family_dynamic_check/00-base.xml
index 5136eadf8..d27806e94 100644
--- a/tests/dictionaries/80family_dynamic_check/00-base.xml
+++ b/tests/dictionaries/80family_dynamic_check/00-base.xml
@@ -1,22 +1,21 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name='general'>
-            <variable name='varname' type='string' description="No change" multi="True">
-                <value>val1</value>
-                <value>val2</value>
-            </variable>
-        </family>
-        <family name='dyn' dynamic="varname">
-            <variable name='vardyn' type='number' description="No change"/>
-        </family>
-    </variables>
-    <constraints>
-        <check name="valid_entier">
-            <param name="mini" type="number">0</param>
-            <param name="maxi" type="number">100</param>
-            <target>vardynval1</target>
-        </check>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="varname" type="string" description="No change" multi="True">
+        <value>val1</value>
+        <value>val2</value>
+      </variable>
+    </family>
+    <family name="dyn" dynamic="varname">
+      <variable name="vardyn" type="number" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_entier">
+      <param name="mini" type="number">0</param>
+      <param name="maxi" type="number">100</param>
+      <target>vardynval1</target>
+    </check>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/80family_dynamic_not_multi/00-base.xml b/tests/dictionaries/80family_dynamic_not_multi/00-base.xml
index fa5248645..2c2f7f2e7 100644
--- a/tests/dictionaries/80family_dynamic_not_multi/00-base.xml
+++ b/tests/dictionaries/80family_dynamic_not_multi/00-base.xml
@@ -1,14 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name='general'>
-            <variable name='varname' type='string' description="No change">
-                <value>val1</value>
-            </variable>
-        </family>
-        <family name='dyn' dynamic="varname">
-            <variable name='vardyn' type='string' description="No change"/>
-        </family>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="varname" type="string" description="No change">
+        <value>val1</value>
+      </variable>
+    </family>
+    <family name="dyn" dynamic="varname">
+      <variable name="vardyn" type="string" description="No change"/>
+    </family>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/80family_dynamic_with_family/00-base.xml b/tests/dictionaries/80family_dynamic_with_family/00-base.xml
index b5de9b92f..bd2842d62 100644
--- a/tests/dictionaries/80family_dynamic_with_family/00-base.xml
+++ b/tests/dictionaries/80family_dynamic_with_family/00-base.xml
@@ -1,16 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name='general'>
-            <variable name='varname' type='string' description="No change" multi="True">
-                <value>val1</value>
-                <value>val2</value>
-            </variable>
-        </family>
-        <family name='dyn' dynamic="varname">
-            <variable name='vardyn' type='string' description="No change"/>
-	    <family name="my_family"/>
-        </family>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="varname" type="string" description="No change" multi="True">
+        <value>val1</value>
+        <value>val2</value>
+      </variable>
+    </family>
+    <family name="dyn" dynamic="varname">
+      <variable name="vardyn" type="string" description="No change"/>
+      <family name="my_family"/>
+    </family>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/80family_not_dynamic_calc_suffix/00-base.xml b/tests/dictionaries/80family_not_dynamic_calc_suffix/00-base.xml
index 4e9f0861c..25cc4f33d 100644
--- a/tests/dictionaries/80family_not_dynamic_calc_suffix/00-base.xml
+++ b/tests/dictionaries/80family_not_dynamic_calc_suffix/00-base.xml
@@ -1,26 +1,25 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name='general'>
-            <variable name='varname' type='string' description="No change" multi="True">
-                <value>val1</value>
-                <value>val2</value>
-            </variable>
-        </family>
-        <family name='dyn' dynamic="varname">
-            <variable name='vardyn' type='string' description="No change">
-                <value>val</value>
-            </variable>
-        </family>
-        <family name='new'>
-            <variable name='newvar' type='string' description="No change"/>
-        </family>
-    </variables>
-    <constraints>
-        <fill name="calc_val">
-            <param type="suffix"/>
-	    <target>newvar</target>
-        </fill>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="varname" type="string" description="No change" multi="True">
+        <value>val1</value>
+        <value>val2</value>
+      </variable>
+    </family>
+    <family name="dyn" dynamic="varname">
+      <variable name="vardyn" type="string" description="No change">
+        <value>val</value>
+      </variable>
+    </family>
+    <family name="new">
+      <variable name="newvar" type="string" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="suffix"/>
+      <target>newvar</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/80family_only_on_suffix/00-base.xml b/tests/dictionaries/80family_only_on_suffix/00-base.xml
index 65816e5ff..7c16afaba 100644
--- a/tests/dictionaries/80family_only_on_suffix/00-base.xml
+++ b/tests/dictionaries/80family_only_on_suffix/00-base.xml
@@ -1,21 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name='general'>
-            <variable name='varname' type='string' description="No change" multi="True">
-                <value>val1</value>
-                <value>val2</value>
-            </variable>
-        </family>
-        <family name='dyn' dynamic="varname">
-            <variable name='vardyn' type='string' description="No change"/>
-        </family>
-    </variables>
-    <constraints>
-        <fill name="calc_val">
-            <param>value</param>
-	    <target>vardynval1</target>
-        </fill>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="varname" type="string" description="No change" multi="True">
+        <value>val1</value>
+        <value>val2</value>
+      </variable>
+    </family>
+    <family name="dyn" dynamic="varname">
+      <variable name="vardyn" type="string" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param>value</param>
+      <target>vardynval1</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/80family_several/00-base.xml b/tests/dictionaries/80family_several/00-base.xml
index d53f23048..f2d390cdb 100644
--- a/tests/dictionaries/80family_several/00-base.xml
+++ b/tests/dictionaries/80family_several/00-base.xml
@@ -1,30 +1,29 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="general">
-            <variable name="leader" type="string" description="leader" multi="True"/>
-            <variable name="follower1" type="string" description="follower1" multi="True"/>
-            <variable name="follower2" type="string" description="follower2" multi="True"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param name="valeur">valfill</param>
-	    <target>follower1</target>
-        </fill>
-        <fill name="calc_val">
-            <param type="variable">follower1</param>
-	    <target>follower2</target>
-        </fill>
-        <group leader="leader">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="general">
+      <variable name="leader" type="string" description="leader" multi="True"/>
+      <variable name="follower1" type="string" description="follower1" multi="True"/>
+      <variable name="follower2" type="string" description="follower2" multi="True"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valfill</param>
+      <target>follower1</target>
+    </fill>
+    <fill name="calc_val">
+      <param type="variable">follower1</param>
+      <target>follower2</target>
+    </fill>
+    <group leader="leader">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+    </group>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/80family_unique/00-base.xml b/tests/dictionaries/80family_unique/00-base.xml
index d4a6768cd..6c84ee8b3 100644
--- a/tests/dictionaries/80family_unique/00-base.xml
+++ b/tests/dictionaries/80family_unique/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <family name="general">
-                <variable name="my_variable"/>
-            </family>
-        </family>
-    </variables>
+  <variables>
+    <family name="general">
+      <family name="general">
+        <variable name="my_variable"/>
+      </family>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80family_variable_not_same_name/00-base.xml b/tests/dictionaries/80family_variable_not_same_name/00-base.xml
index 6d300ef66..1e3b51350 100644
--- a/tests/dictionaries/80family_variable_not_same_name/00-base.xml
+++ b/tests/dictionaries/80family_variable_not_same_name/00-base.xml
@@ -1,11 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="my_variable2"/>
-        </family>
-        <variable name="general"/>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="my_variable2"/>
+    </family>
+    <variable name="general"/>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80familyaction_accent/00-base.xml b/tests/dictionaries/80familyaction_accent/00-base.xml
index fe0ee5477..af8b3e8b7 100644
--- a/tests/dictionaries/80familyaction_accent/00-base.xml
+++ b/tests/dictionaries/80familyaction_accent/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="général">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80familyaction_accent/extra_dirs/extra/00-base.xml b/tests/dictionaries/80familyaction_accent/extra_dirs/extra/00-base.xml
index 03e2ed734..9fcc64782 100644
--- a/tests/dictionaries/80familyaction_accent/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/80familyaction_accent/extra_dirs/extra/00-base.xml
@@ -1,9 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="test">	
-            <variable name="delay" type="number" description="délai en minutes avant lancement">
-                <value>0</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="test">
+      <variable name="delay" type="number" description="délai en minutes avant lancement">
+        <value>0</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/80file_wrong_type/00-base.xml b/tests/dictionaries/80file_wrong_type/00-base.xml
index 41f2f638a..951c7b558 100644
--- a/tests/dictionaries/80file_wrong_type/00-base.xml
+++ b/tests/dictionaries/80file_wrong_type/00-base.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <services> 
-        <service name='test'>
-            <file file_type="variable" source="mailname">file_name</file>
-        </service>
-    </services>
-    <variables>
-        <variable name='file_name' type='string'>
-            <value>/etc/mailname</value>
-        </variable>
-    </variables>
+  <services>
+    <service name="test">
+      <file file_type="variable" source="mailname">file_name</file>
+    </service>
+  </services>
+  <variables>
+    <variable name="file_name" type="string">
+      <value>/etc/mailname</value>
+    </variable>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/80fill_baseaccent/00-base.xml b/tests/dictionaries/80fill_baseaccent/00-base.xml
index 03c8dd40d..c7e307fb6 100644
--- a/tests/dictionaries/80fill_baseaccent/00-base.xml
+++ b/tests/dictionaries/80fill_baseaccent/00-base.xml
@@ -1,22 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="Général">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif1" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param type="variable">mode_conteneur_actif1</param>
-            <target>mode_conteneur_actif</target>
-        </fill>
-    </constraints>
+  <variables>
+    <family name="Général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="variable">mode_conteneur_actif1</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80fill_error/00-base.xml b/tests/dictionaries/80fill_error/00-base.xml
index def2932e9..211dd395f 100644
--- a/tests/dictionaries/80fill_error/00-base.xml
+++ b/tests/dictionaries/80fill_error/00-base.xml
@@ -1,24 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param name="valeur">valeur</param>
-            <target>mode_conteneur_actif</target>
-        </fill>
-        <fill name="calc_val">
-            <param name="valeur">valeur2</param>
-            <target>mode_conteneur_actif</target>
-        </fill>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valeur</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+    <fill name="calc_val">
+      <param name="valeur">valeur2</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80fill_multi/00-base.xml b/tests/dictionaries/80fill_multi/00-base.xml
index 9606cc8c1..64dc527aa 100644
--- a/tests/dictionaries/80fill_multi/00-base.xml
+++ b/tests/dictionaries/80fill_multi/00-base.xml
@@ -1,26 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif1" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param>value</param>
-            <target>mode_conteneur_actif</target>
-        </fill>
-        <fill name="calc_val">
-            <param name="variable">mode_conteneur_actif1</param>
-            <target>mode_conteneur_actif</target>
-        </fill>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param>value</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+    <fill name="calc_val">
+      <param name="variable">mode_conteneur_actif1</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80fill_not_exists/00-base.xml b/tests/dictionaries/80fill_not_exists/00-base.xml
index 131e69d6d..fdbb69388 100644
--- a/tests/dictionaries/80fill_not_exists/00-base.xml
+++ b/tests/dictionaries/80fill_not_exists/00-base.xml
@@ -1,24 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif1" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param type="variable">mode_conteneur_actif4</param>
-            <param type="variable">mode_conteneur_actif1</param>
-            <param type="variable" optional="True">mode_conteneur_actif3</param>
-            <target>mode_conteneur_actif</target>
-        </fill>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="variable">mode_conteneur_actif4</param>
+      <param type="variable">mode_conteneur_actif1</param>
+      <param type="variable" optional="True">mode_conteneur_actif3</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80fill_unknown_function/00-base.xml b/tests/dictionaries/80fill_unknown_function/00-base.xml
index 652dfb870..be0452e30 100644
--- a/tests/dictionaries/80fill_unknown_function/00-base.xml
+++ b/tests/dictionaries/80fill_unknown_function/00-base.xml
@@ -1,20 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change"/>
-            <variable name="mode_conteneur_actif1" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="unknown_function">
-            <param type="variable">mode_conteneur_actif1</param>
-            <target>mode_conteneur_actif</target>
-        </fill>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change"/>
+      <variable name="mode_conteneur_actif1" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="unknown_function">
+      <param type="variable">mode_conteneur_actif1</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80frozenifin_unknown/00-base.xml b/tests/dictionaries/80frozenifin_unknown/00-base.xml
index 399abe464..c0ffcee98 100644
--- a/tests/dictionaries/80frozenifin_unknown/00-base.xml
+++ b/tests/dictionaries/80frozenifin_unknown/00-base.xml
@@ -1,30 +1,26 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general" mode="expert">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="enumfam" mode="expert">
-            <variable name="enumvar" type="number" description="enumvar" help="bla bla bla"/>
-            <variable name="test_variable" type="number" description="test variable"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_enum">
-            <param>1</param>
-            <param>2</param>
-            <param>3</param>
-            <target>enumvar</target>
-        </check>
-        <condition name="hidden_if_in" source="condition">
-            <param>4</param>
-            <target type="variable">test_variable</target>
-        </condition>
-    </constraints>
-
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="enumfam" mode="expert">
+      <variable name="enumvar" type="number" description="enumvar" help="bla bla bla"/>
+      <variable name="test_variable" type="number" description="test variable"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>1</param>
+      <param>2</param>
+      <param>3</param>
+      <target>enumvar</target>
+    </check>
+    <condition name="hidden_if_in" source="condition">
+      <param>4</param>
+      <target type="variable">test_variable</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80hidden_if_in_dynamic/00-base.xml b/tests/dictionaries/80hidden_if_in_dynamic/00-base.xml
index a547bdc3a..dd21c18bf 100644
--- a/tests/dictionaries/80hidden_if_in_dynamic/00-base.xml
+++ b/tests/dictionaries/80hidden_if_in_dynamic/00-base.xml
@@ -1,26 +1,25 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name='general'>
-            <variable name='varname' type='string' description="No change" multi="True">
-                <value>val1</value>
-                <value>val2</value>
-            </variable>
-        </family>
-        <family name='dyn' dynamic="varname">
-            <variable name='vardyn' type='string' description="No change">
-                <value>val</value>
-            </variable>
-        </family>
-        <family name='new'>
-            <variable name='newvar' type='string' description="No change"/>
-        </family>
-    </variables>
-    <constraints>
-        <condition name="hidden_if_in" source="vardynval1">
-            <param>non</param>
-            <target type="family">new</target>
-        </condition>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="varname" type="string" description="No change" multi="True">
+        <value>val1</value>
+        <value>val2</value>
+      </variable>
+    </family>
+    <family name="dyn" dynamic="varname">
+      <variable name="vardyn" type="string" description="No change">
+        <value>val</value>
+      </variable>
+    </family>
+    <family name="new">
+      <variable name="newvar" type="string" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="hidden_if_in" source="vardynval1">
+      <param>non</param>
+      <target type="family">new</target>
+    </condition>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/80hidden_if_in_filelist/00-base.xml b/tests/dictionaries/80hidden_if_in_filelist/00-base.xml
index 7aaf14d79..c7bd8f789 100644
--- a/tests/dictionaries/80hidden_if_in_filelist/00-base.xml
+++ b/tests/dictionaries/80hidden_if_in_filelist/00-base.xml
@@ -1,26 +1,24 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <services>
-        <service name="test">
-            <file filelist="afilllist">/tmp/file1</file>
-        </service>
-    </services>
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="condition" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-    <constraints>
-        <condition name="hidden_if_in" source="activer_clam" optional="True">
-            <param>non</param>
-            <target type="filelist">afilllist</target>
-        </condition>
-    </constraints>
+  <services>
+    <service name="test">
+      <file filelist="afilllist">/tmp/file1</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="hidden_if_in" source="activer_clam" optional="True">
+      <param>non</param>
+      <target type="filelist">afilllist</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80invalid_dtd/00_base.xml b/tests/dictionaries/80invalid_dtd/00_base.xml
index 019355051..9ffb9deec 100644
--- a/tests/dictionaries/80invalid_dtd/00_base.xml
+++ b/tests/dictionaries/80invalid_dtd/00_base.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <services>
-        <unknown>
+  <services>
+    <unknown>
         </unknown>
-    </services>
+  </services>
 </rougail>
diff --git a/tests/dictionaries/80leadership_accent/00-base.xml b/tests/dictionaries/80leadership_accent/00-base.xml
index b38a223df..c529e7c09 100644
--- a/tests/dictionaries/80leadership_accent/00-base.xml
+++ b/tests/dictionaries/80leadership_accent/00-base.xml
@@ -1,30 +1,29 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="general1">
-            <variable name="leader" type="string" multi="True"/>
-            <variable name="Followér1" type="string"/>
-            <variable name="Followér2" type="string"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param name="valeur">valfill</param>
-	    <target>follower1</target>
-        </fill>
-        <fill name="calc_val">
-            <param type="variable">Followér1</param>
-	    <target>follower2</target>
-        </fill>
-        <group leader="leader">
-            <follower>Followér1</follower>
-            <follower>Followér2</follower>
-        </group>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="general1">
+      <variable name="leader" type="string" multi="True"/>
+      <variable name="Followér1" type="string"/>
+      <variable name="Followér2" type="string"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valfill</param>
+      <target>follower1</target>
+    </fill>
+    <fill name="calc_val">
+      <param type="variable">Followér1</param>
+      <target>follower2</target>
+    </fill>
+    <group leader="leader">
+      <follower>Followér1</follower>
+      <follower>Followér2</follower>
+    </group>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/80leadership_accent_leader/00-base.xml b/tests/dictionaries/80leadership_accent_leader/00-base.xml
index 59013e03a..6f2d7f4c0 100644
--- a/tests/dictionaries/80leadership_accent_leader/00-base.xml
+++ b/tests/dictionaries/80leadership_accent_leader/00-base.xml
@@ -1,30 +1,29 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="general1">
-            <variable name="Léader" type="string" multi="True"/>
-            <variable name="follower1" type="string"/>
-            <variable name="follower2" type="string"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param name="valeur">valfill</param>
-	    <target>follower1</target>
-        </fill>
-        <fill name="calc_val">
-            <param type="variable">follower1</param>
-	    <target>follower2</target>
-        </fill>
-        <group leader="Léader">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="general1">
+      <variable name="Léader" type="string" multi="True"/>
+      <variable name="follower1" type="string"/>
+      <variable name="follower2" type="string"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valfill</param>
+      <target>follower1</target>
+    </fill>
+    <fill name="calc_val">
+      <param type="variable">follower1</param>
+      <target>follower2</target>
+    </fill>
+    <group leader="Léader">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+    </group>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/80leadership_auto_save/00-base.xml b/tests/dictionaries/80leadership_auto_save/00-base.xml
index be9f75ad0..ac6ebb0be 100644
--- a/tests/dictionaries/80leadership_auto_save/00-base.xml
+++ b/tests/dictionaries/80leadership_auto_save/00-base.xml
@@ -1,29 +1,28 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <variable name="server_deployed" type="boolean"/>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-              <value>non</value>
-            </variable>
-            <variable name="leader" type="string" description="leader" multi="True"/>
-            <variable name="follower1" type="string" description="follower1"/>
-            <variable name="follower2" type="string" description="follower2" auto_save="True"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param name="valeur">valfill</param>
-            <target>follower1</target>
-        </fill>
-        <fill name="calc_val">
-            <param type="variable">follower1</param>
-            <target>follower2</target>
-        </fill>
-        <group leader="leader">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-    </constraints>
+  <variables>
+    <variable name="server_deployed" type="boolean"/>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="leader" type="string" description="leader" multi="True"/>
+      <variable name="follower1" type="string" description="follower1"/>
+      <variable name="follower2" type="string" description="follower2" auto_save="True"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valfill</param>
+      <target>follower1</target>
+    </fill>
+    <fill name="calc_val">
+      <param type="variable">follower1</param>
+      <target>follower2</target>
+    </fill>
+    <group leader="leader">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+    </group>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/80leadership_autofreeze/00-base.xml b/tests/dictionaries/80leadership_autofreeze/00-base.xml
index 41349632a..c56dc7adf 100644
--- a/tests/dictionaries/80leadership_autofreeze/00-base.xml
+++ b/tests/dictionaries/80leadership_autofreeze/00-base.xml
@@ -1,26 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="server_deployed" type="boolean"/>
-            <variable name="leader" description="leader" auto_freeze="True" multi="True"/>
-            <variable name="follower1" multi="True"/>
-            <variable name="follower2" multi="True"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param name="valeur">valfill</param>
-            <target>follower1</target>
-        </fill>
-        <fill name="calc_val">
-            <param type="variable">follower1</param>
-            <target>follower2</target>
-        </fill>
-        <group leader="leader">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="server_deployed" type="boolean"/>
+      <variable name="leader" description="leader" auto_freeze="True" multi="True"/>
+      <variable name="follower1" multi="True"/>
+      <variable name="follower2" multi="True"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valfill</param>
+      <target>follower1</target>
+    </fill>
+    <fill name="calc_val">
+      <param type="variable">follower1</param>
+      <target>follower2</target>
+    </fill>
+    <group leader="leader">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+    </group>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/80leadership_familyaccent/00-base.xml b/tests/dictionaries/80leadership_familyaccent/00-base.xml
index e0dfdd9cb..59563c889 100644
--- a/tests/dictionaries/80leadership_familyaccent/00-base.xml
+++ b/tests/dictionaries/80leadership_familyaccent/00-base.xml
@@ -1,28 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="Général">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="leader" type="string" description="leader" multi="True"/>
-            <variable name="follower1" type="string" description="follower1"/>
-            <variable name="follower2" type="string" description="follower2"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param name="valeur">valfill</param>
-	    <target>follower1</target>
-        </fill>
-        <fill name="calc_val">
-            <param type="variable">follower1</param>
-	    <target>follower2</target>
-        </fill>
-        <group leader="leader">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-    </constraints>
+  <variables>
+    <family name="Général">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="leader" type="string" description="leader" multi="True"/>
+      <variable name="follower1" type="string" description="follower1"/>
+      <variable name="follower2" type="string" description="follower2"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valfill</param>
+      <target>follower1</target>
+    </fill>
+    <fill name="calc_val">
+      <param type="variable">follower1</param>
+      <target>follower2</target>
+    </fill>
+    <group leader="leader">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+    </group>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/80leadership_leader_not_multi/00-base.xml b/tests/dictionaries/80leadership_leader_not_multi/00-base.xml
index 5e04647ab..c666b05dc 100644
--- a/tests/dictionaries/80leadership_leader_not_multi/00-base.xml
+++ b/tests/dictionaries/80leadership_leader_not_multi/00-base.xml
@@ -1,22 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="general1">
-            <variable name="leader" type="string" description="leader"/>
-            <variable name="follower1" type="string" description="follower1"/>
-            <variable name="follower2" type="string" description="follower2"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <group leader="leader">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="general1">
+      <variable name="leader" type="string" description="leader"/>
+      <variable name="follower1" type="string" description="follower1"/>
+      <variable name="follower2" type="string" description="follower2"/>
+    </family>
+  </variables>
+  <constraints>
+    <group leader="leader">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+    </group>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/80leadership_none_follower_between_follower/00-base.xml b/tests/dictionaries/80leadership_none_follower_between_follower/00-base.xml
index f09a21fe8..c47c63bf1 100644
--- a/tests/dictionaries/80leadership_none_follower_between_follower/00-base.xml
+++ b/tests/dictionaries/80leadership_none_follower_between_follower/00-base.xml
@@ -1,28 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="leader" type="string" description="leader" multi="True"/>
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="follower1" type="string" description="follower1"/>
-            <variable name="follower2" type="string" description="follower2"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param name="valeur">valfill</param>
-            <target>follower1</target>
-        </fill>
-        <fill name="calc_val">
-            <param type="variable">follower1</param>
-            <target>follower2</target>
-        </fill>
-        <group leader="leader">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="leader" type="string" description="leader" multi="True"/>
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="follower1" type="string" description="follower1"/>
+      <variable name="follower2" type="string" description="follower2"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valfill</param>
+      <target>follower1</target>
+    </fill>
+    <fill name="calc_val">
+      <param type="variable">follower1</param>
+      <target>follower2</target>
+    </fill>
+    <group leader="leader">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+    </group>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/80leadership_not_ordered/00-base.xml b/tests/dictionaries/80leadership_not_ordered/00-base.xml
index 9c5b05419..a81750ae4 100644
--- a/tests/dictionaries/80leadership_not_ordered/00-base.xml
+++ b/tests/dictionaries/80leadership_not_ordered/00-base.xml
@@ -1,30 +1,29 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="general1">
-            <variable name="leader" type="string" description="leader" multi="True"/>
-            <variable name="follower1" type="string" description="follower1"/>
-            <variable name="follower2" type="string" description="follower2"/>
-        </family>
-    </variables>
-
-    <constraints>
-	<fill name="calc_val">
-            <param name="valeur">valfill</param>
-            <target>follower1</target>
-        </fill>
-	<fill name="calc_val">
-            <param type="variable">follower1</param>
-            <target>follower2</target>
-        </fill>
-        <group leader="leader">
-            <follower>follower2</follower>
-            <follower>follower1</follower>
-        </group>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="general1">
+      <variable name="leader" type="string" description="leader" multi="True"/>
+      <variable name="follower1" type="string" description="follower1"/>
+      <variable name="follower2" type="string" description="follower2"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valfill</param>
+      <target>follower1</target>
+    </fill>
+    <fill name="calc_val">
+      <param type="variable">follower1</param>
+      <target>follower2</target>
+    </fill>
+    <group leader="leader">
+      <follower>follower2</follower>
+      <follower>follower1</follower>
+    </group>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/80leadership_not_same_family/00-base.xml b/tests/dictionaries/80leadership_not_same_family/00-base.xml
index 1b7c1d2a3..17f58ac80 100644
--- a/tests/dictionaries/80leadership_not_same_family/00-base.xml
+++ b/tests/dictionaries/80leadership_not_same_family/00-base.xml
@@ -1,32 +1,31 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="general1">
-            <variable name="leader" type="string" description="leader" multi="True"/>
-            <variable name="follower1" type="string" description="follower1"/>
-        </family>
-        <family name="general2">
-            <variable name="follower2" type="string" description="follower2"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param name="valeur">valfill</param>
-            <target>follower1</target>
-        </fill>
-	<fill name="calc_val">
-            <param type="variable">follower1</param>
-            <target>follower2</target>
-        </fill>
-        <group leader="leader">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="general1">
+      <variable name="leader" type="string" description="leader" multi="True"/>
+      <variable name="follower1" type="string" description="follower1"/>
+    </family>
+    <family name="general2">
+      <variable name="follower2" type="string" description="follower2"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valfill</param>
+      <target>follower1</target>
+    </fill>
+    <fill name="calc_val">
+      <param type="variable">follower1</param>
+      <target>follower2</target>
+    </fill>
+    <group leader="leader">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+    </group>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/80leadership_notexists/00-base.xml b/tests/dictionaries/80leadership_notexists/00-base.xml
index aae9b7000..677c35ced 100644
--- a/tests/dictionaries/80leadership_notexists/00-base.xml
+++ b/tests/dictionaries/80leadership_notexists/00-base.xml
@@ -1,32 +1,31 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-              <value>non</value>
-            </variable>
-            <variable name="leader" type="string" description="leader" multi="True"/>
-            <variable name="follower1" type="string" description="follower1"/>
-            <variable name="follower2" type="string" description="follower2" auto_save="True"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param name="valeur">valfill</param>
-            <target>follower1</target>
-        </fill>
-	<fill name="calc_val">
-            <param type="variable">follower1</param>
-            <target>follower2</target>
-        </fill>
-        <group leader="leader">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-        <group leader="leader1">
-            <follower>follower3</follower>
-            <follower>follower4</follower>
-        </group>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="leader" type="string" description="leader" multi="True"/>
+      <variable name="follower1" type="string" description="follower1"/>
+      <variable name="follower2" type="string" description="follower2" auto_save="True"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valfill</param>
+      <target>follower1</target>
+    </fill>
+    <fill name="calc_val">
+      <param type="variable">follower1</param>
+      <target>follower2</target>
+    </fill>
+    <group leader="leader">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+    </group>
+    <group leader="leader1">
+      <follower>follower3</follower>
+      <follower>follower4</follower>
+    </group>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/80load_disabled_if_inaccent_family/00-base.xml b/tests/dictionaries/80load_disabled_if_inaccent_family/00-base.xml
index ce569d656..80b22b7d2 100644
--- a/tests/dictionaries/80load_disabled_if_inaccent_family/00-base.xml
+++ b/tests/dictionaries/80load_disabled_if_inaccent_family/00-base.xml
@@ -1,32 +1,29 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="Général">
-            <variable name="condition" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif" type="string" description="No change" >
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="Général2">
-            <variable name="mode_conteneur_actif3" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_in" source="condition">
-            <param>oui</param>
-            <target type="variable">mode_conteneur_actif</target>
-            <target type="variable">mode_conteneur_actif2</target>
-            <target type="family">Général2</target>
-        </condition>
-    </constraints>
+  <variables>
+    <family name="Général">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="Général2">
+      <variable name="mode_conteneur_actif3" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>oui</param>
+      <target type="variable">mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+      <target type="family">Général2</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80load_leadership_normalize_family/00-base.xml b/tests/dictionaries/80load_leadership_normalize_family/00-base.xml
index fed57268d..bfd56a01b 100644
--- a/tests/dictionaries/80load_leadership_normalize_family/00-base.xml
+++ b/tests/dictionaries/80load_leadership_normalize_family/00-base.xml
@@ -1,21 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="general-1">
-            <variable name="leader" type="string" description="leader" multi="True"/>
-            <variable name="follower1" type="string" description="follower1"/>
-            <variable name="follower2" type="string" description="follower2"/>
-        </family>
-    </variables>
-    <constraints>
-        <group leader="leader">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="general-1">
+      <variable name="leader" type="string" description="leader" multi="True"/>
+      <variable name="follower1" type="string" description="follower1"/>
+      <variable name="follower2" type="string" description="follower2"/>
+    </family>
+  </variables>
+  <constraints>
+    <group leader="leader">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+    </group>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/80load_leadership_normalize_family/01-base.xml b/tests/dictionaries/80load_leadership_normalize_family/01-base.xml
index 3641da108..568a8bc31 100644
--- a/tests/dictionaries/80load_leadership_normalize_family/01-base.xml
+++ b/tests/dictionaries/80load_leadership_normalize_family/01-base.xml
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general-1">
-            <variable name="leader" redefine="True" mandatory="True"/>
-        </family>
-    </variables>
+  <variables>
+    <family name="general-1">
+      <variable name="leader" redefine="True" mandatory="True"/>
+    </family>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/80load_mandatoryifin_family/00-base.xml b/tests/dictionaries/80load_mandatoryifin_family/00-base.xml
index 2be2b27e3..f0098ec19 100644
--- a/tests/dictionaries/80load_mandatoryifin_family/00-base.xml
+++ b/tests/dictionaries/80load_mandatoryifin_family/00-base.xml
@@ -1,20 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="condition" type="boolean"/>
-        </family>
-        <family name="general2">
-            <variable name="my_variable"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="mandatory_if_in" source="condition">
-            <param>oui</param>
-            <target type="family">general2</target>
-        </condition>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="condition" type="boolean"/>
+    </family>
+    <family name="general2">
+      <variable name="my_variable"/>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="mandatory_if_in" source="condition">
+      <param>oui</param>
+      <target type="family">general2</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80mode_conflict/00-base.xml b/tests/dictionaries/80mode_conflict/00-base.xml
index b13b1ea04..be7c99e03 100644
--- a/tests/dictionaries/80mode_conflict/00-base.xml
+++ b/tests/dictionaries/80mode_conflict/00-base.xml
@@ -1,13 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <variable name="server_deployed" type="boolean"/>
-        <family name="general" mode="normal">
-            <variable name="mode_conteneur_actif" type="string" description="No change" mode="expert">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <variable name="server_deployed" type="boolean"/>
+    <family name="general" mode="normal">
+      <variable name="mode_conteneur_actif" type="string" description="No change" mode="expert">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80mode_leadership_conflict/00-base.xml b/tests/dictionaries/80mode_leadership_conflict/00-base.xml
index 84623be47..cc72e7b49 100644
--- a/tests/dictionaries/80mode_leadership_conflict/00-base.xml
+++ b/tests/dictionaries/80mode_leadership_conflict/00-base.xml
@@ -1,26 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general" mode="expert">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="leadermode">
-            <variable name="leader" type="string" description="leader" multi="True" mode="expert"/>
-            <variable name="follower1" type="string" description="follower1" mode="normal"/>
-            <variable name="follower2" type="string" description="follower2"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_list">
-            <param name="valeur">valfill</param>
-	    <target>leader</target>
-        </fill>
-        <group leader="leader">
-            <follower>follower1</follower>
-            <follower>follower2</follower>
-        </group>
-    </constraints>
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="leadermode">
+      <variable name="leader" type="string" description="leader" multi="True" mode="expert"/>
+      <variable name="follower1" type="string" description="follower1" mode="normal"/>
+      <variable name="follower2" type="string" description="follower2"/>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_list">
+      <param name="valeur">valfill</param>
+      <target>leader</target>
+    </fill>
+    <group leader="leader">
+      <follower>follower1</follower>
+      <follower>follower2</follower>
+    </group>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/80multi_family_mode_conflict/00-base.xml b/tests/dictionaries/80multi_family_mode_conflict/00-base.xml
index ddfc0f871..1ef22d25a 100644
--- a/tests/dictionaries/80multi_family_mode_conflict/00-base.xml
+++ b/tests/dictionaries/80multi_family_mode_conflict/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="base" mode="expert">
-            <family name="subfamily">
-                <variable name="variable" mode="basic"/>
-            </family>
-        </family>
-    </variables>
+  <variables>
+    <family name="base" mode="expert">
+      <family name="subfamily">
+        <variable name="variable" mode="basic"/>
+      </family>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80nil_with_value/00-base.xml b/tests/dictionaries/80nil_with_value/00-base.xml
index b6c20a829..0d361343c 100644
--- a/tests/dictionaries/80nil_with_value/00-base.xml
+++ b/tests/dictionaries/80nil_with_value/00-base.xml
@@ -1,27 +1,24 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="condition" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_in" source="condition">
-            <param type="nil">value</param>
-            <target type="variable">mode_conteneur_actif</target>
-            <target type="variable">mode_conteneur_actif2</target>
-            <target type="filelist">afilllist</target>
-        </condition>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="condition" type="string" description="No change">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param type="nil">value</param>
+      <target type="variable">mode_conteneur_actif</target>
+      <target type="variable">mode_conteneur_actif2</target>
+      <target type="filelist">afilllist</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80no_leadership_index/00-base.xml b/tests/dictionaries/80no_leadership_index/00-base.xml
index 4804f80f0..3f0131b12 100644
--- a/tests/dictionaries/80no_leadership_index/00-base.xml
+++ b/tests/dictionaries/80no_leadership_index/00-base.xml
@@ -1,13 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <variable name="my_variable"/>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param type="index"/>
-            <target>my_variable</target>
-        </fill>
-    </constraints>
+  <variables>
+    <variable name="my_variable"/>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param type="index"/>
+      <target>my_variable</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/80override_twice/00-base.xml b/tests/dictionaries/80override_twice/00-base.xml
index 8345c642b..5114fca26 100644
--- a/tests/dictionaries/80override_twice/00-base.xml
+++ b/tests/dictionaries/80override_twice/00-base.xml
@@ -1,20 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-
-    <services>
-        <service name="test">
-            <override/>
-            <override/>
-        </service>
-    </services>
-
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <services>
+    <service name="test">
+      <override/>
+      <override/>
+    </service>
+  </services>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80redefine_double_error/00-base.xml b/tests/dictionaries/80redefine_double_error/00-base.xml
index 9ea330305..8c9d801f9 100644
--- a/tests/dictionaries/80redefine_double_error/00-base.xml
+++ b/tests/dictionaries/80redefine_double_error/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80redefine_double_error/01-base.xml b/tests/dictionaries/80redefine_double_error/01-base.xml
index 7fa2b1355..9488593c2 100644
--- a/tests/dictionaries/80redefine_double_error/01-base.xml
+++ b/tests/dictionaries/80redefine_double_error/01-base.xml
@@ -1,10 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" redefine="True"/>
-        </family>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" redefine="True"/>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80redefine_double_error/02-base.xml b/tests/dictionaries/80redefine_double_error/02-base.xml
index 098b70bc1..5f50358e4 100644
--- a/tests/dictionaries/80redefine_double_error/02-base.xml
+++ b/tests/dictionaries/80redefine_double_error/02-base.xml
@@ -1,10 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" redefine="True" type="string"/>
-        </family>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" redefine="True" type="string"/>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80redefine_error/00-base.xml b/tests/dictionaries/80redefine_error/00-base.xml
index 9ea330305..8c9d801f9 100644
--- a/tests/dictionaries/80redefine_error/00-base.xml
+++ b/tests/dictionaries/80redefine_error/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80redefine_error/01-redefine.xml b/tests/dictionaries/80redefine_error/01-redefine.xml
index 9ea330305..8c9d801f9 100644
--- a/tests/dictionaries/80redefine_error/01-redefine.xml
+++ b/tests/dictionaries/80redefine_error/01-redefine.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80redefine_fillerror/00-base.xml b/tests/dictionaries/80redefine_fillerror/00-base.xml
index 7b67be9ad..474e77565 100644
--- a/tests/dictionaries/80redefine_fillerror/00-base.xml
+++ b/tests/dictionaries/80redefine_fillerror/00-base.xml
@@ -1,20 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <fill name="calc_val">
-            <param name="valeur">valeur</param>
-            <target>mode_conteneur_actif</target>
-        </fill>
-    </constraints>
-
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_val">
+      <param name="valeur">valeur</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80redefine_fillerror/01-base.xml b/tests/dictionaries/80redefine_fillerror/01-base.xml
index 98edd8f6a..bc69cd752 100644
--- a/tests/dictionaries/80redefine_fillerror/01-base.xml
+++ b/tests/dictionaries/80redefine_fillerror/01-base.xml
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <constraints>
-        <fill name="concat">
-            <param name="valeur">valeur</param>
-            <target>mode_conteneur_actif</target>
-        </fill>
-    </constraints>
+  <constraints>
+    <fill name="concat">
+      <param name="valeur">valeur</param>
+      <target>mode_conteneur_actif</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/80redefine_notexists/00-base.xml b/tests/dictionaries/80redefine_notexists/00-base.xml
index 9ea330305..8c9d801f9 100644
--- a/tests/dictionaries/80redefine_notexists/00-base.xml
+++ b/tests/dictionaries/80redefine_notexists/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80redefine_notexists/01-redefine.xml b/tests/dictionaries/80redefine_notexists/01-redefine.xml
index f6dc3434b..887508846 100644
--- a/tests/dictionaries/80redefine_notexists/01-redefine.xml
+++ b/tests/dictionaries/80redefine_notexists/01-redefine.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif1" redefine="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif1" redefine="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80service_not_managed_overrides/00-base.xml b/tests/dictionaries/80service_not_managed_overrides/00-base.xml
index 923a828bd..4ab31bf6d 100644
--- a/tests/dictionaries/80service_not_managed_overrides/00-base.xml
+++ b/tests/dictionaries/80service_not_managed_overrides/00-base.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <services> 
-        <service name='test' manage="False">
-	    <override/>
-        </service>
-    </services>
-    <variables>
-        <variable name='var' type='string'>
-            <value>mailname</value>
-        </variable>
-    </variables>
+  <services>
+    <service name="test" manage="False">
+      <override/>
+    </service>
+  </services>
+  <variables>
+    <variable name="var" type="string">
+      <value>mailname</value>
+    </variable>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/80services_ip_cidr_netmask/00-base.xml b/tests/dictionaries/80services_ip_cidr_netmask/00-base.xml
index 538e7bee1..7bb0cce05 100644
--- a/tests/dictionaries/80services_ip_cidr_netmask/00-base.xml
+++ b/tests/dictionaries/80services_ip_cidr_netmask/00-base.xml
@@ -1,14 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <services>
-        <service name='nut'>
-            <ip ip_type='variable' netmask="nut_monitor_netmask">nut_monitor_host</ip>
-        </service>
-    </services>
-    <variables>
-        <variable name="nut_monitor_host" type="network_cidr" mandatory='True'/>
-        <variable name="nut_monitor_netmask" type="netmask" mandatory='True'/>
-    </variables>
+  <services>
+    <service name="nut">
+      <ip ip_type="variable" netmask="nut_monitor_netmask">nut_monitor_host</ip>
+    </service>
+  </services>
+  <variables>
+    <variable name="nut_monitor_host" type="network_cidr" mandatory="True"/>
+    <variable name="nut_monitor_netmask" type="netmask" mandatory="True"/>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80services_ip_netmask/00-base.xml b/tests/dictionaries/80services_ip_netmask/00-base.xml
index 5b5a7a714..cc58453fd 100644
--- a/tests/dictionaries/80services_ip_netmask/00-base.xml
+++ b/tests/dictionaries/80services_ip_netmask/00-base.xml
@@ -1,17 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-
-    <services>
-        <service name='nut'>
-            <ip netmask="nut_monitor_netmask">nut_monitor_host</ip>
-        </service>
-    </services>
-
-    <variables>
-        <variable name="nut_monitor_host" type="ip" mandatory='True'/>
-        <variable name="nut_monitor_netmask" type="netmask" mandatory='True'/>
-    </variables>
+  <services>
+    <service name="nut">
+      <ip netmask="nut_monitor_netmask">nut_monitor_host</ip>
+    </service>
+  </services>
+  <variables>
+    <variable name="nut_monitor_host" type="ip" mandatory="True"/>
+    <variable name="nut_monitor_netmask" type="netmask" mandatory="True"/>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80services_ip_network_no_netmask/00-base.xml b/tests/dictionaries/80services_ip_network_no_netmask/00-base.xml
index 3cdd59718..4d7db9610 100644
--- a/tests/dictionaries/80services_ip_network_no_netmask/00-base.xml
+++ b/tests/dictionaries/80services_ip_network_no_netmask/00-base.xml
@@ -1,16 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-
-    <services>
-        <service name='nut'>
-            <ip>nut_monitor_host</ip>
-        </service>
-    </services>
-
-    <variables>
-        <variable name="nut_monitor_host" type="network" mandatory='True'/>
-    </variables>
+  <services>
+    <service name="nut">
+      <ip>nut_monitor_host</ip>
+    </service>
+  </services>
+  <variables>
+    <variable name="nut_monitor_host" type="network" mandatory="True"/>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80services_ip_not_netmask/00-base.xml b/tests/dictionaries/80services_ip_not_netmask/00-base.xml
index 8a6c7f86c..fb6c6ddac 100644
--- a/tests/dictionaries/80services_ip_not_netmask/00-base.xml
+++ b/tests/dictionaries/80services_ip_not_netmask/00-base.xml
@@ -1,17 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-
-    <services>
-        <service name='nut'>
-            <ip netmask='nut_monitor_netmask'>nut_monitor_host</ip>
-        </service>
-    </services>
-
-    <variables>
-        <variable name="nut_monitor_host" type="network" mandatory='True'/>
-        <variable name="nut_monitor_netmask" type="ip" mandatory='True'/>
-    </variables>
+  <services>
+    <service name="nut">
+      <ip netmask="nut_monitor_netmask">nut_monitor_host</ip>
+    </service>
+  </services>
+  <variables>
+    <variable name="nut_monitor_host" type="network" mandatory="True"/>
+    <variable name="nut_monitor_netmask" type="ip" mandatory="True"/>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80services_ip_wrong_type/00-base.xml b/tests/dictionaries/80services_ip_wrong_type/00-base.xml
index 9d94e6457..4a32f9bd4 100644
--- a/tests/dictionaries/80services_ip_wrong_type/00-base.xml
+++ b/tests/dictionaries/80services_ip_wrong_type/00-base.xml
@@ -1,18 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-
-    <services>
-        <service name='nut'>
-            <ip>nut_monitor_host</ip>
-        </service>
-    </services>
-
-    <variables>
-        <variable name="nut_monitor_host" type="string" mandatory='True'>
-            <value>192.168.0.1</value>
-        </variable>
-    </variables>
+  <services>
+    <service name="nut">
+      <ip>nut_monitor_host</ip>
+    </service>
+  </services>
+  <variables>
+    <variable name="nut_monitor_host" type="string" mandatory="True">
+      <value>192.168.0.1</value>
+    </variable>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80target_list_unknown/00-base.xml b/tests/dictionaries/80target_list_unknown/00-base.xml
index f1145b5b1..16a3d95a6 100644
--- a/tests/dictionaries/80target_list_unknown/00-base.xml
+++ b/tests/dictionaries/80target_list_unknown/00-base.xml
@@ -1,15 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <variable name="condition" type="boolean"/>
-    </variables>
-
-    <constraints>
-        <condition name="disabled_if_in" source="condition">
-            <param>True</param>
-            <target type="filelist">unknown</target>
-        </condition>
-    </constraints>
+  <variables>
+    <variable name="condition" type="boolean"/>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="condition">
+      <param>True</param>
+      <target type="filelist">unknown</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80unknown_type/00-base.xml b/tests/dictionaries/80unknown_type/00-base.xml
index 204918188..cb8d20a56 100644
--- a/tests/dictionaries/80unknown_type/00-base.xml
+++ b/tests/dictionaries/80unknown_type/00-base.xml
@@ -1,10 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="unknown" description="Description"/>
-        </family>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="unknown" description="Description"/>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80valid_entier_invalid_param/00-base.xml b/tests/dictionaries/80valid_entier_invalid_param/00-base.xml
index e7a711863..7a3086561 100644
--- a/tests/dictionaries/80valid_entier_invalid_param/00-base.xml
+++ b/tests/dictionaries/80valid_entier_invalid_param/00-base.xml
@@ -1,20 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>b</value>
-            </variable>
-            <variable name="int" type="number" description="No change"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_entier">
-            <param name="unknown" type="number">0</param>
-            <target>int</target>
-        </check>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>b</value>
+      </variable>
+      <variable name="int" type="number" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_entier">
+      <param name="unknown" type="number">0</param>
+      <target>int</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80valid_entier_not_number/00-base.xml b/tests/dictionaries/80valid_entier_not_number/00-base.xml
index f3693fcaf..90129a8e3 100644
--- a/tests/dictionaries/80valid_entier_not_number/00-base.xml
+++ b/tests/dictionaries/80valid_entier_not_number/00-base.xml
@@ -1,21 +1,18 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>b</value>
-            </variable>
-            <variable name="int" type="number" description="No change"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_entier">
-            <param name="mini">0</param>
-            <param name="maxi" type="number">100</param>
-            <target>int</target>
-        </check>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>b</value>
+      </variable>
+      <variable name="int" type="number" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_entier">
+      <param name="mini">0</param>
+      <param name="maxi" type="number">100</param>
+      <target>int</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80valid_entier_without_param/00-base.xml b/tests/dictionaries/80valid_entier_without_param/00-base.xml
index d636ae03a..c059b4108 100644
--- a/tests/dictionaries/80valid_entier_without_param/00-base.xml
+++ b/tests/dictionaries/80valid_entier_without_param/00-base.xml
@@ -1,19 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>b</value>
-            </variable>
-            <variable name="int" type="number" description="No change"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_entier">
-            <target>int</target>
-        </check>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>b</value>
+      </variable>
+      <variable name="int" type="number" description="No change"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_entier">
+      <target>int</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80valid_enum_base_redefine/00-base.xml b/tests/dictionaries/80valid_enum_base_redefine/00-base.xml
index 120c5a4f0..2f2b57b90 100644
--- a/tests/dictionaries/80valid_enum_base_redefine/00-base.xml
+++ b/tests/dictionaries/80valid_enum_base_redefine/00-base.xml
@@ -1,35 +1,32 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general" mode="expert">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="enumfam" mode="expert">
-            <variable name="enumvar2" type="string" description="multi">
-                <value>c</value>
-            </variable>
-            <variable name="enumvar" type="string" description="multi" help="bla bla bla">
-                <value>c</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_enum">
-            <param>a</param>
-            <param>b</param>
-            <param>c</param>
-            <target>enumvar</target>
-        </check>
-        <check name="valid_enum">
-            <param>a</param>
-            <param>b</param>
-            <param>c</param>
-            <target>enumvar</target>
-        </check>
-    </constraints>
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="enumfam" mode="expert">
+      <variable name="enumvar2" type="string" description="multi">
+        <value>c</value>
+      </variable>
+      <variable name="enumvar" type="string" description="multi" help="bla bla bla">
+        <value>c</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>a</param>
+      <param>b</param>
+      <param>c</param>
+      <target>enumvar</target>
+    </check>
+    <check name="valid_enum">
+      <param>a</param>
+      <param>b</param>
+      <param>c</param>
+      <target>enumvar</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80valid_enum_base_redefine/01-base.xml b/tests/dictionaries/80valid_enum_base_redefine/01-base.xml
index d220950b5..64ff8015f 100644
--- a/tests/dictionaries/80valid_enum_base_redefine/01-base.xml
+++ b/tests/dictionaries/80valid_enum_base_redefine/01-base.xml
@@ -1,20 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="enumfam" mode="expert">
-            <variable name="enumvar" redefine="True">
-                <value>c</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_enum">
-            <param>a</param>
-            <param>c</param>
-            <target>enumvar</target>
-        </check>
-    </constraints>
+  <variables>
+    <family name="enumfam" mode="expert">
+      <variable name="enumvar" redefine="True">
+        <value>c</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>a</param>
+      <param>c</param>
+      <target>enumvar</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80valid_enum_multi_param/00-base.xml b/tests/dictionaries/80valid_enum_multi_param/00-base.xml
index 2078e7760..c427f211d 100644
--- a/tests/dictionaries/80valid_enum_multi_param/00-base.xml
+++ b/tests/dictionaries/80valid_enum_multi_param/00-base.xml
@@ -1,24 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>a</value>
-            </variable>
-            <variable name="var" type="string" description="New variable" multi="True">
-                <value>a</value>
-                <value>b</value>
-                <value>c</value>
-            </variable>
-        </family>
-    </variables>
-    <constraints>
-        <check name="valid_enum">
-            <param type="variable">var</param>
-            <param>d</param>
-            <target>mode_conteneur_actif</target>
-        </check>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>a</value>
+      </variable>
+      <variable name="var" type="string" description="New variable" multi="True">
+        <value>a</value>
+        <value>b</value>
+        <value>c</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param type="variable">var</param>
+      <param>d</param>
+      <target>mode_conteneur_actif</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80valid_enum_multi_variable/00-base.xml b/tests/dictionaries/80valid_enum_multi_variable/00-base.xml
index c0b9e69a2..292c60260 100644
--- a/tests/dictionaries/80valid_enum_multi_variable/00-base.xml
+++ b/tests/dictionaries/80valid_enum_multi_variable/00-base.xml
@@ -1,29 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>a</value>
-            </variable>
-            <variable name="var" type="string" description="New variable" multi="True">
-                <value>a</value>
-                <value>b</value>
-                <value>c</value>
-            </variable>
-            <variable name="var2" type="string" description="New variable" multi="True">
-                <value>a</value>
-                <value>b</value>
-                <value>c</value>
-            </variable>
-        </family>
-    </variables>
-    <constraints>
-        <check name="valid_enum">
-            <param type="variable">var</param>
-            <param type="variable">var2</param>
-            <target>mode_conteneur_actif</target>
-        </check>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>a</value>
+      </variable>
+      <variable name="var" type="string" description="New variable" multi="True">
+        <value>a</value>
+        <value>b</value>
+        <value>c</value>
+      </variable>
+      <variable name="var2" type="string" description="New variable" multi="True">
+        <value>a</value>
+        <value>b</value>
+        <value>c</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param type="variable">var</param>
+      <param type="variable">var2</param>
+      <target>mode_conteneur_actif</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80valid_enum_no_param/00-base.xml b/tests/dictionaries/80valid_enum_no_param/00-base.xml
index d52093271..6a067d777 100644
--- a/tests/dictionaries/80valid_enum_no_param/00-base.xml
+++ b/tests/dictionaries/80valid_enum_no_param/00-base.xml
@@ -1,23 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general" mode="expert">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="enumfam" mode="expert">
-            <variable name="enumvar" type="string" description="multi" help="bla bla bla">
-                <value>c</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_enum">
-            <target>enumvar</target>
-        </check>
-    </constraints>
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="enumfam" mode="expert">
+      <variable name="enumvar" type="string" description="multi" help="bla bla bla">
+        <value>c</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <target>enumvar</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80valid_enum_none_multi_variable/00-base.xml b/tests/dictionaries/80valid_enum_none_multi_variable/00-base.xml
index b7031f489..76c6a85e5 100644
--- a/tests/dictionaries/80valid_enum_none_multi_variable/00-base.xml
+++ b/tests/dictionaries/80valid_enum_none_multi_variable/00-base.xml
@@ -1,21 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>a</value>
-            </variable>
-            <variable name="var" type="string" description="New variable">
-                <value>a</value>
-            </variable>
-        </family>
-    </variables>
-    <constraints>
-        <check name="valid_enum">
-            <param type="variable">var</param>
-            <target>mode_conteneur_actif</target>
-        </check>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>a</value>
+      </variable>
+      <variable name="var" type="string" description="New variable">
+        <value>a</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param type="variable">var</param>
+      <target>mode_conteneur_actif</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80valid_enum_number_without_value/00-base.xml b/tests/dictionaries/80valid_enum_number_without_value/00-base.xml
index cf9298043..d0ed36d9f 100644
--- a/tests/dictionaries/80valid_enum_number_without_value/00-base.xml
+++ b/tests/dictionaries/80valid_enum_number_without_value/00-base.xml
@@ -1,23 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general" mode="expert">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="enumfam" mode="expert">
-            <variable name="enumvar" type="number" description="enumvar" help="bla bla bla"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_enum">
-            <param type="number"/>
-            <target>enumvar</target>
-        </check>
-    </constraints>
-
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="enumfam" mode="expert">
+      <variable name="enumvar" type="number" description="enumvar" help="bla bla bla"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param type="number"/>
+      <target>enumvar</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80value_not_multi/00-base.xml b/tests/dictionaries/80value_not_multi/00-base.xml
index 288ee61eb..2e3d57be5 100644
--- a/tests/dictionaries/80value_not_multi/00-base.xml
+++ b/tests/dictionaries/80value_not_multi/00-base.xml
@@ -1,12 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <variable name="nut_monitor_host" type="ip" mandatory='True'>
-            <value>192.168.0.1</value>
-            <value>192.168.0.2</value>
-        </variable>
-    </variables>
+  <variables>
+    <variable name="nut_monitor_host" type="ip" mandatory="True">
+      <value>192.168.0.1</value>
+      <value>192.168.0.2</value>
+    </variable>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80variable_accent/00-base.xml b/tests/dictionaries/80variable_accent/00-base.xml
index ac4a4ffe5..91c184e77 100644
--- a/tests/dictionaries/80variable_accent/00-base.xml
+++ b/tests/dictionaries/80variable_accent/00-base.xml
@@ -1,23 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="variableAccenté" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="Other">
-            <variable name="mode_conteneur_actif3" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-    <constraints>
-        <condition name="disabled_if_in" source="mode_conteneur_actif3">
-            <param>non</param>
-            <target type="variable">mode_conteneur_actif</target>
-        </condition>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="variableAccenté" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="Other">
+      <variable name="mode_conteneur_actif3" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="mode_conteneur_actif3">
+      <param>non</param>
+      <target type="variable">mode_conteneur_actif</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80variable_accent/01-base.xml b/tests/dictionaries/80variable_accent/01-base.xml
index b31afe125..470481fb5 100644
--- a/tests/dictionaries/80variable_accent/01-base.xml
+++ b/tests/dictionaries/80variable_accent/01-base.xml
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="Général">
-            <variable name="mode_conteneur_actif1" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="Général">
+      <variable name="mode_conteneur_actif1" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/80variable_accent/02-base.xml b/tests/dictionaries/80variable_accent/02-base.xml
index 81155361f..a5fa78a92 100644
--- a/tests/dictionaries/80variable_accent/02-base.xml
+++ b/tests/dictionaries/80variable_accent/02-base.xml
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif2" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/80variable_extra/00-base.xml b/tests/dictionaries/80variable_extra/00-base.xml
index c7f7a65e4..1b43cfb79 100644
--- a/tests/dictionaries/80variable_extra/00-base.xml
+++ b/tests/dictionaries/80variable_extra/00-base.xml
@@ -1,8 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <variable name="extra"/>
-    </variables>
+  <variables>
+    <variable name="extra"/>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80variable_extra/extra_dirs/extra/00-base.xml b/tests/dictionaries/80variable_extra/extra_dirs/extra/00-base.xml
index 28e8e579e..01bb05214 100644
--- a/tests/dictionaries/80variable_extra/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/80variable_extra/extra_dirs/extra/00-base.xml
@@ -1,7 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <variable name="day"/>
-    </variables>
+  <variables>
+    <variable name="day"/>
+  </variables>
 </rougail>
diff --git a/tests/dictionaries/80variable_family_not_same_name/00-base.xml b/tests/dictionaries/80variable_family_not_same_name/00-base.xml
index c2433b7ad..699d22928 100644
--- a/tests/dictionaries/80variable_family_not_same_name/00-base.xml
+++ b/tests/dictionaries/80variable_family_not_same_name/00-base.xml
@@ -1,11 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <variable name="general"/>
-        <family name="general">
-            <variable name="my_variable2"/>
-        </family>
-    </variables>
+  <variables>
+    <variable name="general"/>
+    <family name="general">
+      <variable name="my_variable2"/>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80variable_rougail/00-base.xml b/tests/dictionaries/80variable_rougail/00-base.xml
index f5bbbd5b7..821d6eec2 100644
--- a/tests/dictionaries/80variable_rougail/00-base.xml
+++ b/tests/dictionaries/80variable_rougail/00-base.xml
@@ -1,8 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <variable name="rougail"/>
-    </variables>
+  <variables>
+    <variable name="rougail"/>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/80variable_up/00-base.xml b/tests/dictionaries/80variable_up/00-base.xml
index 443f41392..6a17ac959 100644
--- a/tests/dictionaries/80variable_up/00-base.xml
+++ b/tests/dictionaries/80variable_up/00-base.xml
@@ -1,23 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="variableAccent" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="Other">
-            <variable name="mode_conteneur_actif3" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-    <constraints>
-        <condition name="disabled_if_in" source="mode_conteneur_actif3">
-            <param>non</param>
-            <target type="variable">mode_conteneur_actif</target>
-        </condition>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="variableAccent" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="Other">
+      <variable name="mode_conteneur_actif3" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="mode_conteneur_actif3">
+      <param>non</param>
+      <target type="variable">mode_conteneur_actif</target>
+    </condition>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/81extra_externalspace/00-base.xml b/tests/dictionaries/81extra_externalspace/00-base.xml
index 5249b01e0..0747d4f41 100644
--- a/tests/dictionaries/81extra_externalspace/00-base.xml
+++ b/tests/dictionaries/81extra_externalspace/00-base.xml
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
+  <variables>
+    <family name="general">
+      <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/81extra_externalspace/extra_dirs/extra/00-base.xml b/tests/dictionaries/81extra_externalspace/extra_dirs/extra/00-base.xml
index 2f0455bfc..e5eb20f02 100644
--- a/tests/dictionaries/81extra_externalspace/extra_dirs/extra/00-base.xml
+++ b/tests/dictionaries/81extra_externalspace/extra_dirs/extra/00-base.xml
@@ -1,17 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name='ejabberd'>
-            <variable name="description" type="string">
-                <value>Exportation de la base de ejabberd</value>
-            </variable>
-            <variable name="day" type="schedule"></variable>
-            <variable name="mode" type="schedulemod">
-                <value>pre</value>
-            </variable>
-        </family>
-    </variables>
-    <constraints>
+  <variables>
+    <family name="ejabberd">
+      <variable name="description" type="string">
+        <value>Exportation de la base de ejabberd</value>
+      </variable>
+      <variable name="day" type="schedule"/>
+      <variable name="mode" type="schedulemod">
+        <value>pre</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
     </constraints>
 </rougail>
diff --git a/tests/dictionaries/81extra_externalspace/extra_dirs/extra1/00-base.xml b/tests/dictionaries/81extra_externalspace/extra_dirs/extra1/00-base.xml
index 9ce009bcd..50b1055af 100644
--- a/tests/dictionaries/81extra_externalspace/extra_dirs/extra1/00-base.xml
+++ b/tests/dictionaries/81extra_externalspace/extra_dirs/extra1/00-base.xml
@@ -1,20 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name='external'>
-            <variable name="description" type="string">
-                <value>test</value>
-            </variable>
-        </family>
-    </variables>
-    <constraints>
-        <fill name='calc_multi_condition'>
-            <param>non</param>
-            <param type='variable' name='condition_1'>activer_ejabberd</param>
-            <param name='match'>none</param>
-            <param name='mismatch'>daily</param>
-	    <target>extra.ejabberd.day</target>
-        </fill>
-    </constraints>
+  <variables>
+    <family name="external">
+      <variable name="description" type="string">
+        <value>test</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <fill name="calc_multi_condition">
+      <param>non</param>
+      <param type="variable" name="condition_1">activer_ejabberd</param>
+      <param name="match">none</param>
+      <param name="mismatch">daily</param>
+      <target>extra.ejabberd.day</target>
+    </fill>
+  </constraints>
 </rougail>
diff --git a/tests/dictionaries/88valid_enum_not_number/00-base.xml b/tests/dictionaries/88valid_enum_not_number/00-base.xml
index 38cdcf1a3..7e12737a0 100644
--- a/tests/dictionaries/88valid_enum_not_number/00-base.xml
+++ b/tests/dictionaries/88valid_enum_not_number/00-base.xml
@@ -1,24 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general" mode="expert">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="enumfam" mode="expert">
-            <variable name="enumvar" type="number" description="enumvar"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_enum">
-            <param>a</param>
-            <param>b</param>
-            <param>c</param>
-            <target>enumvar</target>
-        </check>
-    </constraints>
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="enumfam" mode="expert">
+      <variable name="enumvar" type="number" description="enumvar"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>a</param>
+      <param>b</param>
+      <param>c</param>
+      <target>enumvar</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/88valid_enum_not_number2/00-base.xml b/tests/dictionaries/88valid_enum_not_number2/00-base.xml
index 93c2180ac..48645ca0a 100644
--- a/tests/dictionaries/88valid_enum_not_number2/00-base.xml
+++ b/tests/dictionaries/88valid_enum_not_number2/00-base.xml
@@ -1,24 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general" mode="expert">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="enumfam" mode="expert">
-            <variable name="enumvar" type="string" description="enumvar">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_enum">
-            <param type="number">1</param>
-            <target>enumvar</target>
-        </check>
-    </constraints>
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="enumfam" mode="expert">
+      <variable name="enumvar" type="string" description="enumvar">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param type="number">1</param>
+      <target>enumvar</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/88valid_enum_not_number_variable/00-base.xml b/tests/dictionaries/88valid_enum_not_number_variable/00-base.xml
index c583fa32b..b5bd54015 100644
--- a/tests/dictionaries/88valid_enum_not_number_variable/00-base.xml
+++ b/tests/dictionaries/88valid_enum_not_number_variable/00-base.xml
@@ -1,18 +1,15 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="enumfam" mode="expert">
-            <variable name="str" multi="True"/>
-            <variable name="enumvar" type="number"/>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_enum">
-            <param type="variable">str</param>
-            <target>enumvar</target>
-        </check>
-    </constraints>
+  <variables>
+    <family name="enumfam" mode="expert">
+      <variable name="str" multi="True"/>
+      <variable name="enumvar" type="number"/>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param type="variable">str</param>
+      <target>enumvar</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/88valid_enum_numberdefaultstring/00-base.xml b/tests/dictionaries/88valid_enum_numberdefaultstring/00-base.xml
index a4ae867f2..b8921bb4e 100644
--- a/tests/dictionaries/88valid_enum_numberdefaultstring/00-base.xml
+++ b/tests/dictionaries/88valid_enum_numberdefaultstring/00-base.xml
@@ -1,26 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general" mode="expert">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="enumfam" mode="expert">
-            <variable name="enumvar" type="string" description="enumvar">
-                <value>a</value>
-            </variable>
-        </family>
-    </variables>
-
-    <constraints>
-        <check name="valid_enum">
-            <param>1</param>
-            <param>2</param>
-            <param>3</param>
-            <target>enumvar</target>
-        </check>
-    </constraints>
+  <variables>
+    <family name="general" mode="expert">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>non</value>
+      </variable>
+    </family>
+    <family name="enumfam" mode="expert">
+      <variable name="enumvar" type="string" description="enumvar">
+        <value>a</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param>1</param>
+      <param>2</param>
+      <param>3</param>
+      <target>enumvar</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->
diff --git a/tests/dictionaries/88valid_enum_variable_optional/00-base.xml b/tests/dictionaries/88valid_enum_variable_optional/00-base.xml
index f259c7101..456c870f8 100644
--- a/tests/dictionaries/88valid_enum_variable_optional/00-base.xml
+++ b/tests/dictionaries/88valid_enum_variable_optional/00-base.xml
@@ -1,23 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>a</value>
-            </variable>
-            <variable name="var" type="string" description="New variable" multi="True">
-                <value>a</value>
-                <value>b</value>
-                <value>c</value>
-            </variable>
-        </family>
-    </variables>
-    <constraints>
-        <check name="valid_enum">
-            <param type="variable" optional="True">var</param>
-            <target>mode_conteneur_actif</target>
-        </check>
-    </constraints>
+  <variables>
+    <family name="general">
+      <variable name="mode_conteneur_actif" type="string" description="No change">
+        <value>a</value>
+      </variable>
+      <variable name="var" type="string" description="New variable" multi="True">
+        <value>a</value>
+        <value>b</value>
+        <value>c</value>
+      </variable>
+    </family>
+  </variables>
+  <constraints>
+    <check name="valid_enum">
+      <param type="variable" optional="True">var</param>
+      <target>mode_conteneur_actif</target>
+    </check>
+  </constraints>
 </rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->