diff --git a/tests/templates/11disabled_if_in_filelist/00-base.xml b/tests/templates/11disabled_if_in_filelist/00-base.xml
index 902c09b3..850de90a 100644
--- a/tests/templates/11disabled_if_in_filelist/00-base.xml
+++ b/tests/templates/11disabled_if_in_filelist/00-base.xml
@@ -1,52 +1,37 @@
-
-
-
-
-
-
- mandatory
+
+
+ hidden
+
+
+
+
root
-
- mandatory
- False
-
-
- mandatory
+
0644
-
- mandatory
+
/etc/file
-
- mandatory
+
root
-
- mandatory
- False
-
-
- mandatory
+
file
-
- mandatory
+
True
-
- mandatory
- disabled
+
+ disabled
True
- basic
-
+
normal
@@ -61,7 +46,7 @@
non
mandatory
normal
- disabled
+ disabled
non
@@ -69,10 +54,10 @@
non
mandatory
normal
- disabled
+ disabled
non
-
+
diff --git a/tests/templates/11disabled_if_in_filelist/result/rougail.conf b/tests/templates/11disabled_if_in_filelist/result/rougail.conf
index 481d9601..a56057fa 100644
--- a/tests/templates/11disabled_if_in_filelist/result/rougail.conf
+++ b/tests/templates/11disabled_if_in_filelist/result/rougail.conf
@@ -1,2 +1,2 @@
-C /etc/file 0644 root root - -
+C /etc/file 0644 root root - rougail.conf/etc/file
z /etc/file - - - - -
diff --git a/tests/templates/11disabled_if_in_filelist_disabled/00-base.xml b/tests/templates/11disabled_if_in_filelist_disabled/00-base.xml
index 6faa8167..095e8340 100644
--- a/tests/templates/11disabled_if_in_filelist_disabled/00-base.xml
+++ b/tests/templates/11disabled_if_in_filelist_disabled/00-base.xml
@@ -1,52 +1,37 @@
-
-
-
-
-
-
- mandatory
+
+
+ hidden
+
+
+
+
root
-
- mandatory
- False
-
-
- mandatory
+
0644
-
- mandatory
+
/etc/file
-
- mandatory
+
root
-
- mandatory
- False
-
-
- mandatory
+
file
-
- mandatory
+
True
-
- mandatory
- disabled
+
+ disabled
True
- basic
-
+
normal
@@ -61,7 +46,7 @@
non
mandatory
normal
- disabled
+ disabled
non
@@ -69,10 +54,10 @@
non
mandatory
normal
- disabled
+ disabled
non
-
+
diff --git a/tests/templates/20notemplating/00-base.xml b/tests/templates/20notemplating/00-base.xml
index 45e172cf..e0d7ddae 100644
--- a/tests/templates/20notemplating/00-base.xml
+++ b/tests/templates/20notemplating/00-base.xml
@@ -1,51 +1,36 @@
-
-
-
-
-
-
- mandatory
+
+
+ hidden
+
+
+
+
root
-
- mandatory
- False
-
-
- mandatory
+
0644
-
- mandatory
+
/etc/file
-
- mandatory
+
root
-
- mandatory
- False
-
-
- mandatory
+
file
-
- mandatory
+
False
-
- mandatory
+
True
- basic
-
+
normal
@@ -58,4 +43,4 @@
-
+
diff --git a/tests/templates/20notemplating/result/rougail.conf b/tests/templates/20notemplating/result/rougail.conf
index 481d9601..a56057fa 100644
--- a/tests/templates/20notemplating/result/rougail.conf
+++ b/tests/templates/20notemplating/result/rougail.conf
@@ -1,2 +1,2 @@
-C /etc/file 0644 root root - -
+C /etc/file 0644 root root - rougail.conf/etc/file
z /etc/file - - - - -
diff --git a/tests/templates/20override/00-base.xml b/tests/templates/20override/00-base.xml
index f59d3cfa..46bca2d1 100644
--- a/tests/templates/20override/00-base.xml
+++ b/tests/templates/20override/00-base.xml
@@ -1,31 +1,27 @@
-
-
-
-
-
-
- mandatory
+
+
+ hidden
+
+
+
+
test.service
-
- mandatory
+
test.service
-
- mandatory
+
True
-
- mandatory
+
True
- basic
-
+
normal
@@ -38,4 +34,4 @@
-
+
diff --git a/tests/templates/20override/result/system/test.service.d/rougail.conf b/tests/templates/20override/result/systemd/system/test.service.d/rougail.conf
similarity index 100%
rename from tests/templates/20override/result/system/test.service.d/rougail.conf
rename to tests/templates/20override/result/systemd/system/test.service.d/rougail.conf
diff --git a/tests/templates/60extra_group/00-base.xml b/tests/templates/60extra_group/00-base.xml
index 637c73ea..3836ff9f 100644
--- a/tests/templates/60extra_group/00-base.xml
+++ b/tests/templates/60extra_group/00-base.xml
@@ -1,51 +1,36 @@
-
-
-
-
-
-
- mandatory
+
+
+ hidden
+
+
+
+
root
-
- mandatory
- False
-
-
- mandatory
+
0644
-
- mandatory
+
/etc/mailname
-
- mandatory
+
root
-
- mandatory
- False
-
-
- mandatory
+
mailname
-
- mandatory
+
True
-
- mandatory
+
True
- basic
-
+
normal
@@ -71,7 +56,7 @@
-
+
normal
@@ -88,4 +73,4 @@
-
+
diff --git a/tests/templates/60extra_group/result/rougail.conf b/tests/templates/60extra_group/result/rougail.conf
index 1d617fdd..7b927977 100644
--- a/tests/templates/60extra_group/result/rougail.conf
+++ b/tests/templates/60extra_group/result/rougail.conf
@@ -1,2 +1,2 @@
-C /etc/mailname 0644 root root - -
+C /etc/mailname 0644 root root - rougail.conf/etc/mailname
z /etc/mailname - - - - -
diff --git a/tests/templates/70container_files/00-base.xml b/tests/templates/70container_files/00-base.xml
index 21035916..a18a9bcf 100644
--- a/tests/templates/70container_files/00-base.xml
+++ b/tests/templates/70container_files/00-base.xml
@@ -1,51 +1,36 @@
-
-
-
-
-
-
- mandatory
+
+
+ hidden
+
+
+
+
root
-
- mandatory
- False
-
-
- mandatory
+
0644
-
- mandatory
+
/etc/mailname
-
- mandatory
+
root
-
- mandatory
- False
-
-
- mandatory
+
mailname
-
- mandatory
+
True
-
- mandatory
+
True
- basic
-
+
normal
@@ -61,4 +46,4 @@
-
+
diff --git a/tests/templates/70container_files/result/rougail.conf b/tests/templates/70container_files/result/rougail.conf
index 1d617fdd..7b927977 100644
--- a/tests/templates/70container_files/result/rougail.conf
+++ b/tests/templates/70container_files/result/rougail.conf
@@ -1,2 +1,2 @@
-C /etc/mailname 0644 root root - -
+C /etc/mailname 0644 root root - rougail.conf/etc/mailname
z /etc/mailname - - - - -
diff --git a/tests/templates/70container_files_symlink_multi/00-base.xml b/tests/templates/70container_files_symlink_multi/00-base.xml
index d3cc83bb..c82d6037 100644
--- a/tests/templates/70container_files_symlink_multi/00-base.xml
+++ b/tests/templates/70container_files_symlink_multi/00-base.xml
@@ -1,50 +1,34 @@
-
-
-
-
-
-
- mandatory
+
+
+ hidden
+
+
+
+
root
-
- mandatory
- False
-
-
- mandatory
+
0644
-
- mandatory
-
-
- mandatory
+
+
root
-
- mandatory
- False
-
-
- mandatory
+
mailname
-
- mandatory
+
True
-
- mandatory
+
True
- basic
-
+
normal
@@ -66,4 +50,4 @@
-
+
diff --git a/tests/templates/70container_files_symlink_multi/result/rougail.conf b/tests/templates/70container_files_symlink_multi/result/rougail.conf
index 7ee181e2..6914c0bd 100644
--- a/tests/templates/70container_files_symlink_multi/result/rougail.conf
+++ b/tests/templates/70container_files_symlink_multi/result/rougail.conf
@@ -1,4 +1,4 @@
-C /etc/mailname 0644 root root - -
+C /etc/mailname 0644 root root - rougail.conf/etc/mailname
z /etc/mailname - - - - -
-C /etc/mailname2 0644 root root - -
+C /etc/mailname2 0644 root root - rougail.conf/etc/mailname2
z /etc/mailname2 - - - - -
diff --git a/tests/templates/70container_files_symlink_multi_variable/00-base.xml b/tests/templates/70container_files_symlink_multi_variable/00-base.xml
index 9111a927..b799fa27 100644
--- a/tests/templates/70container_files_symlink_multi_variable/00-base.xml
+++ b/tests/templates/70container_files_symlink_multi_variable/00-base.xml
@@ -1,53 +1,35 @@
-
-
-
-
-
-
- mandatory
+
+
+ hidden
+
+
+
+
root
-
- mandatory
- False
-
-
- mandatory
+
0644
-
- mandatory
-
-
- mandatory
+
+
root
-
- mandatory
- False
-
-
- mandatory
+
mailname
-
- mandatory
+
True
-
- mandatory
-
-
- mandatory
+
+
True
- basic
-
+
normal
@@ -75,4 +57,4 @@
-
+
diff --git a/tests/templates/70container_files_symlink_multi_variable/result/rougail.conf b/tests/templates/70container_files_symlink_multi_variable/result/rougail.conf
index 7ee181e2..6914c0bd 100644
--- a/tests/templates/70container_files_symlink_multi_variable/result/rougail.conf
+++ b/tests/templates/70container_files_symlink_multi_variable/result/rougail.conf
@@ -1,4 +1,4 @@
-C /etc/mailname 0644 root root - -
+C /etc/mailname 0644 root root - rougail.conf/etc/mailname
z /etc/mailname - - - - -
-C /etc/mailname2 0644 root root - -
+C /etc/mailname2 0644 root root - rougail.conf/etc/mailname2
z /etc/mailname2 - - - - -
diff --git a/tests/test_template.py b/tests/test_template.py
index acf08621..30d749bc 100644
--- a/tests/test_template.py
+++ b/tests/test_template.py
@@ -61,8 +61,10 @@ async def test_dictionary(test_dir):
distrib_dir,
tmp_dir,
dest_dir,
- join(dest_dir, 'rougail.conf'))
-
+ dest_dir,
+ join(dest_dir, 'rougail.conf'),
+ 'rougail.conf',
+ )
list_templates = set()
if isdir(dest_dir):
find_files(dest_dir,