diff --git a/README.md b/README.md
index 02ed15b..aa60db5 100644
--- a/README.md
+++ b/README.md
@@ -101,12 +101,12 @@ Enable http server:
 ```yaml
 manala_supervisor_configs:
   # Template based (file name based on template)
-  - template: configs/inet_http_server.conf.j2 # File name based on template name
+  - template: configs/inet_http_server.conf.j2
     config:
       port: "*:9001"
   # Template based (force file name)
   - file: inet.conf
-    template: configs/inet_http_server.conf.j2 # File name based on template name
+    template: configs/inet_http_server.conf.j2
     config:
       port: "*:9001"      
 ```
diff --git a/tests/0100_install.goss.yml b/tests/0000_default.goss.yml
similarity index 82%
rename from tests/0100_install.goss.yml
rename to tests/0000_default.goss.yml
index a8ae3ac..84ee929 100644
--- a/tests/0100_install.goss.yml
+++ b/tests/0000_default.goss.yml
@@ -13,3 +13,8 @@ command:
 {{ else }}
       - "Version:"
 {{ end }}
+
+service:
+  supervisor:
+    enabled: true
+    running: true
diff --git a/tests/0100_install.yml b/tests/0000_default.yml
similarity index 100%
rename from tests/0100_install.yml
rename to tests/0000_default.yml
diff --git a/tests/0200_config.yml b/tests/0200_config.yml
index 418236d..1218cd4 100644
--- a/tests/0200_config.yml
+++ b/tests/0200_config.yml
@@ -17,6 +17,7 @@
             state: absent
         # Default
         - import_role:
+            # Play role fully on first run, so that handlers don't breaks
             name: manala.supervisor
           vars:
             manala_supervisor_config_file: tmp/config/default/default.conf
@@ -30,6 +31,7 @@
         # Default - Deprecated
         - import_role:
             name: manala.supervisor
+            tasks_from: config
           vars:
             manala_supervisor_config_file: tmp/config/default/default_deprecated.conf
             manala_supervisor_config:
@@ -42,6 +44,7 @@
         # Default - Content
         - import_role:
             name: manala.supervisor
+            tasks_from: config
           vars:
             manala_supervisor_config_file: tmp/config/default/default_content.conf
             manala_supervisor_config: |
@@ -55,6 +58,7 @@
         # Template
         - import_role:
             name: manala.supervisor
+            tasks_from: config
           vars:
             manala_supervisor_config_file: tmp/config/default/template.conf
             manala_supervisor_config_template: config/debian.j2
@@ -68,6 +72,7 @@
         # Template - Deprecated
         - import_role:
             name: manala.supervisor
+            tasks_from: config
           vars:
             manala_supervisor_config_file: tmp/config/default/template_deprecated.conf
             manala_supervisor_config_template: config/default.dev.j2
diff --git a/tests/0300_configs.yml b/tests/0300_configs.yml
index b2dcd1e..6dd0ac0 100644
--- a/tests/0300_configs.yml
+++ b/tests/0300_configs.yml
@@ -19,6 +19,7 @@
             path: tmp/configs/default
             state: absent
         - import_role:
+            # Play role fully on first run, so that handlers don't breaks
             name: manala.supervisor
           vars:
             manala_supervisor_configs_dir: tmp/configs/default
@@ -99,6 +100,7 @@
           loop: [bar, qux]
         - import_role:
             name: manala.supervisor
+            tasks_from: configs
           vars:
             manala_supervisor_configs_dir: tmp/configs/state
             manala_supervisor_configs:
@@ -124,6 +126,7 @@
             state: absent
         - import_role:
             name: manala.supervisor
+            tasks_from: configs
           vars:
             manala_supervisor_configs_dir: tmp/configs/defaults
             manala_supervisor_configs_defaults:
@@ -151,6 +154,7 @@
           loop: [foo, bar, baz, qux]
         - import_role:
             name: manala.supervisor
+            tasks_from: configs
           vars:
             manala_supervisor_configs_dir: tmp/configs/exclusive
             manala_supervisor_configs_exclusive: true
diff --git a/tests/0400_services.goss.yml b/tests/0400_services.goss.yml
deleted file mode 100644
index 27d4d5f..0000000
--- a/tests/0400_services.goss.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-
-service:
-  supervisor:
-    enabled: true
-    running: true
diff --git a/tests/0400_services.yml b/tests/0400_services.yml
deleted file mode 100644
index 5d35edb..0000000
--- a/tests/0400_services.yml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-
-- name: "{{ test }}"
-  hosts: debian
-  become: true
-  tasks:
-
-    - block:
-        - import_tasks: pre_tasks/backports.yml
-          when: ansible_distribution_release in ['stretch']
-        - import_tasks: pre_tasks/manala.yml
-          when: ansible_distribution_release in ['jessie']
-
-    - block:
-        - import_role:
-            name: manala.supervisor
-      always:
-        - name: Goss
-          command: >
-            goss --gossfile {{ test }}.goss.yml validate