diff --git a/component/geoip2/buildout.cfg b/component/geoip2/buildout.cfg
index cab389240b5c3aa67b821331dd79925f83ddefac..75a0c1461db5b0ae2d7ed2ed2e574fe0c4392d77 100644
--- a/component/geoip2/buildout.cfg
+++ b/component/geoip2/buildout.cfg
@@ -17,5 +17,5 @@ rpath = ${:library-dirs}
 [geolite2-country]
 recipe = slapos.recipe.build:download-unpacked
 url = http://geolite.maxmind.com/download/geoip/database/GeoLite2-Country.tar.gz#${:md5sum}
-md5sum = 5dda13a7af3044a1791992712e377252
+md5sum = d77df0f613c542af8122a78c03d53a27
 strip-top-level-dir = true
diff --git a/component/openssl/buildout.cfg b/component/openssl/buildout.cfg
index c8b1168f1455571bfe20151d4c03e1c642f425d1..7e1a9d86347183c296335a4d3c032ec6742e1869 100644
--- a/component/openssl/buildout.cfg
+++ b/component/openssl/buildout.cfg
@@ -21,8 +21,9 @@ url = https://www.openssl.org/source/openssl-1.1.0j.tar.gz
 md5sum = b4ca5b78ae6ae79da80790b30dbedbdc
 location = @@LOCATION@@
 # 'prefix' option to override --openssldir/--prefix (which is useful
-# when combined with INSTALL_PREFIX). Used by slapos.package.git/obs
+# when combined with DESTDIR). Used by slapos.package.git/obs
 prefix = ${:location}
+make-install-extra =
 certs = ${:location}/etc/ssl/certs
 configure-command = ./config
 configure-options =
@@ -37,7 +38,7 @@ configure-options =
 make-options =
   SHARED_LDFLAGS='-Wl,-rpath=${:location}/lib -Wl,-rpath=${zlib:location}/lib'
 make-targets =
-  -j1 install_sw install_ssldirs &&
+  -j1 install_sw install_ssldirs ${:make-install-extra} &&
   rm -f ${:certs}/* &&
   for i in ${ca-certificates:location}/certs/*/*.crt; do
     ln -sfv $i ${:certs}/`${:location}/bin/openssl x509 -hash -noout -in $i`.0
diff --git a/software/caddy-frontend/buildout.hash.cfg b/software/caddy-frontend/buildout.hash.cfg
index eace3a9a85d13130bce10238e36509ce4691e2aa..d53d35d19063321abfce665bf9747af96ac5733e 100644
--- a/software/caddy-frontend/buildout.hash.cfg
+++ b/software/caddy-frontend/buildout.hash.cfg
@@ -26,11 +26,11 @@ md5sum = 6fd023f0d29421d8579f0b3351473bb0
 
 [template-apache-replicate]
 filename = instance-apache-replicate.cfg.in
-md5sum = 15d6b5b00ab1f74d42863c90f2537981
+md5sum = 5c5462ccc327fe109e0c102f0d3e7e53
 
 [template-slave-list]
 filename = templates/apache-custom-slave-list.cfg.in
-md5sum = 439a4e415bef9d44b37bee4d5e4aa924
+md5sum = 028ca41fdf7a758ba701ccc5e449419a
 
 [template-slave-configuration]
 filename = templates/custom-virtualhost.conf.in
@@ -38,7 +38,7 @@ md5sum = 54ae95597a126ae552c3a913ddf29e5e
 
 [template-replicate-publish-slave-information]
 filename = templates/replicate-publish-slave-information.cfg.in
-md5sum = 73e3d1e55a98a3c4d25a1618aa584fff
+md5sum = 696ef7690f51a521cc6f6c9d9d5d844e
 
 [template-caddy-frontend-configuration]
 filename = templates/Caddyfile.in
diff --git a/software/caddy-frontend/instance-apache-replicate.cfg.in b/software/caddy-frontend/instance-apache-replicate.cfg.in
index 980617d6c5c91bc6734e2f4545376ac07d5e7eb4..e744a79fce539cf2613bad8be14b4b61836032c0 100644
--- a/software/caddy-frontend/instance-apache-replicate.cfg.in
+++ b/software/caddy-frontend/instance-apache-replicate.cfg.in
@@ -224,11 +224,13 @@ custom-group = ${dynamic-publish-slave-information:rendered}
 {% endfor %}
 
 [active-slave-instance]
+{% set active_slave_instance_list = [] %}
 {% for slave_instance in slave_instance_list %}
 {# Provide a list of slave titles send by master, in order to filter out already destroyed slaves #}
 {# Note: This functionality is not yet covered by tests, please modify with care #}
-{{ slave_instance['slave_title'] }} = active
+{%   do active_slave_instance_list.append(slave_instance['slave_reference']) %}
 {% endfor %}
+active-slave-instance-list = {{ json_module.dumps(active_slave_instance_list) }}
 
 [dynamic-publish-slave-information]
 < = jinja2-template-base
diff --git a/software/caddy-frontend/templates/apache-custom-slave-list.cfg.in b/software/caddy-frontend/templates/apache-custom-slave-list.cfg.in
index 5af8a46ab1beb30924227168ee425b0a60b93a9e..2ba8d184702b228071425bd2f4f210ebd34658c6 100644
--- a/software/caddy-frontend/templates/apache-custom-slave-list.cfg.in
+++ b/software/caddy-frontend/templates/apache-custom-slave-list.cfg.in
@@ -87,7 +87,7 @@ output = {{ plugin_directory }}/${:name}
 {#   Add slave log directory to the slave log access dict #}
 {%   do slave_log_dict.__setitem__(slave_reference, slave_log_folder) %}
 
-{%   set slave_log_access_url = 'https://' + slave_reference + ':${'+ slave_password_section +':passwd}@[' + frontend_configuration.get('caddy-ipv6') + ']:' + frontend_configuration.get('caddy-https-port') + '/' + slave_reference.lower() + '/' %}
+{%   set slave_log_access_url = 'https://' + slave_reference.lower() + ':${'+ slave_password_section +':passwd}@[' + frontend_configuration.get('caddy-ipv6') + ']:' + frontend_configuration.get('caddy-https-port') + '/' + slave_reference.lower() + '/' %}
 {%   do slave_publish_dict.__setitem__('log-access', slave_log_access_url) %}
 {%   do slave_publish_dict.__setitem__('slave-reference', slave_reference) %}
 {%   do slave_publish_dict.__setitem__('public-ipv4', public_ipv4) %}
diff --git a/software/caddy-frontend/templates/replicate-publish-slave-information.cfg.in b/software/caddy-frontend/templates/replicate-publish-slave-information.cfg.in
index ebdc5b28acf80e3102c48b6c9221604dabc3db6b..8525bcca70dea76664256053e192752563801501 100644
--- a/software/caddy-frontend/templates/replicate-publish-slave-information.cfg.in
+++ b/software/caddy-frontend/templates/replicate-publish-slave-information.cfg.in
@@ -35,10 +35,11 @@
 {% endfor %}
 
 # Publish information for each slave
+{% set active_slave_instance_list = json_module.loads(active_slave_instance_dict['active-slave-instance-list']) %}
 {% for slave_reference, slave_information in slave_information_dict.iteritems() %}
 {#   Filter out destroyed, so not existing anymore, slaves #}
 {#   Note: This functionality is not yet covered by tests, please modify with care #}
-{%   if slave_reference in active_slave_instance_dict %}
+{%   if slave_reference in active_slave_instance_list %}
 {%     set publish_section_title = 'publish-%s' % slave_reference %}
 {%     do part_list.append(publish_section_title) %}
 [{{ publish_section_title }}]
diff --git a/software/caddy-frontend/test/test.py b/software/caddy-frontend/test/test.py
index 0d4f9d0fa4e25eaf02191d71ffa1e8597f703067..8f5414f64df63e765e168b10fe5153b5403a40e5 100644
--- a/software/caddy-frontend/test/test.py
+++ b/software/caddy-frontend/test/test.py
@@ -825,7 +825,7 @@ http://apachecustomhttpsaccepted.example.com:%%(http_port)s {
     return {
       'empty': {
       },
-      'url': {
+      'Url': {
         'url': cls.backend_url,
       },
       'url_https-url': {
@@ -1100,7 +1100,7 @@ http://apachecustomhttpsaccepted.example.com:%%(http_port)s {
         'check-free-disk-space.py',
         'monitor-http-frontend.py',
         'monitor-httpd-listening-on-tcp.py',
-        'buildout-%s-0-status.py' % (type(self).__name__,),
+        'buildout-T-0-status.py',
         '__init__.py',
       ]),
       set([
@@ -1203,7 +1203,7 @@ http://apachecustomhttpsaccepted.example.com:%%(http_port)s {
     )
 
   def test_url(self):
-    parameter_dict = self.parseSlaveParameterDict('url')
+    parameter_dict = self.parseSlaveParameterDict('Url')
 
     self.assertLogAccessUrlWithPop(parameter_dict)
     self.assertEqual(
@@ -1265,7 +1265,7 @@ http://apachecustomhttpsaccepted.example.com:%%(http_port)s {
 
     # check that try_duration == 5 in the test_url slave
     slave_configuration_file = glob.glob(os.path.join(
-      self.instance_path, '*', 'etc', '*slave-conf.d', '_url.conf'))[0]
+      self.instance_path, '*', 'etc', '*slave-conf.d', '_Url.conf'))[0]
     with open(slave_configuration_file) as fh:
       content = fh.read()
       self.assertTrue('try_duration 5s' in content)
@@ -3588,6 +3588,10 @@ class TestDefaultMonitorHttpdPort(SlaveHttpFrontendTestCase, TestDataMixin):
   def getInstanceParameterDict(cls):
     return {
       '-frontend-1-state': 'stopped',
+      'port': HTTPS_PORT,
+      'plain_http_port': HTTP_PORT,
+      'nginx_port': NGINX_HTTPS_PORT,
+      'plain_nginx_port': NGINX_HTTP_PORT,
     }
 
   @classmethod
@@ -3609,10 +3613,10 @@ class TestDefaultMonitorHttpdPort(SlaveHttpFrontendTestCase, TestDataMixin):
       parameter_dict
     )
     master_monitor_conf = open(os.path.join(
-      self.instance_path, 'TestDefaultMonitorHttpdPort-0', 'etc',
+      self.instance_path, 'T-0', 'etc',
       'monitor-httpd.conf')).read()
     slave_monitor_conf = open(os.path.join(
-      self.instance_path, 'TestDefaultMonitorHttpdPort-1', 'etc',
+      self.instance_path, 'T-1', 'etc',
       'monitor-httpd.conf')).read()
 
     self.assertTrue(
diff --git a/software/caddy-frontend/test/test_data/test.TestDefaultMonitorHttpdPort.test_file_list_run-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestDefaultMonitorHttpdPort.test_file_list_run-CADDY.txt
index 705fd075cb63e4ec414c520e3cb2a7ae116856bf..bf75f0a824727afd23e399c2e1bed0d54d48589b 100644
--- a/software/caddy-frontend/test/test_data/test.TestDefaultMonitorHttpdPort.test_file_list_run-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestDefaultMonitorHttpdPort.test_file_list_run-CADDY.txt
@@ -1 +1 @@
-TestDefaultMonitorHttpdPort-0/var/run/monitor/monitor-bootstrap.pid
\ No newline at end of file
+T-0/var/run/monitor/monitor-bootstrap.pid
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestDefaultMonitorHttpdPort.test_promise_run_plugin-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestDefaultMonitorHttpdPort.test_promise_run_plugin-CADDY.txt
index aa60d1be4e4253100081e478bec37576efb2eab2..a35b73a0f6d6c736a77b7e5846959750f0d030d1 100644
--- a/software/caddy-frontend/test/test_data/test.TestDefaultMonitorHttpdPort.test_promise_run_plugin-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestDefaultMonitorHttpdPort.test_promise_run_plugin-CADDY.txt
@@ -1,24 +1,24 @@
-TestDefaultMonitorHttpdPort-0/etc/plugin/buildout-TestDefaultMonitorHttpdPort-0-status.py: OK
-TestDefaultMonitorHttpdPort-0/etc/plugin/check-free-disk-space.py: OK
-TestDefaultMonitorHttpdPort-0/etc/plugin/monitor-bootstrap-status.py: OK
-TestDefaultMonitorHttpdPort-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-TestDefaultMonitorHttpdPort-1/etc/plugin/buildout-TestDefaultMonitorHttpdPort-1-status.py: OK
-TestDefaultMonitorHttpdPort-1/etc/plugin/caddy_cached.py: ERROR
-TestDefaultMonitorHttpdPort-1/etc/plugin/caddy_frontend_ipv4_http.py: ERROR
-TestDefaultMonitorHttpdPort-1/etc/plugin/caddy_frontend_ipv4_https.py: ERROR
-TestDefaultMonitorHttpdPort-1/etc/plugin/caddy_frontend_ipv6_http.py: ERROR
-TestDefaultMonitorHttpdPort-1/etc/plugin/caddy_frontend_ipv6_https.py: ERROR
-TestDefaultMonitorHttpdPort-1/etc/plugin/caddy_ssl_cached.py: ERROR
-TestDefaultMonitorHttpdPort-1/etc/plugin/check-_test-error-log-last-day.py: OK
-TestDefaultMonitorHttpdPort-1/etc/plugin/check-_test-error-log-last-hour.py: OK
-TestDefaultMonitorHttpdPort-1/etc/plugin/check-free-disk-space.py: OK
-TestDefaultMonitorHttpdPort-1/etc/plugin/frontend-caddy-configuration-promise.py: ERROR
-TestDefaultMonitorHttpdPort-1/etc/plugin/monitor-bootstrap-status.py: OK
-TestDefaultMonitorHttpdPort-1/etc/plugin/monitor-httpd-listening-on-tcp.py: ERROR
-TestDefaultMonitorHttpdPort-1/etc/plugin/nginx-configuration-promise.py: ERROR
-TestDefaultMonitorHttpdPort-1/etc/plugin/nginx_frontend_ipv4_http.py: ERROR
-TestDefaultMonitorHttpdPort-1/etc/plugin/nginx_frontend_ipv4_https.py: ERROR
-TestDefaultMonitorHttpdPort-1/etc/plugin/nginx_frontend_ipv6_http.py: ERROR
-TestDefaultMonitorHttpdPort-1/etc/plugin/nginx_frontend_ipv6_https.py: ERROR
-TestDefaultMonitorHttpdPort-1/etc/plugin/re6st-connectivity.py: OK
-TestDefaultMonitorHttpdPort-1/etc/plugin/trafficserver-port-listening.py: ERROR
\ No newline at end of file
+T-0/etc/plugin/buildout-T-0-status.py: OK
+T-0/etc/plugin/check-free-disk-space.py: OK
+T-0/etc/plugin/monitor-bootstrap-status.py: OK
+T-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
+T-1/etc/plugin/buildout-T-1-status.py: OK
+T-1/etc/plugin/caddy_cached.py: ERROR
+T-1/etc/plugin/caddy_frontend_ipv4_http.py: ERROR
+T-1/etc/plugin/caddy_frontend_ipv4_https.py: ERROR
+T-1/etc/plugin/caddy_frontend_ipv6_http.py: ERROR
+T-1/etc/plugin/caddy_frontend_ipv6_https.py: ERROR
+T-1/etc/plugin/caddy_ssl_cached.py: ERROR
+T-1/etc/plugin/check-_test-error-log-last-day.py: OK
+T-1/etc/plugin/check-_test-error-log-last-hour.py: OK
+T-1/etc/plugin/check-free-disk-space.py: OK
+T-1/etc/plugin/frontend-caddy-configuration-promise.py: ERROR
+T-1/etc/plugin/monitor-bootstrap-status.py: OK
+T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: ERROR
+T-1/etc/plugin/nginx-configuration-promise.py: ERROR
+T-1/etc/plugin/nginx_frontend_ipv4_http.py: ERROR
+T-1/etc/plugin/nginx_frontend_ipv4_https.py: ERROR
+T-1/etc/plugin/nginx_frontend_ipv6_http.py: ERROR
+T-1/etc/plugin/nginx_frontend_ipv6_https.py: ERROR
+T-1/etc/plugin/re6st-connectivity.py: OK
+T-1/etc/plugin/trafficserver-port-listening.py: ERROR
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestDefaultMonitorHttpdPort.test_promise_run_promise-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestDefaultMonitorHttpdPort.test_promise_run_promise-CADDY.txt
index dca69d8cb739278d63b5c6698600ef0edcf39553..5105e42af08be204b45dbb4be093052c9805c0f6 100644
--- a/software/caddy-frontend/test/test_data/test.TestDefaultMonitorHttpdPort.test_promise_run_promise-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestDefaultMonitorHttpdPort.test_promise_run_promise-CADDY.txt
@@ -1,4 +1,4 @@
-TestDefaultMonitorHttpdPort-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK
-TestDefaultMonitorHttpdPort-1/etc/promise/caddy-frontend-is-running-actual-software-release: OK
-TestDefaultMonitorHttpdPort-1/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK
-TestDefaultMonitorHttpdPort-1/etc/promise/promise-nginx-is-process-older-than-dependency-set: OK
\ No newline at end of file
+T-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK
+T-1/etc/promise/caddy-frontend-is-running-actual-software-release: OK
+T-1/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK
+T-1/etc/promise/promise-nginx-is-process-older-than-dependency-set: OK
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestDefaultMonitorHttpdPort.test_supervisor_state-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestDefaultMonitorHttpdPort.test_supervisor_state-CADDY.txt
index 0f3b858e303cdd1a846f53e7985a4d58200927f3..4617a68a16dde72164492cbdc68b491438820df0 100644
--- a/software/caddy-frontend/test/test_data/test.TestDefaultMonitorHttpdPort.test_supervisor_state-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestDefaultMonitorHttpdPort.test_supervisor_state-CADDY.txt
@@ -1,24 +1,24 @@
-TestDefaultMonitorHttpdPort-0:bootstrap-monitor EXITED
-TestDefaultMonitorHttpdPort-0:certificate_authority-{hash}-on-watch RUNNING
-TestDefaultMonitorHttpdPort-0:crond-{hash} RUNNING
-TestDefaultMonitorHttpdPort-0:monitor-httpd-{hash}-on-watch EXITED
-TestDefaultMonitorHttpdPort-0:monitor-httpd-graceful EXITED
-TestDefaultMonitorHttpdPort-1:6tunnel-26011-{hash}-on-watch STOPPED
-TestDefaultMonitorHttpdPort-1:6tunnel-26012-{hash}-on-watch STOPPED
-TestDefaultMonitorHttpdPort-1:6tunnel-4443-{hash}-on-watch STOPPED
-TestDefaultMonitorHttpdPort-1:6tunnel-8080-{hash}-on-watch STOPPED
-TestDefaultMonitorHttpdPort-1:6tunnel-8081-{hash}-on-watch STOPPED
-TestDefaultMonitorHttpdPort-1:6tunnel-9443-{hash}-on-watch STOPPED
-TestDefaultMonitorHttpdPort-1:bootstrap-monitor STOPPED
-TestDefaultMonitorHttpdPort-1:certificate_authority-{hash}-on-watch STOPPED
-TestDefaultMonitorHttpdPort-1:crond-{hash} STOPPED
-TestDefaultMonitorHttpdPort-1:crond-on-watch STOPPED
-TestDefaultMonitorHttpdPort-1:frontend-caddy-safe-graceful STOPPED
-TestDefaultMonitorHttpdPort-1:frontend-nginx-safe-graceful STOPPED
-TestDefaultMonitorHttpdPort-1:frontend_caddy-{hash}-on-watch STOPPED
-TestDefaultMonitorHttpdPort-1:frontend_nginx-{hash}-on-watch STOPPED
-TestDefaultMonitorHttpdPort-1:monitor-httpd-{hash}-on-watch STOPPED
-TestDefaultMonitorHttpdPort-1:monitor-httpd-graceful STOPPED
-TestDefaultMonitorHttpdPort-1:trafficserver-{hash}-on-watch STOPPED
-TestDefaultMonitorHttpdPort-1:trafficserver-reload STOPPED
+T-0:bootstrap-monitor EXITED
+T-0:certificate_authority-{hash}-on-watch RUNNING
+T-0:crond-{hash} RUNNING
+T-0:monitor-httpd-{hash}-on-watch EXITED
+T-0:monitor-httpd-graceful EXITED
+T-1:6tunnel-11080-{hash}-on-watch STOPPED
+T-1:6tunnel-11443-{hash}-on-watch STOPPED
+T-1:6tunnel-12080-{hash}-on-watch STOPPED
+T-1:6tunnel-12443-{hash}-on-watch STOPPED
+T-1:6tunnel-26011-{hash}-on-watch STOPPED
+T-1:6tunnel-26012-{hash}-on-watch STOPPED
+T-1:bootstrap-monitor STOPPED
+T-1:certificate_authority-{hash}-on-watch STOPPED
+T-1:crond-{hash} STOPPED
+T-1:crond-on-watch STOPPED
+T-1:frontend-caddy-safe-graceful STOPPED
+T-1:frontend-nginx-safe-graceful STOPPED
+T-1:frontend_caddy-{hash}-on-watch STOPPED
+T-1:frontend_nginx-{hash}-on-watch STOPPED
+T-1:monitor-httpd-{hash}-on-watch STOPPED
+T-1:monitor-httpd-graceful STOPPED
+T-1:trafficserver-{hash}-on-watch STOPPED
+T-1:trafficserver-reload STOPPED
 watchdog:watchdog RUNNING
diff --git a/software/caddy-frontend/test/test_data/test.TestDuplicateSiteKeyProtection.test_file_list_log-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestDuplicateSiteKeyProtection.test_file_list_log-CADDY.txt
index 8a23280478b7f975b3debafbc9b42087a70adc4b..96e01e61f79b3d6564c0afcb7c8f8685db515958 100644
--- a/software/caddy-frontend/test/test_data/test.TestDuplicateSiteKeyProtection.test_file_list_log-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestDuplicateSiteKeyProtection.test_file_list_log-CADDY.txt
@@ -1,10 +1,10 @@
-TestDuplicateSiteKeyProtection-0/var/log/monitor-httpd-error.log
-TestDuplicateSiteKeyProtection-1/var/log/frontend-access.log
-TestDuplicateSiteKeyProtection-1/var/log/frontend-error.log
-TestDuplicateSiteKeyProtection-1/var/log/httpd/_site_2_access_log
-TestDuplicateSiteKeyProtection-1/var/log/httpd/_site_2_error_log
-TestDuplicateSiteKeyProtection-1/var/log/monitor-httpd-error.log
-TestDuplicateSiteKeyProtection-1/var/log/nginx-access.log
-TestDuplicateSiteKeyProtection-1/var/log/nginx-error.log
-TestDuplicateSiteKeyProtection-1/var/log/trafficserver/manager.log
-TestDuplicateSiteKeyProtection-1/var/log/trafficserver/traffic.out
\ No newline at end of file
+T-0/var/log/monitor-httpd-error.log
+T-1/var/log/frontend-access.log
+T-1/var/log/frontend-error.log
+T-1/var/log/httpd/_site_2_access_log
+T-1/var/log/httpd/_site_2_error_log
+T-1/var/log/monitor-httpd-error.log
+T-1/var/log/nginx-access.log
+T-1/var/log/nginx-error.log
+T-1/var/log/trafficserver/manager.log
+T-1/var/log/trafficserver/traffic.out
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestDuplicateSiteKeyProtection.test_file_list_run-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestDuplicateSiteKeyProtection.test_file_list_run-CADDY.txt
index 0a239cb0539a50145450dd4cdb7e0c1b12f41d90..1c68573ce5e83743455f6b80fbdafc141dbda22b 100644
--- a/software/caddy-frontend/test/test_data/test.TestDuplicateSiteKeyProtection.test_file_list_run-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestDuplicateSiteKeyProtection.test_file_list_run-CADDY.txt
@@ -1,12 +1,12 @@
-TestDuplicateSiteKeyProtection-0/var/run/monitor-httpd.pid
-TestDuplicateSiteKeyProtection-0/var/run/monitor/monitor-bootstrap.pid
-TestDuplicateSiteKeyProtection-1/var/run/caddy_graceful_signature
-TestDuplicateSiteKeyProtection-1/var/run/caddy_validate_signature
-TestDuplicateSiteKeyProtection-1/var/run/caddy_validate_signature.status
-TestDuplicateSiteKeyProtection-1/var/run/httpd.pid
-TestDuplicateSiteKeyProtection-1/var/run/monitor-httpd.pid
-TestDuplicateSiteKeyProtection-1/var/run/monitor/monitor-bootstrap.pid
-TestDuplicateSiteKeyProtection-1/var/run/nginx.pid
-TestDuplicateSiteKeyProtection-1/var/run/nginx_graceful_signature
-TestDuplicateSiteKeyProtection-1/var/run/nginx_validate_signature
-TestDuplicateSiteKeyProtection-1/var/run/nginx_validate_signature.status
\ No newline at end of file
+T-0/var/run/monitor-httpd.pid
+T-0/var/run/monitor/monitor-bootstrap.pid
+T-1/var/run/caddy_graceful_signature
+T-1/var/run/caddy_validate_signature
+T-1/var/run/caddy_validate_signature.status
+T-1/var/run/httpd.pid
+T-1/var/run/monitor-httpd.pid
+T-1/var/run/monitor/monitor-bootstrap.pid
+T-1/var/run/nginx.pid
+T-1/var/run/nginx_graceful_signature
+T-1/var/run/nginx_validate_signature
+T-1/var/run/nginx_validate_signature.status
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestDuplicateSiteKeyProtection.test_promise_run_plugin-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestDuplicateSiteKeyProtection.test_promise_run_plugin-CADDY.txt
index 2ab05418514d3ca08e06fb1b11f7b1761421c44f..ec40e71f41fa85c9081cf325147ffbdd935a33d8 100644
--- a/software/caddy-frontend/test/test_data/test.TestDuplicateSiteKeyProtection.test_promise_run_plugin-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestDuplicateSiteKeyProtection.test_promise_run_plugin-CADDY.txt
@@ -1,24 +1,24 @@
-TestDuplicateSiteKeyProtection-0/etc/plugin/buildout-TestDuplicateSiteKeyProtection-0-status.py: OK
-TestDuplicateSiteKeyProtection-0/etc/plugin/check-free-disk-space.py: OK
-TestDuplicateSiteKeyProtection-0/etc/plugin/monitor-bootstrap-status.py: OK
-TestDuplicateSiteKeyProtection-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-TestDuplicateSiteKeyProtection-1/etc/plugin/buildout-TestDuplicateSiteKeyProtection-1-status.py: OK
-TestDuplicateSiteKeyProtection-1/etc/plugin/caddy_cached.py: ERROR
-TestDuplicateSiteKeyProtection-1/etc/plugin/caddy_frontend_ipv4_http.py: OK
-TestDuplicateSiteKeyProtection-1/etc/plugin/caddy_frontend_ipv4_https.py: OK
-TestDuplicateSiteKeyProtection-1/etc/plugin/caddy_frontend_ipv6_http.py: OK
-TestDuplicateSiteKeyProtection-1/etc/plugin/caddy_frontend_ipv6_https.py: OK
-TestDuplicateSiteKeyProtection-1/etc/plugin/caddy_ssl_cached.py: ERROR
-TestDuplicateSiteKeyProtection-1/etc/plugin/check-_site_2-error-log-last-day.py: OK
-TestDuplicateSiteKeyProtection-1/etc/plugin/check-_site_2-error-log-last-hour.py: OK
-TestDuplicateSiteKeyProtection-1/etc/plugin/check-free-disk-space.py: OK
-TestDuplicateSiteKeyProtection-1/etc/plugin/frontend-caddy-configuration-promise.py: OK
-TestDuplicateSiteKeyProtection-1/etc/plugin/monitor-bootstrap-status.py: OK
-TestDuplicateSiteKeyProtection-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-TestDuplicateSiteKeyProtection-1/etc/plugin/nginx-configuration-promise.py: OK
-TestDuplicateSiteKeyProtection-1/etc/plugin/nginx_frontend_ipv4_http.py: OK
-TestDuplicateSiteKeyProtection-1/etc/plugin/nginx_frontend_ipv4_https.py: OK
-TestDuplicateSiteKeyProtection-1/etc/plugin/nginx_frontend_ipv6_http.py: OK
-TestDuplicateSiteKeyProtection-1/etc/plugin/nginx_frontend_ipv6_https.py: OK
-TestDuplicateSiteKeyProtection-1/etc/plugin/re6st-connectivity.py: OK
-TestDuplicateSiteKeyProtection-1/etc/plugin/trafficserver-port-listening.py: OK
\ No newline at end of file
+T-0/etc/plugin/buildout-T-0-status.py: OK
+T-0/etc/plugin/check-free-disk-space.py: OK
+T-0/etc/plugin/monitor-bootstrap-status.py: OK
+T-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
+T-1/etc/plugin/buildout-T-1-status.py: OK
+T-1/etc/plugin/caddy_cached.py: ERROR
+T-1/etc/plugin/caddy_frontend_ipv4_http.py: OK
+T-1/etc/plugin/caddy_frontend_ipv4_https.py: OK
+T-1/etc/plugin/caddy_frontend_ipv6_http.py: OK
+T-1/etc/plugin/caddy_frontend_ipv6_https.py: OK
+T-1/etc/plugin/caddy_ssl_cached.py: ERROR
+T-1/etc/plugin/check-_site_2-error-log-last-day.py: OK
+T-1/etc/plugin/check-_site_2-error-log-last-hour.py: OK
+T-1/etc/plugin/check-free-disk-space.py: OK
+T-1/etc/plugin/frontend-caddy-configuration-promise.py: OK
+T-1/etc/plugin/monitor-bootstrap-status.py: OK
+T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
+T-1/etc/plugin/nginx-configuration-promise.py: OK
+T-1/etc/plugin/nginx_frontend_ipv4_http.py: OK
+T-1/etc/plugin/nginx_frontend_ipv4_https.py: OK
+T-1/etc/plugin/nginx_frontend_ipv6_http.py: OK
+T-1/etc/plugin/nginx_frontend_ipv6_https.py: OK
+T-1/etc/plugin/re6st-connectivity.py: OK
+T-1/etc/plugin/trafficserver-port-listening.py: OK
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestDuplicateSiteKeyProtection.test_promise_run_promise-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestDuplicateSiteKeyProtection.test_promise_run_promise-CADDY.txt
index bd5764cf9288e5898b6ccb807da8f6d2ce5a08fc..5105e42af08be204b45dbb4be093052c9805c0f6 100644
--- a/software/caddy-frontend/test/test_data/test.TestDuplicateSiteKeyProtection.test_promise_run_promise-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestDuplicateSiteKeyProtection.test_promise_run_promise-CADDY.txt
@@ -1,4 +1,4 @@
-TestDuplicateSiteKeyProtection-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK
-TestDuplicateSiteKeyProtection-1/etc/promise/caddy-frontend-is-running-actual-software-release: OK
-TestDuplicateSiteKeyProtection-1/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK
-TestDuplicateSiteKeyProtection-1/etc/promise/promise-nginx-is-process-older-than-dependency-set: OK
\ No newline at end of file
+T-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK
+T-1/etc/promise/caddy-frontend-is-running-actual-software-release: OK
+T-1/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK
+T-1/etc/promise/promise-nginx-is-process-older-than-dependency-set: OK
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestDuplicateSiteKeyProtection.test_supervisor_state-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestDuplicateSiteKeyProtection.test_supervisor_state-CADDY.txt
index 4d6d2454931c5e46b24664332c418569b9e278b3..0efdb10a5da84b6ae5157ed1172abad2fadc7736 100644
--- a/software/caddy-frontend/test/test_data/test.TestDuplicateSiteKeyProtection.test_supervisor_state-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestDuplicateSiteKeyProtection.test_supervisor_state-CADDY.txt
@@ -1,24 +1,24 @@
-TestDuplicateSiteKeyProtection-0:bootstrap-monitor EXITED
-TestDuplicateSiteKeyProtection-0:certificate_authority-{hash}-on-watch RUNNING
-TestDuplicateSiteKeyProtection-0:crond-{hash} RUNNING
-TestDuplicateSiteKeyProtection-0:monitor-httpd-{hash}-on-watch RUNNING
-TestDuplicateSiteKeyProtection-0:monitor-httpd-graceful EXITED
-TestDuplicateSiteKeyProtection-1:6tunnel-11080-{hash}-on-watch RUNNING
-TestDuplicateSiteKeyProtection-1:6tunnel-11443-{hash}-on-watch RUNNING
-TestDuplicateSiteKeyProtection-1:6tunnel-12080-{hash}-on-watch RUNNING
-TestDuplicateSiteKeyProtection-1:6tunnel-12443-{hash}-on-watch RUNNING
-TestDuplicateSiteKeyProtection-1:6tunnel-26011-{hash}-on-watch RUNNING
-TestDuplicateSiteKeyProtection-1:6tunnel-26012-{hash}-on-watch RUNNING
-TestDuplicateSiteKeyProtection-1:bootstrap-monitor EXITED
-TestDuplicateSiteKeyProtection-1:certificate_authority-{hash}-on-watch RUNNING
-TestDuplicateSiteKeyProtection-1:crond-{hash} RUNNING
-TestDuplicateSiteKeyProtection-1:crond-on-watch RUNNING
-TestDuplicateSiteKeyProtection-1:frontend-caddy-safe-graceful EXITED
-TestDuplicateSiteKeyProtection-1:frontend-nginx-safe-graceful EXITED
-TestDuplicateSiteKeyProtection-1:frontend_caddy-{hash}-on-watch RUNNING
-TestDuplicateSiteKeyProtection-1:frontend_nginx-{hash}-on-watch RUNNING
-TestDuplicateSiteKeyProtection-1:monitor-httpd-{hash}-on-watch RUNNING
-TestDuplicateSiteKeyProtection-1:monitor-httpd-graceful EXITED
-TestDuplicateSiteKeyProtection-1:trafficserver-{hash}-on-watch RUNNING
-TestDuplicateSiteKeyProtection-1:trafficserver-reload EXITED
+T-0:bootstrap-monitor EXITED
+T-0:certificate_authority-{hash}-on-watch RUNNING
+T-0:crond-{hash} RUNNING
+T-0:monitor-httpd-{hash}-on-watch RUNNING
+T-0:monitor-httpd-graceful EXITED
+T-1:6tunnel-11080-{hash}-on-watch RUNNING
+T-1:6tunnel-11443-{hash}-on-watch RUNNING
+T-1:6tunnel-12080-{hash}-on-watch RUNNING
+T-1:6tunnel-12443-{hash}-on-watch RUNNING
+T-1:6tunnel-26011-{hash}-on-watch RUNNING
+T-1:6tunnel-26012-{hash}-on-watch RUNNING
+T-1:bootstrap-monitor EXITED
+T-1:certificate_authority-{hash}-on-watch RUNNING
+T-1:crond-{hash} RUNNING
+T-1:crond-on-watch RUNNING
+T-1:frontend-caddy-safe-graceful EXITED
+T-1:frontend-nginx-safe-graceful EXITED
+T-1:frontend_caddy-{hash}-on-watch RUNNING
+T-1:frontend_nginx-{hash}-on-watch RUNNING
+T-1:monitor-httpd-{hash}-on-watch RUNNING
+T-1:monitor-httpd-graceful EXITED
+T-1:trafficserver-{hash}-on-watch RUNNING
+T-1:trafficserver-reload EXITED
 watchdog:watchdog RUNNING
diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_file_list_log-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_file_list_log-CADDY.txt
index 3e1f754ca4e25a40a14d63bcb73e6c9aa73335bd..bac2a63edb37df119caedbec10b029d444484488 100644
--- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_file_list_log-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_file_list_log-CADDY.txt
@@ -1,14 +1,14 @@
-TestEnableHttp2ByDefaultDefaultSlave-0/var/log/monitor-httpd-error.log
-TestEnableHttp2ByDefaultDefaultSlave-1/var/log/frontend-access.log
-TestEnableHttp2ByDefaultDefaultSlave-1/var/log/frontend-error.log
-TestEnableHttp2ByDefaultDefaultSlave-1/var/log/httpd/_enable-http2-default_access_log
-TestEnableHttp2ByDefaultDefaultSlave-1/var/log/httpd/_enable-http2-default_error_log
-TestEnableHttp2ByDefaultDefaultSlave-1/var/log/httpd/_enable-http2-false_access_log
-TestEnableHttp2ByDefaultDefaultSlave-1/var/log/httpd/_enable-http2-false_error_log
-TestEnableHttp2ByDefaultDefaultSlave-1/var/log/httpd/_enable-http2-true_access_log
-TestEnableHttp2ByDefaultDefaultSlave-1/var/log/httpd/_enable-http2-true_error_log
-TestEnableHttp2ByDefaultDefaultSlave-1/var/log/monitor-httpd-error.log
-TestEnableHttp2ByDefaultDefaultSlave-1/var/log/nginx-access.log
-TestEnableHttp2ByDefaultDefaultSlave-1/var/log/nginx-error.log
-TestEnableHttp2ByDefaultDefaultSlave-1/var/log/trafficserver/manager.log
-TestEnableHttp2ByDefaultDefaultSlave-1/var/log/trafficserver/traffic.out
\ No newline at end of file
+T-0/var/log/monitor-httpd-error.log
+T-1/var/log/frontend-access.log
+T-1/var/log/frontend-error.log
+T-1/var/log/httpd/_enable-http2-default_access_log
+T-1/var/log/httpd/_enable-http2-default_error_log
+T-1/var/log/httpd/_enable-http2-false_access_log
+T-1/var/log/httpd/_enable-http2-false_error_log
+T-1/var/log/httpd/_enable-http2-true_access_log
+T-1/var/log/httpd/_enable-http2-true_error_log
+T-1/var/log/monitor-httpd-error.log
+T-1/var/log/nginx-access.log
+T-1/var/log/nginx-error.log
+T-1/var/log/trafficserver/manager.log
+T-1/var/log/trafficserver/traffic.out
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_file_list_run-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_file_list_run-CADDY.txt
index dbfe1a8cc78c71c0a1917ec08db0d92a70f1a7e2..1c68573ce5e83743455f6b80fbdafc141dbda22b 100644
--- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_file_list_run-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_file_list_run-CADDY.txt
@@ -1,12 +1,12 @@
-TestEnableHttp2ByDefaultDefaultSlave-0/var/run/monitor-httpd.pid
-TestEnableHttp2ByDefaultDefaultSlave-0/var/run/monitor/monitor-bootstrap.pid
-TestEnableHttp2ByDefaultDefaultSlave-1/var/run/caddy_graceful_signature
-TestEnableHttp2ByDefaultDefaultSlave-1/var/run/caddy_validate_signature
-TestEnableHttp2ByDefaultDefaultSlave-1/var/run/caddy_validate_signature.status
-TestEnableHttp2ByDefaultDefaultSlave-1/var/run/httpd.pid
-TestEnableHttp2ByDefaultDefaultSlave-1/var/run/monitor-httpd.pid
-TestEnableHttp2ByDefaultDefaultSlave-1/var/run/monitor/monitor-bootstrap.pid
-TestEnableHttp2ByDefaultDefaultSlave-1/var/run/nginx.pid
-TestEnableHttp2ByDefaultDefaultSlave-1/var/run/nginx_graceful_signature
-TestEnableHttp2ByDefaultDefaultSlave-1/var/run/nginx_validate_signature
-TestEnableHttp2ByDefaultDefaultSlave-1/var/run/nginx_validate_signature.status
\ No newline at end of file
+T-0/var/run/monitor-httpd.pid
+T-0/var/run/monitor/monitor-bootstrap.pid
+T-1/var/run/caddy_graceful_signature
+T-1/var/run/caddy_validate_signature
+T-1/var/run/caddy_validate_signature.status
+T-1/var/run/httpd.pid
+T-1/var/run/monitor-httpd.pid
+T-1/var/run/monitor/monitor-bootstrap.pid
+T-1/var/run/nginx.pid
+T-1/var/run/nginx_graceful_signature
+T-1/var/run/nginx_validate_signature
+T-1/var/run/nginx_validate_signature.status
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_promise_run_plugin-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_promise_run_plugin-CADDY.txt
index 5037c28748e58f13ece88d09f6e666df65425547..3ff84e0dfcd5cef4571de84bf72648e8d082573e 100644
--- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_promise_run_plugin-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_promise_run_plugin-CADDY.txt
@@ -1,28 +1,28 @@
-TestEnableHttp2ByDefaultDefaultSlave-0/etc/plugin/buildout-TestEnableHttp2ByDefaultDefaultSlave-0-status.py: OK
-TestEnableHttp2ByDefaultDefaultSlave-0/etc/plugin/check-free-disk-space.py: OK
-TestEnableHttp2ByDefaultDefaultSlave-0/etc/plugin/monitor-bootstrap-status.py: OK
-TestEnableHttp2ByDefaultDefaultSlave-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/plugin/buildout-TestEnableHttp2ByDefaultDefaultSlave-1-status.py: OK
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/plugin/caddy_cached.py: ERROR
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/plugin/caddy_frontend_ipv4_http.py: OK
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/plugin/caddy_frontend_ipv4_https.py: OK
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/plugin/caddy_frontend_ipv6_http.py: OK
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/plugin/caddy_frontend_ipv6_https.py: OK
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/plugin/caddy_ssl_cached.py: ERROR
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/plugin/check-_enable-http2-default-error-log-last-day.py: OK
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/plugin/check-_enable-http2-default-error-log-last-hour.py: OK
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/plugin/check-_enable-http2-false-error-log-last-day.py: OK
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/plugin/check-_enable-http2-false-error-log-last-hour.py: OK
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/plugin/check-_enable-http2-true-error-log-last-day.py: OK
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/plugin/check-_enable-http2-true-error-log-last-hour.py: OK
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/plugin/check-free-disk-space.py: OK
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/plugin/frontend-caddy-configuration-promise.py: OK
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/plugin/monitor-bootstrap-status.py: OK
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/plugin/nginx-configuration-promise.py: OK
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/plugin/nginx_frontend_ipv4_http.py: OK
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/plugin/nginx_frontend_ipv4_https.py: OK
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/plugin/nginx_frontend_ipv6_http.py: OK
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/plugin/nginx_frontend_ipv6_https.py: OK
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/plugin/re6st-connectivity.py: OK
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/plugin/trafficserver-port-listening.py: ERROR
\ No newline at end of file
+T-0/etc/plugin/buildout-T-0-status.py: OK
+T-0/etc/plugin/check-free-disk-space.py: OK
+T-0/etc/plugin/monitor-bootstrap-status.py: OK
+T-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
+T-1/etc/plugin/buildout-T-1-status.py: OK
+T-1/etc/plugin/caddy_cached.py: ERROR
+T-1/etc/plugin/caddy_frontend_ipv4_http.py: OK
+T-1/etc/plugin/caddy_frontend_ipv4_https.py: OK
+T-1/etc/plugin/caddy_frontend_ipv6_http.py: OK
+T-1/etc/plugin/caddy_frontend_ipv6_https.py: OK
+T-1/etc/plugin/caddy_ssl_cached.py: ERROR
+T-1/etc/plugin/check-_enable-http2-default-error-log-last-day.py: OK
+T-1/etc/plugin/check-_enable-http2-default-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_enable-http2-false-error-log-last-day.py: OK
+T-1/etc/plugin/check-_enable-http2-false-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_enable-http2-true-error-log-last-day.py: OK
+T-1/etc/plugin/check-_enable-http2-true-error-log-last-hour.py: OK
+T-1/etc/plugin/check-free-disk-space.py: OK
+T-1/etc/plugin/frontend-caddy-configuration-promise.py: OK
+T-1/etc/plugin/monitor-bootstrap-status.py: OK
+T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
+T-1/etc/plugin/nginx-configuration-promise.py: OK
+T-1/etc/plugin/nginx_frontend_ipv4_http.py: OK
+T-1/etc/plugin/nginx_frontend_ipv4_https.py: OK
+T-1/etc/plugin/nginx_frontend_ipv6_http.py: OK
+T-1/etc/plugin/nginx_frontend_ipv6_https.py: OK
+T-1/etc/plugin/re6st-connectivity.py: OK
+T-1/etc/plugin/trafficserver-port-listening.py: OK
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_promise_run_promise-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_promise_run_promise-CADDY.txt
index 72ca73edec3b3cbb094950bf6ac1ec9a33eda95e..5105e42af08be204b45dbb4be093052c9805c0f6 100644
--- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_promise_run_promise-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_promise_run_promise-CADDY.txt
@@ -1,4 +1,4 @@
-TestEnableHttp2ByDefaultDefaultSlave-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/promise/caddy-frontend-is-running-actual-software-release: OK
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/promise/promise-nginx-is-process-older-than-dependency-set: OK
\ No newline at end of file
+T-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK
+T-1/etc/promise/caddy-frontend-is-running-actual-software-release: OK
+T-1/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK
+T-1/etc/promise/promise-nginx-is-process-older-than-dependency-set: OK
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_supervisor_state-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_supervisor_state-CADDY.txt
index 52c9b55634e327a48f17882bf5a6ca496dacebd8..0efdb10a5da84b6ae5157ed1172abad2fadc7736 100644
--- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_supervisor_state-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_supervisor_state-CADDY.txt
@@ -1,24 +1,24 @@
-TestEnableHttp2ByDefaultDefaultSlave-0:bootstrap-monitor EXITED
-TestEnableHttp2ByDefaultDefaultSlave-0:certificate_authority-{hash}-on-watch RUNNING
-TestEnableHttp2ByDefaultDefaultSlave-0:crond-{hash} RUNNING
-TestEnableHttp2ByDefaultDefaultSlave-0:monitor-httpd-{hash}-on-watch RUNNING
-TestEnableHttp2ByDefaultDefaultSlave-0:monitor-httpd-graceful EXITED
-TestEnableHttp2ByDefaultDefaultSlave-1:6tunnel-11080-{hash}-on-watch RUNNING
-TestEnableHttp2ByDefaultDefaultSlave-1:6tunnel-11443-{hash}-on-watch RUNNING
-TestEnableHttp2ByDefaultDefaultSlave-1:6tunnel-12080-{hash}-on-watch RUNNING
-TestEnableHttp2ByDefaultDefaultSlave-1:6tunnel-12443-{hash}-on-watch RUNNING
-TestEnableHttp2ByDefaultDefaultSlave-1:6tunnel-26011-{hash}-on-watch RUNNING
-TestEnableHttp2ByDefaultDefaultSlave-1:6tunnel-26012-{hash}-on-watch RUNNING
-TestEnableHttp2ByDefaultDefaultSlave-1:bootstrap-monitor EXITED
-TestEnableHttp2ByDefaultDefaultSlave-1:certificate_authority-{hash}-on-watch RUNNING
-TestEnableHttp2ByDefaultDefaultSlave-1:crond-{hash} RUNNING
-TestEnableHttp2ByDefaultDefaultSlave-1:crond-on-watch RUNNING
-TestEnableHttp2ByDefaultDefaultSlave-1:frontend-caddy-safe-graceful EXITED
-TestEnableHttp2ByDefaultDefaultSlave-1:frontend-nginx-safe-graceful EXITED
-TestEnableHttp2ByDefaultDefaultSlave-1:frontend_caddy-{hash}-on-watch RUNNING
-TestEnableHttp2ByDefaultDefaultSlave-1:frontend_nginx-{hash}-on-watch RUNNING
-TestEnableHttp2ByDefaultDefaultSlave-1:monitor-httpd-{hash}-on-watch RUNNING
-TestEnableHttp2ByDefaultDefaultSlave-1:monitor-httpd-graceful EXITED
-TestEnableHttp2ByDefaultDefaultSlave-1:trafficserver-{hash}-on-watch RUNNING
-TestEnableHttp2ByDefaultDefaultSlave-1:trafficserver-reload EXITED
+T-0:bootstrap-monitor EXITED
+T-0:certificate_authority-{hash}-on-watch RUNNING
+T-0:crond-{hash} RUNNING
+T-0:monitor-httpd-{hash}-on-watch RUNNING
+T-0:monitor-httpd-graceful EXITED
+T-1:6tunnel-11080-{hash}-on-watch RUNNING
+T-1:6tunnel-11443-{hash}-on-watch RUNNING
+T-1:6tunnel-12080-{hash}-on-watch RUNNING
+T-1:6tunnel-12443-{hash}-on-watch RUNNING
+T-1:6tunnel-26011-{hash}-on-watch RUNNING
+T-1:6tunnel-26012-{hash}-on-watch RUNNING
+T-1:bootstrap-monitor EXITED
+T-1:certificate_authority-{hash}-on-watch RUNNING
+T-1:crond-{hash} RUNNING
+T-1:crond-on-watch RUNNING
+T-1:frontend-caddy-safe-graceful EXITED
+T-1:frontend-nginx-safe-graceful EXITED
+T-1:frontend_caddy-{hash}-on-watch RUNNING
+T-1:frontend_nginx-{hash}-on-watch RUNNING
+T-1:monitor-httpd-{hash}-on-watch RUNNING
+T-1:monitor-httpd-graceful EXITED
+T-1:trafficserver-{hash}-on-watch RUNNING
+T-1:trafficserver-reload EXITED
 watchdog:watchdog RUNNING
diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_file_list_log-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_file_list_log-CADDY.txt
index d7cea3ed0723b17e9774a329279ebdc471441ac9..bac2a63edb37df119caedbec10b029d444484488 100644
--- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_file_list_log-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_file_list_log-CADDY.txt
@@ -1,14 +1,14 @@
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-0/var/log/monitor-httpd-error.log
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/var/log/frontend-access.log
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/var/log/frontend-error.log
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/var/log/httpd/_enable-http2-default_access_log
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/var/log/httpd/_enable-http2-default_error_log
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/var/log/httpd/_enable-http2-false_access_log
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/var/log/httpd/_enable-http2-false_error_log
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/var/log/httpd/_enable-http2-true_access_log
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/var/log/httpd/_enable-http2-true_error_log
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/var/log/monitor-httpd-error.log
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/var/log/nginx-access.log
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/var/log/nginx-error.log
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/var/log/trafficserver/manager.log
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/var/log/trafficserver/traffic.out
\ No newline at end of file
+T-0/var/log/monitor-httpd-error.log
+T-1/var/log/frontend-access.log
+T-1/var/log/frontend-error.log
+T-1/var/log/httpd/_enable-http2-default_access_log
+T-1/var/log/httpd/_enable-http2-default_error_log
+T-1/var/log/httpd/_enable-http2-false_access_log
+T-1/var/log/httpd/_enable-http2-false_error_log
+T-1/var/log/httpd/_enable-http2-true_access_log
+T-1/var/log/httpd/_enable-http2-true_error_log
+T-1/var/log/monitor-httpd-error.log
+T-1/var/log/nginx-access.log
+T-1/var/log/nginx-error.log
+T-1/var/log/trafficserver/manager.log
+T-1/var/log/trafficserver/traffic.out
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_file_list_run-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_file_list_run-CADDY.txt
index 9aea1b745fa0be8ac86ef6fcda28a6417e8c4e00..1c68573ce5e83743455f6b80fbdafc141dbda22b 100644
--- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_file_list_run-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_file_list_run-CADDY.txt
@@ -1,12 +1,12 @@
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-0/var/run/monitor-httpd.pid
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-0/var/run/monitor/monitor-bootstrap.pid
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/var/run/caddy_graceful_signature
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/var/run/caddy_validate_signature
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/var/run/caddy_validate_signature.status
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/var/run/httpd.pid
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/var/run/monitor-httpd.pid
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/var/run/monitor/monitor-bootstrap.pid
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/var/run/nginx.pid
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/var/run/nginx_graceful_signature
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/var/run/nginx_validate_signature
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/var/run/nginx_validate_signature.status
\ No newline at end of file
+T-0/var/run/monitor-httpd.pid
+T-0/var/run/monitor/monitor-bootstrap.pid
+T-1/var/run/caddy_graceful_signature
+T-1/var/run/caddy_validate_signature
+T-1/var/run/caddy_validate_signature.status
+T-1/var/run/httpd.pid
+T-1/var/run/monitor-httpd.pid
+T-1/var/run/monitor/monitor-bootstrap.pid
+T-1/var/run/nginx.pid
+T-1/var/run/nginx_graceful_signature
+T-1/var/run/nginx_validate_signature
+T-1/var/run/nginx_validate_signature.status
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_monitor_promise_list-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_monitor_promise_list-CADDY.txt
index efa13305cc79d15fe6492930315fcf9ee3273533..9e31b4b3444db55f9118a07940f911dab9f743d2 100644
--- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_monitor_promise_list-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_monitor_promise_list-CADDY.txt
@@ -1,6 +1,6 @@
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_enable-http2-default-error-log-last-day
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_enable-http2-default-error-log-last-hour
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_enable-http2-false-error-log-last-day
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_enable-http2-false-error-log-last-hour
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_enable-http2-true-error-log-last-day
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_enable-http2-true-error-log-last-hour
\ No newline at end of file
+T-1/etc/monitor-promise/check-_enable-http2-default-error-log-last-day
+T-1/etc/monitor-promise/check-_enable-http2-default-error-log-last-hour
+T-1/etc/monitor-promise/check-_enable-http2-false-error-log-last-day
+T-1/etc/monitor-promise/check-_enable-http2-false-error-log-last-hour
+T-1/etc/monitor-promise/check-_enable-http2-true-error-log-last-day
+T-1/etc/monitor-promise/check-_enable-http2-true-error-log-last-hour
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_promise_run_plugin-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_promise_run_plugin-CADDY.txt
index f7f17c921a01060f95e58516a7cb151f8d8ee6fc..3ff84e0dfcd5cef4571de84bf72648e8d082573e 100644
--- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_promise_run_plugin-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_promise_run_plugin-CADDY.txt
@@ -1,28 +1,28 @@
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-0/etc/plugin/buildout-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-0-status.py: OK
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-0/etc/plugin/check-free-disk-space.py: OK
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-0/etc/plugin/monitor-bootstrap-status.py: OK
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/plugin/buildout-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1-status.py: OK
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/plugin/caddy_cached.py: ERROR
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/plugin/caddy_frontend_ipv4_http.py: OK
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/plugin/caddy_frontend_ipv4_https.py: OK
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/plugin/caddy_frontend_ipv6_http.py: OK
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/plugin/caddy_frontend_ipv6_https.py: OK
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/plugin/caddy_ssl_cached.py: ERROR
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/plugin/check-_enable-http2-default-error-log-last-day.py: OK
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/plugin/check-_enable-http2-default-error-log-last-hour.py: OK
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/plugin/check-_enable-http2-false-error-log-last-day.py: OK
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/plugin/check-_enable-http2-false-error-log-last-hour.py: OK
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/plugin/check-_enable-http2-true-error-log-last-day.py: OK
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/plugin/check-_enable-http2-true-error-log-last-hour.py: OK
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/plugin/check-free-disk-space.py: OK
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/plugin/frontend-caddy-configuration-promise.py: OK
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/plugin/monitor-bootstrap-status.py: OK
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/plugin/nginx-configuration-promise.py: OK
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/plugin/nginx_frontend_ipv4_http.py: OK
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/plugin/nginx_frontend_ipv4_https.py: OK
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/plugin/nginx_frontend_ipv6_http.py: OK
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/plugin/nginx_frontend_ipv6_https.py: OK
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/plugin/re6st-connectivity.py: OK
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/plugin/trafficserver-port-listening.py: OK
\ No newline at end of file
+T-0/etc/plugin/buildout-T-0-status.py: OK
+T-0/etc/plugin/check-free-disk-space.py: OK
+T-0/etc/plugin/monitor-bootstrap-status.py: OK
+T-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
+T-1/etc/plugin/buildout-T-1-status.py: OK
+T-1/etc/plugin/caddy_cached.py: ERROR
+T-1/etc/plugin/caddy_frontend_ipv4_http.py: OK
+T-1/etc/plugin/caddy_frontend_ipv4_https.py: OK
+T-1/etc/plugin/caddy_frontend_ipv6_http.py: OK
+T-1/etc/plugin/caddy_frontend_ipv6_https.py: OK
+T-1/etc/plugin/caddy_ssl_cached.py: ERROR
+T-1/etc/plugin/check-_enable-http2-default-error-log-last-day.py: OK
+T-1/etc/plugin/check-_enable-http2-default-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_enable-http2-false-error-log-last-day.py: OK
+T-1/etc/plugin/check-_enable-http2-false-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_enable-http2-true-error-log-last-day.py: OK
+T-1/etc/plugin/check-_enable-http2-true-error-log-last-hour.py: OK
+T-1/etc/plugin/check-free-disk-space.py: OK
+T-1/etc/plugin/frontend-caddy-configuration-promise.py: OK
+T-1/etc/plugin/monitor-bootstrap-status.py: OK
+T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
+T-1/etc/plugin/nginx-configuration-promise.py: OK
+T-1/etc/plugin/nginx_frontend_ipv4_http.py: OK
+T-1/etc/plugin/nginx_frontend_ipv4_https.py: OK
+T-1/etc/plugin/nginx_frontend_ipv6_http.py: OK
+T-1/etc/plugin/nginx_frontend_ipv6_https.py: OK
+T-1/etc/plugin/re6st-connectivity.py: OK
+T-1/etc/plugin/trafficserver-port-listening.py: OK
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_promise_run_promise-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_promise_run_promise-CADDY.txt
index 168effcd43f80a7195858f326ae6a433214c703e..5105e42af08be204b45dbb4be093052c9805c0f6 100644
--- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_promise_run_promise-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_promise_run_promise-CADDY.txt
@@ -1,4 +1,4 @@
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/promise/caddy-frontend-is-running-actual-software-release: OK
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/promise/promise-nginx-is-process-older-than-dependency-set: OK
\ No newline at end of file
+T-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK
+T-1/etc/promise/caddy-frontend-is-running-actual-software-release: OK
+T-1/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK
+T-1/etc/promise/promise-nginx-is-process-older-than-dependency-set: OK
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_supervisor_state-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_supervisor_state-CADDY.txt
index f8752c386ee09306393d154fcd2b686ed456e977..0b1c395e2625beeb399ee94cf4b6c6add3b3fb04 100644
--- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_supervisor_state-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_supervisor_state-CADDY.txt
@@ -1,24 +1,24 @@
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-0:bootstrap-monitor EXITED
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-0:certificate_authority-{hash}-on-watch RUNNING
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-0:crond-{hash} RUNNING
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-0:monitor-httpd-{hash}-on-watch RUNNING
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-0:monitor-httpd-graceful EXITED
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1:6tunnel-11080-{hash}-on-watch RUNNING
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1:6tunnel-11443-{hash}-on-watch RUNNING
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1:6tunnel-12080-{hash}-on-watch RUNNING
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1:6tunnel-12443-{hash}-on-watch RUNNING
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1:6tunnel-26011-{hash}-on-watch RUNNING
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1:6tunnel-26012-{hash}-on-watch RUNNING
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1:bootstrap-monitor EXITED
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1:certificate_authority-{hash}-on-watch RUNNING
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1:crond-{hash} RUNNING
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1:crond-on-watch RUNNING
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1:frontend-caddy-safe-graceful EXITED
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1:frontend-nginx-safe-graceful EXITED
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1:frontend_caddy-{hash}-on-watch RUNNING
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1:frontend_nginx-{hash}-on-watch RUNNING
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1:monitor-httpd-{hash}-on-watch RUNNING
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1:monitor-httpd-graceful EXITED
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1:trafficserver-{hash}-on-watch RUNNING
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1:trafficserver-reload EXITED
+T-0:bootstrap-monitor EXITED
+T-0:certificate_authority-{hash}-on-watch RUNNING
+T-0:crond-{hash} RUNNING
+T-0:monitor-httpd-{hash}-on-watch RUNNING
+T-0:monitor-httpd-graceful EXITED
+T-1:6tunnel-11080-{hash}-on-watch RUNNING
+T-1:6tunnel-11443-{hash}-on-watch RUNNING
+T-1:6tunnel-12080-{hash}-on-watch RUNNING
+T-1:6tunnel-12443-{hash}-on-watch RUNNING
+T-1:6tunnel-26011-{hash}-on-watch RUNNING
+T-1:6tunnel-26012-{hash}-on-watch RUNNING
+T-1:bootstrap-monitor EXITED
+T-1:certificate_authority-{hash}-on-watch RUNNING
+T-1:crond-{hash} RUNNING
+T-1:crond-on-watch RUNNING
+T-1:frontend-caddy-safe-graceful EXITED
+T-1:frontend-nginx-safe-graceful EXITED
+T-1:frontend_caddy-{hash}-on-watch RUNNING
+T-1:frontend_nginx-{hash}-on-watch RUNNING
+T-1:monitor-httpd-{hash}-on-watch RUNNING
+T-1:monitor-httpd-graceful EXITED
+T-1:trafficserver-{hash}-on-watch RUNNING
+T-1:trafficserver-reload EXITED
 watchdog:watchdog RUNNING
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_file_list_log-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_file_list_log-CADDY.txt
index 79fbe63840dec75055421692c783ca3144d2b96b..bac2a63edb37df119caedbec10b029d444484488 100644
--- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_file_list_log-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_file_list_log-CADDY.txt
@@ -1,14 +1,14 @@
-TestEnableHttp2ByDefaultFalseSlave-0/var/log/monitor-httpd-error.log
-TestEnableHttp2ByDefaultFalseSlave-1/var/log/frontend-access.log
-TestEnableHttp2ByDefaultFalseSlave-1/var/log/frontend-error.log
-TestEnableHttp2ByDefaultFalseSlave-1/var/log/httpd/_enable-http2-default_access_log
-TestEnableHttp2ByDefaultFalseSlave-1/var/log/httpd/_enable-http2-default_error_log
-TestEnableHttp2ByDefaultFalseSlave-1/var/log/httpd/_enable-http2-false_access_log
-TestEnableHttp2ByDefaultFalseSlave-1/var/log/httpd/_enable-http2-false_error_log
-TestEnableHttp2ByDefaultFalseSlave-1/var/log/httpd/_enable-http2-true_access_log
-TestEnableHttp2ByDefaultFalseSlave-1/var/log/httpd/_enable-http2-true_error_log
-TestEnableHttp2ByDefaultFalseSlave-1/var/log/monitor-httpd-error.log
-TestEnableHttp2ByDefaultFalseSlave-1/var/log/nginx-access.log
-TestEnableHttp2ByDefaultFalseSlave-1/var/log/nginx-error.log
-TestEnableHttp2ByDefaultFalseSlave-1/var/log/trafficserver/manager.log
-TestEnableHttp2ByDefaultFalseSlave-1/var/log/trafficserver/traffic.out
\ No newline at end of file
+T-0/var/log/monitor-httpd-error.log
+T-1/var/log/frontend-access.log
+T-1/var/log/frontend-error.log
+T-1/var/log/httpd/_enable-http2-default_access_log
+T-1/var/log/httpd/_enable-http2-default_error_log
+T-1/var/log/httpd/_enable-http2-false_access_log
+T-1/var/log/httpd/_enable-http2-false_error_log
+T-1/var/log/httpd/_enable-http2-true_access_log
+T-1/var/log/httpd/_enable-http2-true_error_log
+T-1/var/log/monitor-httpd-error.log
+T-1/var/log/nginx-access.log
+T-1/var/log/nginx-error.log
+T-1/var/log/trafficserver/manager.log
+T-1/var/log/trafficserver/traffic.out
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_file_list_run-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_file_list_run-CADDY.txt
index d154b74d106e66f879b58463b42d2216ae23bd23..1c68573ce5e83743455f6b80fbdafc141dbda22b 100644
--- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_file_list_run-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_file_list_run-CADDY.txt
@@ -1,12 +1,12 @@
-TestEnableHttp2ByDefaultFalseSlave-0/var/run/monitor-httpd.pid
-TestEnableHttp2ByDefaultFalseSlave-0/var/run/monitor/monitor-bootstrap.pid
-TestEnableHttp2ByDefaultFalseSlave-1/var/run/caddy_graceful_signature
-TestEnableHttp2ByDefaultFalseSlave-1/var/run/caddy_validate_signature
-TestEnableHttp2ByDefaultFalseSlave-1/var/run/caddy_validate_signature.status
-TestEnableHttp2ByDefaultFalseSlave-1/var/run/httpd.pid
-TestEnableHttp2ByDefaultFalseSlave-1/var/run/monitor-httpd.pid
-TestEnableHttp2ByDefaultFalseSlave-1/var/run/monitor/monitor-bootstrap.pid
-TestEnableHttp2ByDefaultFalseSlave-1/var/run/nginx.pid
-TestEnableHttp2ByDefaultFalseSlave-1/var/run/nginx_graceful_signature
-TestEnableHttp2ByDefaultFalseSlave-1/var/run/nginx_validate_signature
-TestEnableHttp2ByDefaultFalseSlave-1/var/run/nginx_validate_signature.status
\ No newline at end of file
+T-0/var/run/monitor-httpd.pid
+T-0/var/run/monitor/monitor-bootstrap.pid
+T-1/var/run/caddy_graceful_signature
+T-1/var/run/caddy_validate_signature
+T-1/var/run/caddy_validate_signature.status
+T-1/var/run/httpd.pid
+T-1/var/run/monitor-httpd.pid
+T-1/var/run/monitor/monitor-bootstrap.pid
+T-1/var/run/nginx.pid
+T-1/var/run/nginx_graceful_signature
+T-1/var/run/nginx_validate_signature
+T-1/var/run/nginx_validate_signature.status
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_promise_run_plugin-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_promise_run_plugin-CADDY.txt
index c6976c7b895c6e5357c54147101c797b84c8cf3c..3ff84e0dfcd5cef4571de84bf72648e8d082573e 100644
--- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_promise_run_plugin-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_promise_run_plugin-CADDY.txt
@@ -1,28 +1,28 @@
-TestEnableHttp2ByDefaultFalseSlave-0/etc/plugin/buildout-TestEnableHttp2ByDefaultFalseSlave-0-status.py: OK
-TestEnableHttp2ByDefaultFalseSlave-0/etc/plugin/check-free-disk-space.py: OK
-TestEnableHttp2ByDefaultFalseSlave-0/etc/plugin/monitor-bootstrap-status.py: OK
-TestEnableHttp2ByDefaultFalseSlave-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-TestEnableHttp2ByDefaultFalseSlave-1/etc/plugin/buildout-TestEnableHttp2ByDefaultFalseSlave-1-status.py: OK
-TestEnableHttp2ByDefaultFalseSlave-1/etc/plugin/caddy_cached.py: ERROR
-TestEnableHttp2ByDefaultFalseSlave-1/etc/plugin/caddy_frontend_ipv4_http.py: OK
-TestEnableHttp2ByDefaultFalseSlave-1/etc/plugin/caddy_frontend_ipv4_https.py: OK
-TestEnableHttp2ByDefaultFalseSlave-1/etc/plugin/caddy_frontend_ipv6_http.py: OK
-TestEnableHttp2ByDefaultFalseSlave-1/etc/plugin/caddy_frontend_ipv6_https.py: OK
-TestEnableHttp2ByDefaultFalseSlave-1/etc/plugin/caddy_ssl_cached.py: ERROR
-TestEnableHttp2ByDefaultFalseSlave-1/etc/plugin/check-_enable-http2-default-error-log-last-day.py: OK
-TestEnableHttp2ByDefaultFalseSlave-1/etc/plugin/check-_enable-http2-default-error-log-last-hour.py: OK
-TestEnableHttp2ByDefaultFalseSlave-1/etc/plugin/check-_enable-http2-false-error-log-last-day.py: OK
-TestEnableHttp2ByDefaultFalseSlave-1/etc/plugin/check-_enable-http2-false-error-log-last-hour.py: OK
-TestEnableHttp2ByDefaultFalseSlave-1/etc/plugin/check-_enable-http2-true-error-log-last-day.py: OK
-TestEnableHttp2ByDefaultFalseSlave-1/etc/plugin/check-_enable-http2-true-error-log-last-hour.py: OK
-TestEnableHttp2ByDefaultFalseSlave-1/etc/plugin/check-free-disk-space.py: OK
-TestEnableHttp2ByDefaultFalseSlave-1/etc/plugin/frontend-caddy-configuration-promise.py: OK
-TestEnableHttp2ByDefaultFalseSlave-1/etc/plugin/monitor-bootstrap-status.py: OK
-TestEnableHttp2ByDefaultFalseSlave-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-TestEnableHttp2ByDefaultFalseSlave-1/etc/plugin/nginx-configuration-promise.py: OK
-TestEnableHttp2ByDefaultFalseSlave-1/etc/plugin/nginx_frontend_ipv4_http.py: OK
-TestEnableHttp2ByDefaultFalseSlave-1/etc/plugin/nginx_frontend_ipv4_https.py: OK
-TestEnableHttp2ByDefaultFalseSlave-1/etc/plugin/nginx_frontend_ipv6_http.py: OK
-TestEnableHttp2ByDefaultFalseSlave-1/etc/plugin/nginx_frontend_ipv6_https.py: OK
-TestEnableHttp2ByDefaultFalseSlave-1/etc/plugin/re6st-connectivity.py: OK
-TestEnableHttp2ByDefaultFalseSlave-1/etc/plugin/trafficserver-port-listening.py: OK
\ No newline at end of file
+T-0/etc/plugin/buildout-T-0-status.py: OK
+T-0/etc/plugin/check-free-disk-space.py: OK
+T-0/etc/plugin/monitor-bootstrap-status.py: OK
+T-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
+T-1/etc/plugin/buildout-T-1-status.py: OK
+T-1/etc/plugin/caddy_cached.py: ERROR
+T-1/etc/plugin/caddy_frontend_ipv4_http.py: OK
+T-1/etc/plugin/caddy_frontend_ipv4_https.py: OK
+T-1/etc/plugin/caddy_frontend_ipv6_http.py: OK
+T-1/etc/plugin/caddy_frontend_ipv6_https.py: OK
+T-1/etc/plugin/caddy_ssl_cached.py: ERROR
+T-1/etc/plugin/check-_enable-http2-default-error-log-last-day.py: OK
+T-1/etc/plugin/check-_enable-http2-default-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_enable-http2-false-error-log-last-day.py: OK
+T-1/etc/plugin/check-_enable-http2-false-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_enable-http2-true-error-log-last-day.py: OK
+T-1/etc/plugin/check-_enable-http2-true-error-log-last-hour.py: OK
+T-1/etc/plugin/check-free-disk-space.py: OK
+T-1/etc/plugin/frontend-caddy-configuration-promise.py: OK
+T-1/etc/plugin/monitor-bootstrap-status.py: OK
+T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
+T-1/etc/plugin/nginx-configuration-promise.py: OK
+T-1/etc/plugin/nginx_frontend_ipv4_http.py: OK
+T-1/etc/plugin/nginx_frontend_ipv4_https.py: OK
+T-1/etc/plugin/nginx_frontend_ipv6_http.py: OK
+T-1/etc/plugin/nginx_frontend_ipv6_https.py: OK
+T-1/etc/plugin/re6st-connectivity.py: OK
+T-1/etc/plugin/trafficserver-port-listening.py: OK
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_promise_run_promise-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_promise_run_promise-CADDY.txt
index 9d985dfb14f57529bcfe5fe755037cfd4e2df526..5105e42af08be204b45dbb4be093052c9805c0f6 100644
--- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_promise_run_promise-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_promise_run_promise-CADDY.txt
@@ -1,4 +1,4 @@
-TestEnableHttp2ByDefaultFalseSlave-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK
-TestEnableHttp2ByDefaultFalseSlave-1/etc/promise/caddy-frontend-is-running-actual-software-release: OK
-TestEnableHttp2ByDefaultFalseSlave-1/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK
-TestEnableHttp2ByDefaultFalseSlave-1/etc/promise/promise-nginx-is-process-older-than-dependency-set: OK
\ No newline at end of file
+T-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK
+T-1/etc/promise/caddy-frontend-is-running-actual-software-release: OK
+T-1/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK
+T-1/etc/promise/promise-nginx-is-process-older-than-dependency-set: OK
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_supervisor_state-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_supervisor_state-CADDY.txt
index 73d36d40797f88414e239ba88a9ffc52aa844d49..0efdb10a5da84b6ae5157ed1172abad2fadc7736 100644
--- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_supervisor_state-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_supervisor_state-CADDY.txt
@@ -1,24 +1,24 @@
-TestEnableHttp2ByDefaultFalseSlave-0:bootstrap-monitor EXITED
-TestEnableHttp2ByDefaultFalseSlave-0:certificate_authority-{hash}-on-watch RUNNING
-TestEnableHttp2ByDefaultFalseSlave-0:crond-{hash} RUNNING
-TestEnableHttp2ByDefaultFalseSlave-0:monitor-httpd-{hash}-on-watch RUNNING
-TestEnableHttp2ByDefaultFalseSlave-0:monitor-httpd-graceful EXITED
-TestEnableHttp2ByDefaultFalseSlave-1:6tunnel-11080-{hash}-on-watch RUNNING
-TestEnableHttp2ByDefaultFalseSlave-1:6tunnel-11443-{hash}-on-watch RUNNING
-TestEnableHttp2ByDefaultFalseSlave-1:6tunnel-12080-{hash}-on-watch RUNNING
-TestEnableHttp2ByDefaultFalseSlave-1:6tunnel-12443-{hash}-on-watch RUNNING
-TestEnableHttp2ByDefaultFalseSlave-1:6tunnel-26011-{hash}-on-watch RUNNING
-TestEnableHttp2ByDefaultFalseSlave-1:6tunnel-26012-{hash}-on-watch RUNNING
-TestEnableHttp2ByDefaultFalseSlave-1:bootstrap-monitor EXITED
-TestEnableHttp2ByDefaultFalseSlave-1:certificate_authority-{hash}-on-watch RUNNING
-TestEnableHttp2ByDefaultFalseSlave-1:crond-{hash} RUNNING
-TestEnableHttp2ByDefaultFalseSlave-1:crond-on-watch RUNNING
-TestEnableHttp2ByDefaultFalseSlave-1:frontend-caddy-safe-graceful EXITED
-TestEnableHttp2ByDefaultFalseSlave-1:frontend-nginx-safe-graceful EXITED
-TestEnableHttp2ByDefaultFalseSlave-1:frontend_caddy-{hash}-on-watch RUNNING
-TestEnableHttp2ByDefaultFalseSlave-1:frontend_nginx-{hash}-on-watch RUNNING
-TestEnableHttp2ByDefaultFalseSlave-1:monitor-httpd-{hash}-on-watch RUNNING
-TestEnableHttp2ByDefaultFalseSlave-1:monitor-httpd-graceful EXITED
-TestEnableHttp2ByDefaultFalseSlave-1:trafficserver-{hash}-on-watch RUNNING
-TestEnableHttp2ByDefaultFalseSlave-1:trafficserver-reload EXITED
+T-0:bootstrap-monitor EXITED
+T-0:certificate_authority-{hash}-on-watch RUNNING
+T-0:crond-{hash} RUNNING
+T-0:monitor-httpd-{hash}-on-watch RUNNING
+T-0:monitor-httpd-graceful EXITED
+T-1:6tunnel-11080-{hash}-on-watch RUNNING
+T-1:6tunnel-11443-{hash}-on-watch RUNNING
+T-1:6tunnel-12080-{hash}-on-watch RUNNING
+T-1:6tunnel-12443-{hash}-on-watch RUNNING
+T-1:6tunnel-26011-{hash}-on-watch RUNNING
+T-1:6tunnel-26012-{hash}-on-watch RUNNING
+T-1:bootstrap-monitor EXITED
+T-1:certificate_authority-{hash}-on-watch RUNNING
+T-1:crond-{hash} RUNNING
+T-1:crond-on-watch RUNNING
+T-1:frontend-caddy-safe-graceful EXITED
+T-1:frontend-nginx-safe-graceful EXITED
+T-1:frontend_caddy-{hash}-on-watch RUNNING
+T-1:frontend_nginx-{hash}-on-watch RUNNING
+T-1:monitor-httpd-{hash}-on-watch RUNNING
+T-1:monitor-httpd-graceful EXITED
+T-1:trafficserver-{hash}-on-watch RUNNING
+T-1:trafficserver-reload EXITED
 watchdog:watchdog RUNNING
diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_file_list_log-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_file_list_log-CADDY.txt
index 90a389e3ade4cb1ef8ddf7e01ef20b21a9e47eef..bac2a63edb37df119caedbec10b029d444484488 100644
--- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_file_list_log-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_file_list_log-CADDY.txt
@@ -1,14 +1,14 @@
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-0/var/log/monitor-httpd-error.log
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/var/log/frontend-access.log
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/var/log/frontend-error.log
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/var/log/httpd/_enable-http2-default_access_log
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/var/log/httpd/_enable-http2-default_error_log
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/var/log/httpd/_enable-http2-false_access_log
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/var/log/httpd/_enable-http2-false_error_log
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/var/log/httpd/_enable-http2-true_access_log
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/var/log/httpd/_enable-http2-true_error_log
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/var/log/monitor-httpd-error.log
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/var/log/nginx-access.log
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/var/log/nginx-error.log
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/var/log/trafficserver/manager.log
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/var/log/trafficserver/traffic.out
\ No newline at end of file
+T-0/var/log/monitor-httpd-error.log
+T-1/var/log/frontend-access.log
+T-1/var/log/frontend-error.log
+T-1/var/log/httpd/_enable-http2-default_access_log
+T-1/var/log/httpd/_enable-http2-default_error_log
+T-1/var/log/httpd/_enable-http2-false_access_log
+T-1/var/log/httpd/_enable-http2-false_error_log
+T-1/var/log/httpd/_enable-http2-true_access_log
+T-1/var/log/httpd/_enable-http2-true_error_log
+T-1/var/log/monitor-httpd-error.log
+T-1/var/log/nginx-access.log
+T-1/var/log/nginx-error.log
+T-1/var/log/trafficserver/manager.log
+T-1/var/log/trafficserver/traffic.out
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_file_list_run-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_file_list_run-CADDY.txt
index 933cc9a143668221aa89ca5b12ac6503e84be0a1..1c68573ce5e83743455f6b80fbdafc141dbda22b 100644
--- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_file_list_run-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_file_list_run-CADDY.txt
@@ -1,12 +1,12 @@
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-0/var/run/monitor-httpd.pid
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-0/var/run/monitor/monitor-bootstrap.pid
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/var/run/caddy_graceful_signature
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/var/run/caddy_validate_signature
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/var/run/caddy_validate_signature.status
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/var/run/httpd.pid
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/var/run/monitor-httpd.pid
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/var/run/monitor/monitor-bootstrap.pid
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/var/run/nginx.pid
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/var/run/nginx_graceful_signature
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/var/run/nginx_validate_signature
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/var/run/nginx_validate_signature.status
\ No newline at end of file
+T-0/var/run/monitor-httpd.pid
+T-0/var/run/monitor/monitor-bootstrap.pid
+T-1/var/run/caddy_graceful_signature
+T-1/var/run/caddy_validate_signature
+T-1/var/run/caddy_validate_signature.status
+T-1/var/run/httpd.pid
+T-1/var/run/monitor-httpd.pid
+T-1/var/run/monitor/monitor-bootstrap.pid
+T-1/var/run/nginx.pid
+T-1/var/run/nginx_graceful_signature
+T-1/var/run/nginx_validate_signature
+T-1/var/run/nginx_validate_signature.status
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_monitor_promise_list-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_monitor_promise_list-CADDY.txt
index 70ae1dac95bc996c677fb5f58edca4b2dfe8dcf0..9e31b4b3444db55f9118a07940f911dab9f743d2 100644
--- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_monitor_promise_list-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_monitor_promise_list-CADDY.txt
@@ -1,6 +1,6 @@
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_enable-http2-default-error-log-last-day
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_enable-http2-default-error-log-last-hour
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_enable-http2-false-error-log-last-day
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_enable-http2-false-error-log-last-hour
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_enable-http2-true-error-log-last-day
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_enable-http2-true-error-log-last-hour
\ No newline at end of file
+T-1/etc/monitor-promise/check-_enable-http2-default-error-log-last-day
+T-1/etc/monitor-promise/check-_enable-http2-default-error-log-last-hour
+T-1/etc/monitor-promise/check-_enable-http2-false-error-log-last-day
+T-1/etc/monitor-promise/check-_enable-http2-false-error-log-last-hour
+T-1/etc/monitor-promise/check-_enable-http2-true-error-log-last-day
+T-1/etc/monitor-promise/check-_enable-http2-true-error-log-last-hour
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_promise_run_plugin-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_promise_run_plugin-CADDY.txt
index 890adc0d7ff0cba7d76f9873378377cba7c80b05..3ff84e0dfcd5cef4571de84bf72648e8d082573e 100644
--- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_promise_run_plugin-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_promise_run_plugin-CADDY.txt
@@ -1,28 +1,28 @@
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-0/etc/plugin/buildout-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-0-status.py: OK
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-0/etc/plugin/check-free-disk-space.py: OK
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-0/etc/plugin/monitor-bootstrap-status.py: OK
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/plugin/buildout-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1-status.py: OK
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/plugin/caddy_cached.py: ERROR
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/plugin/caddy_frontend_ipv4_http.py: OK
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/plugin/caddy_frontend_ipv4_https.py: OK
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/plugin/caddy_frontend_ipv6_http.py: OK
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/plugin/caddy_frontend_ipv6_https.py: OK
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/plugin/caddy_ssl_cached.py: ERROR
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/plugin/check-_enable-http2-default-error-log-last-day.py: OK
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/plugin/check-_enable-http2-default-error-log-last-hour.py: OK
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/plugin/check-_enable-http2-false-error-log-last-day.py: OK
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/plugin/check-_enable-http2-false-error-log-last-hour.py: OK
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/plugin/check-_enable-http2-true-error-log-last-day.py: OK
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/plugin/check-_enable-http2-true-error-log-last-hour.py: OK
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/plugin/check-free-disk-space.py: OK
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/plugin/frontend-caddy-configuration-promise.py: OK
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/plugin/monitor-bootstrap-status.py: OK
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/plugin/nginx-configuration-promise.py: OK
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/plugin/nginx_frontend_ipv4_http.py: OK
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/plugin/nginx_frontend_ipv4_https.py: OK
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/plugin/nginx_frontend_ipv6_http.py: OK
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/plugin/nginx_frontend_ipv6_https.py: OK
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/plugin/re6st-connectivity.py: OK
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/plugin/trafficserver-port-listening.py: OK
\ No newline at end of file
+T-0/etc/plugin/buildout-T-0-status.py: OK
+T-0/etc/plugin/check-free-disk-space.py: OK
+T-0/etc/plugin/monitor-bootstrap-status.py: OK
+T-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
+T-1/etc/plugin/buildout-T-1-status.py: OK
+T-1/etc/plugin/caddy_cached.py: ERROR
+T-1/etc/plugin/caddy_frontend_ipv4_http.py: OK
+T-1/etc/plugin/caddy_frontend_ipv4_https.py: OK
+T-1/etc/plugin/caddy_frontend_ipv6_http.py: OK
+T-1/etc/plugin/caddy_frontend_ipv6_https.py: OK
+T-1/etc/plugin/caddy_ssl_cached.py: ERROR
+T-1/etc/plugin/check-_enable-http2-default-error-log-last-day.py: OK
+T-1/etc/plugin/check-_enable-http2-default-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_enable-http2-false-error-log-last-day.py: OK
+T-1/etc/plugin/check-_enable-http2-false-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_enable-http2-true-error-log-last-day.py: OK
+T-1/etc/plugin/check-_enable-http2-true-error-log-last-hour.py: OK
+T-1/etc/plugin/check-free-disk-space.py: OK
+T-1/etc/plugin/frontend-caddy-configuration-promise.py: OK
+T-1/etc/plugin/monitor-bootstrap-status.py: OK
+T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
+T-1/etc/plugin/nginx-configuration-promise.py: OK
+T-1/etc/plugin/nginx_frontend_ipv4_http.py: OK
+T-1/etc/plugin/nginx_frontend_ipv4_https.py: OK
+T-1/etc/plugin/nginx_frontend_ipv6_http.py: OK
+T-1/etc/plugin/nginx_frontend_ipv6_https.py: OK
+T-1/etc/plugin/re6st-connectivity.py: OK
+T-1/etc/plugin/trafficserver-port-listening.py: OK
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_promise_run_promise-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_promise_run_promise-CADDY.txt
index 90c1fd0198dc79ecacf919e8b09de5b6fb39b006..5105e42af08be204b45dbb4be093052c9805c0f6 100644
--- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_promise_run_promise-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_promise_run_promise-CADDY.txt
@@ -1,4 +1,4 @@
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/promise/caddy-frontend-is-running-actual-software-release: OK
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/promise/promise-nginx-is-process-older-than-dependency-set: OK
\ No newline at end of file
+T-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK
+T-1/etc/promise/caddy-frontend-is-running-actual-software-release: OK
+T-1/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK
+T-1/etc/promise/promise-nginx-is-process-older-than-dependency-set: OK
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_supervisor_state-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_supervisor_state-CADDY.txt
index c9032cdd7df278a17fd7bb587758aae3185890a3..0b1c395e2625beeb399ee94cf4b6c6add3b3fb04 100644
--- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_supervisor_state-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_supervisor_state-CADDY.txt
@@ -1,24 +1,24 @@
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-0:bootstrap-monitor EXITED
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-0:certificate_authority-{hash}-on-watch RUNNING
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-0:crond-{hash} RUNNING
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-0:monitor-httpd-{hash}-on-watch RUNNING
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-0:monitor-httpd-graceful EXITED
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1:6tunnel-11080-{hash}-on-watch RUNNING
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1:6tunnel-11443-{hash}-on-watch RUNNING
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1:6tunnel-12080-{hash}-on-watch RUNNING
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1:6tunnel-12443-{hash}-on-watch RUNNING
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1:6tunnel-26011-{hash}-on-watch RUNNING
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1:6tunnel-26012-{hash}-on-watch RUNNING
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1:bootstrap-monitor EXITED
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1:certificate_authority-{hash}-on-watch RUNNING
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1:crond-{hash} RUNNING
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1:crond-on-watch RUNNING
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1:frontend-caddy-safe-graceful EXITED
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1:frontend-nginx-safe-graceful EXITED
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1:frontend_caddy-{hash}-on-watch RUNNING
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1:frontend_nginx-{hash}-on-watch RUNNING
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1:monitor-httpd-{hash}-on-watch RUNNING
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1:monitor-httpd-graceful EXITED
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1:trafficserver-{hash}-on-watch RUNNING
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1:trafficserver-reload EXITED
+T-0:bootstrap-monitor EXITED
+T-0:certificate_authority-{hash}-on-watch RUNNING
+T-0:crond-{hash} RUNNING
+T-0:monitor-httpd-{hash}-on-watch RUNNING
+T-0:monitor-httpd-graceful EXITED
+T-1:6tunnel-11080-{hash}-on-watch RUNNING
+T-1:6tunnel-11443-{hash}-on-watch RUNNING
+T-1:6tunnel-12080-{hash}-on-watch RUNNING
+T-1:6tunnel-12443-{hash}-on-watch RUNNING
+T-1:6tunnel-26011-{hash}-on-watch RUNNING
+T-1:6tunnel-26012-{hash}-on-watch RUNNING
+T-1:bootstrap-monitor EXITED
+T-1:certificate_authority-{hash}-on-watch RUNNING
+T-1:crond-{hash} RUNNING
+T-1:crond-on-watch RUNNING
+T-1:frontend-caddy-safe-graceful EXITED
+T-1:frontend-nginx-safe-graceful EXITED
+T-1:frontend_caddy-{hash}-on-watch RUNNING
+T-1:frontend_nginx-{hash}-on-watch RUNNING
+T-1:monitor-httpd-{hash}-on-watch RUNNING
+T-1:monitor-httpd-graceful EXITED
+T-1:trafficserver-{hash}-on-watch RUNNING
+T-1:trafficserver-reload EXITED
 watchdog:watchdog RUNNING
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestMalformedBackenUrlSlave.test_file_list_log-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestMalformedBackenUrlSlave.test_file_list_log-CADDY.txt
index b6bc30bc355013720ef74e28af678a2e60f745ed..28c42344ed3ede37764b25cdfe1c1c9580551151 100644
--- a/software/caddy-frontend/test/test_data/test.TestMalformedBackenUrlSlave.test_file_list_log-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestMalformedBackenUrlSlave.test_file_list_log-CADDY.txt
@@ -1,10 +1,10 @@
-TestMalformedBackenUrlSlave-0/var/log/monitor-httpd-error.log
-TestMalformedBackenUrlSlave-1/var/log/frontend-access.log
-TestMalformedBackenUrlSlave-1/var/log/frontend-error.log
-TestMalformedBackenUrlSlave-1/var/log/httpd/_empty_access_log
-TestMalformedBackenUrlSlave-1/var/log/httpd/_empty_error_log
-TestMalformedBackenUrlSlave-1/var/log/monitor-httpd-error.log
-TestMalformedBackenUrlSlave-1/var/log/nginx-access.log
-TestMalformedBackenUrlSlave-1/var/log/nginx-error.log
-TestMalformedBackenUrlSlave-1/var/log/trafficserver/manager.log
-TestMalformedBackenUrlSlave-1/var/log/trafficserver/traffic.out
\ No newline at end of file
+T-0/var/log/monitor-httpd-error.log
+T-1/var/log/frontend-access.log
+T-1/var/log/frontend-error.log
+T-1/var/log/httpd/_empty_access_log
+T-1/var/log/httpd/_empty_error_log
+T-1/var/log/monitor-httpd-error.log
+T-1/var/log/nginx-access.log
+T-1/var/log/nginx-error.log
+T-1/var/log/trafficserver/manager.log
+T-1/var/log/trafficserver/traffic.out
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestMalformedBackenUrlSlave.test_file_list_run-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestMalformedBackenUrlSlave.test_file_list_run-CADDY.txt
index a21a022d672acd43422ad143127c99de88340768..1c68573ce5e83743455f6b80fbdafc141dbda22b 100644
--- a/software/caddy-frontend/test/test_data/test.TestMalformedBackenUrlSlave.test_file_list_run-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestMalformedBackenUrlSlave.test_file_list_run-CADDY.txt
@@ -1,12 +1,12 @@
-TestMalformedBackenUrlSlave-0/var/run/monitor-httpd.pid
-TestMalformedBackenUrlSlave-0/var/run/monitor/monitor-bootstrap.pid
-TestMalformedBackenUrlSlave-1/var/run/caddy_graceful_signature
-TestMalformedBackenUrlSlave-1/var/run/caddy_validate_signature
-TestMalformedBackenUrlSlave-1/var/run/caddy_validate_signature.status
-TestMalformedBackenUrlSlave-1/var/run/httpd.pid
-TestMalformedBackenUrlSlave-1/var/run/monitor-httpd.pid
-TestMalformedBackenUrlSlave-1/var/run/monitor/monitor-bootstrap.pid
-TestMalformedBackenUrlSlave-1/var/run/nginx.pid
-TestMalformedBackenUrlSlave-1/var/run/nginx_graceful_signature
-TestMalformedBackenUrlSlave-1/var/run/nginx_validate_signature
-TestMalformedBackenUrlSlave-1/var/run/nginx_validate_signature.status
\ No newline at end of file
+T-0/var/run/monitor-httpd.pid
+T-0/var/run/monitor/monitor-bootstrap.pid
+T-1/var/run/caddy_graceful_signature
+T-1/var/run/caddy_validate_signature
+T-1/var/run/caddy_validate_signature.status
+T-1/var/run/httpd.pid
+T-1/var/run/monitor-httpd.pid
+T-1/var/run/monitor/monitor-bootstrap.pid
+T-1/var/run/nginx.pid
+T-1/var/run/nginx_graceful_signature
+T-1/var/run/nginx_validate_signature
+T-1/var/run/nginx_validate_signature.status
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestMalformedBackenUrlSlave.test_promise_run_plugin-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestMalformedBackenUrlSlave.test_promise_run_plugin-CADDY.txt
index dcac0473e54ccbeed86ad8c601c8a1e1eb4e3476..b403acf67ffbdaefdf0351dac0addbbdc17eb4e2 100644
--- a/software/caddy-frontend/test/test_data/test.TestMalformedBackenUrlSlave.test_promise_run_plugin-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestMalformedBackenUrlSlave.test_promise_run_plugin-CADDY.txt
@@ -1,24 +1,24 @@
-TestMalformedBackenUrlSlave-0/etc/plugin/buildout-TestMalformedBackenUrlSlave-0-status.py: OK
-TestMalformedBackenUrlSlave-0/etc/plugin/check-free-disk-space.py: OK
-TestMalformedBackenUrlSlave-0/etc/plugin/monitor-bootstrap-status.py: OK
-TestMalformedBackenUrlSlave-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-TestMalformedBackenUrlSlave-1/etc/plugin/buildout-TestMalformedBackenUrlSlave-1-status.py: OK
-TestMalformedBackenUrlSlave-1/etc/plugin/caddy_cached.py: ERROR
-TestMalformedBackenUrlSlave-1/etc/plugin/caddy_frontend_ipv4_http.py: OK
-TestMalformedBackenUrlSlave-1/etc/plugin/caddy_frontend_ipv4_https.py: OK
-TestMalformedBackenUrlSlave-1/etc/plugin/caddy_frontend_ipv6_http.py: OK
-TestMalformedBackenUrlSlave-1/etc/plugin/caddy_frontend_ipv6_https.py: OK
-TestMalformedBackenUrlSlave-1/etc/plugin/caddy_ssl_cached.py: ERROR
-TestMalformedBackenUrlSlave-1/etc/plugin/check-_empty-error-log-last-day.py: OK
-TestMalformedBackenUrlSlave-1/etc/plugin/check-_empty-error-log-last-hour.py: OK
-TestMalformedBackenUrlSlave-1/etc/plugin/check-free-disk-space.py: OK
-TestMalformedBackenUrlSlave-1/etc/plugin/frontend-caddy-configuration-promise.py: OK
-TestMalformedBackenUrlSlave-1/etc/plugin/monitor-bootstrap-status.py: OK
-TestMalformedBackenUrlSlave-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-TestMalformedBackenUrlSlave-1/etc/plugin/nginx-configuration-promise.py: OK
-TestMalformedBackenUrlSlave-1/etc/plugin/nginx_frontend_ipv4_http.py: OK
-TestMalformedBackenUrlSlave-1/etc/plugin/nginx_frontend_ipv4_https.py: OK
-TestMalformedBackenUrlSlave-1/etc/plugin/nginx_frontend_ipv6_http.py: OK
-TestMalformedBackenUrlSlave-1/etc/plugin/nginx_frontend_ipv6_https.py: OK
-TestMalformedBackenUrlSlave-1/etc/plugin/re6st-connectivity.py: OK
-TestMalformedBackenUrlSlave-1/etc/plugin/trafficserver-port-listening.py: OK
\ No newline at end of file
+T-0/etc/plugin/buildout-T-0-status.py: OK
+T-0/etc/plugin/check-free-disk-space.py: OK
+T-0/etc/plugin/monitor-bootstrap-status.py: OK
+T-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
+T-1/etc/plugin/buildout-T-1-status.py: OK
+T-1/etc/plugin/caddy_cached.py: ERROR
+T-1/etc/plugin/caddy_frontend_ipv4_http.py: OK
+T-1/etc/plugin/caddy_frontend_ipv4_https.py: OK
+T-1/etc/plugin/caddy_frontend_ipv6_http.py: OK
+T-1/etc/plugin/caddy_frontend_ipv6_https.py: OK
+T-1/etc/plugin/caddy_ssl_cached.py: ERROR
+T-1/etc/plugin/check-_empty-error-log-last-day.py: OK
+T-1/etc/plugin/check-_empty-error-log-last-hour.py: OK
+T-1/etc/plugin/check-free-disk-space.py: OK
+T-1/etc/plugin/frontend-caddy-configuration-promise.py: OK
+T-1/etc/plugin/monitor-bootstrap-status.py: OK
+T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
+T-1/etc/plugin/nginx-configuration-promise.py: OK
+T-1/etc/plugin/nginx_frontend_ipv4_http.py: OK
+T-1/etc/plugin/nginx_frontend_ipv4_https.py: OK
+T-1/etc/plugin/nginx_frontend_ipv6_http.py: OK
+T-1/etc/plugin/nginx_frontend_ipv6_https.py: OK
+T-1/etc/plugin/re6st-connectivity.py: OK
+T-1/etc/plugin/trafficserver-port-listening.py: OK
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestMalformedBackenUrlSlave.test_promise_run_promise-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestMalformedBackenUrlSlave.test_promise_run_promise-CADDY.txt
index d6483588b3e5703f67f127c3bc50a54ab290d857..5105e42af08be204b45dbb4be093052c9805c0f6 100644
--- a/software/caddy-frontend/test/test_data/test.TestMalformedBackenUrlSlave.test_promise_run_promise-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestMalformedBackenUrlSlave.test_promise_run_promise-CADDY.txt
@@ -1,4 +1,4 @@
-TestMalformedBackenUrlSlave-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK
-TestMalformedBackenUrlSlave-1/etc/promise/caddy-frontend-is-running-actual-software-release: OK
-TestMalformedBackenUrlSlave-1/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK
-TestMalformedBackenUrlSlave-1/etc/promise/promise-nginx-is-process-older-than-dependency-set: OK
\ No newline at end of file
+T-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK
+T-1/etc/promise/caddy-frontend-is-running-actual-software-release: OK
+T-1/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK
+T-1/etc/promise/promise-nginx-is-process-older-than-dependency-set: OK
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestMalformedBackenUrlSlave.test_supervisor_state-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestMalformedBackenUrlSlave.test_supervisor_state-CADDY.txt
index 92d29f937d6d75c6dec14017c69096306275cd19..0efdb10a5da84b6ae5157ed1172abad2fadc7736 100644
--- a/software/caddy-frontend/test/test_data/test.TestMalformedBackenUrlSlave.test_supervisor_state-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestMalformedBackenUrlSlave.test_supervisor_state-CADDY.txt
@@ -1,24 +1,24 @@
-TestMalformedBackenUrlSlave-0:bootstrap-monitor EXITED
-TestMalformedBackenUrlSlave-0:certificate_authority-{hash}-on-watch RUNNING
-TestMalformedBackenUrlSlave-0:crond-{hash} RUNNING
-TestMalformedBackenUrlSlave-0:monitor-httpd-{hash}-on-watch RUNNING
-TestMalformedBackenUrlSlave-0:monitor-httpd-graceful EXITED
-TestMalformedBackenUrlSlave-1:6tunnel-11080-{hash}-on-watch RUNNING
-TestMalformedBackenUrlSlave-1:6tunnel-11443-{hash}-on-watch RUNNING
-TestMalformedBackenUrlSlave-1:6tunnel-12080-{hash}-on-watch RUNNING
-TestMalformedBackenUrlSlave-1:6tunnel-12443-{hash}-on-watch RUNNING
-TestMalformedBackenUrlSlave-1:6tunnel-26011-{hash}-on-watch RUNNING
-TestMalformedBackenUrlSlave-1:6tunnel-26012-{hash}-on-watch RUNNING
-TestMalformedBackenUrlSlave-1:bootstrap-monitor EXITED
-TestMalformedBackenUrlSlave-1:certificate_authority-{hash}-on-watch RUNNING
-TestMalformedBackenUrlSlave-1:crond-{hash} RUNNING
-TestMalformedBackenUrlSlave-1:crond-on-watch RUNNING
-TestMalformedBackenUrlSlave-1:frontend-caddy-safe-graceful EXITED
-TestMalformedBackenUrlSlave-1:frontend-nginx-safe-graceful EXITED
-TestMalformedBackenUrlSlave-1:frontend_caddy-{hash}-on-watch RUNNING
-TestMalformedBackenUrlSlave-1:frontend_nginx-{hash}-on-watch RUNNING
-TestMalformedBackenUrlSlave-1:monitor-httpd-{hash}-on-watch RUNNING
-TestMalformedBackenUrlSlave-1:monitor-httpd-graceful EXITED
-TestMalformedBackenUrlSlave-1:trafficserver-{hash}-on-watch RUNNING
-TestMalformedBackenUrlSlave-1:trafficserver-reload EXITED
+T-0:bootstrap-monitor EXITED
+T-0:certificate_authority-{hash}-on-watch RUNNING
+T-0:crond-{hash} RUNNING
+T-0:monitor-httpd-{hash}-on-watch RUNNING
+T-0:monitor-httpd-graceful EXITED
+T-1:6tunnel-11080-{hash}-on-watch RUNNING
+T-1:6tunnel-11443-{hash}-on-watch RUNNING
+T-1:6tunnel-12080-{hash}-on-watch RUNNING
+T-1:6tunnel-12443-{hash}-on-watch RUNNING
+T-1:6tunnel-26011-{hash}-on-watch RUNNING
+T-1:6tunnel-26012-{hash}-on-watch RUNNING
+T-1:bootstrap-monitor EXITED
+T-1:certificate_authority-{hash}-on-watch RUNNING
+T-1:crond-{hash} RUNNING
+T-1:crond-on-watch RUNNING
+T-1:frontend-caddy-safe-graceful EXITED
+T-1:frontend-nginx-safe-graceful EXITED
+T-1:frontend_caddy-{hash}-on-watch RUNNING
+T-1:frontend_nginx-{hash}-on-watch RUNNING
+T-1:monitor-httpd-{hash}-on-watch RUNNING
+T-1:monitor-httpd-graceful EXITED
+T-1:trafficserver-{hash}-on-watch RUNNING
+T-1:trafficserver-reload EXITED
 watchdog:watchdog RUNNING
diff --git a/software/caddy-frontend/test/test_data/test.TestMasterRequest.test_file_list_log-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestMasterRequest.test_file_list_log-CADDY.txt
index a6485a26c8e764d2cfcc724a018c5b99beac1766..9bdcae360cd9d04cdca9385761a2e7bea746d6ae 100644
--- a/software/caddy-frontend/test/test_data/test.TestMasterRequest.test_file_list_log-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestMasterRequest.test_file_list_log-CADDY.txt
@@ -1,5 +1,5 @@
-TestMasterRequest-0/var/log/monitor-httpd-error.log
-TestMasterRequest-1/var/log/nginx-access.log
-TestMasterRequest-1/var/log/nginx-error.log
-TestMasterRequest-1/var/log/trafficserver/manager.log
-TestMasterRequest-1/var/log/trafficserver/traffic.out
\ No newline at end of file
+T-0/var/log/monitor-httpd-error.log
+T-1/var/log/nginx-access.log
+T-1/var/log/nginx-error.log
+T-1/var/log/trafficserver/manager.log
+T-1/var/log/trafficserver/traffic.out
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestMasterRequest.test_file_list_run-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestMasterRequest.test_file_list_run-CADDY.txt
index 4e202254b9e21655bef129759636e366184b8913..09130368080f735397d5a30204bae2f21512deb7 100644
--- a/software/caddy-frontend/test/test_data/test.TestMasterRequest.test_file_list_run-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestMasterRequest.test_file_list_run-CADDY.txt
@@ -1,10 +1,10 @@
-TestMasterRequest-0/var/run/monitor-httpd.pid
-TestMasterRequest-0/var/run/monitor/monitor-bootstrap.pid
-TestMasterRequest-1/var/run/caddy_graceful_signature
-TestMasterRequest-1/var/run/caddy_validate_signature
-TestMasterRequest-1/var/run/caddy_validate_signature.status
-TestMasterRequest-1/var/run/monitor/monitor-bootstrap.pid
-TestMasterRequest-1/var/run/nginx.pid
-TestMasterRequest-1/var/run/nginx_graceful_signature
-TestMasterRequest-1/var/run/nginx_validate_signature
-TestMasterRequest-1/var/run/nginx_validate_signature.status
\ No newline at end of file
+T-0/var/run/monitor-httpd.pid
+T-0/var/run/monitor/monitor-bootstrap.pid
+T-1/var/run/caddy_graceful_signature
+T-1/var/run/caddy_validate_signature
+T-1/var/run/caddy_validate_signature.status
+T-1/var/run/monitor/monitor-bootstrap.pid
+T-1/var/run/nginx.pid
+T-1/var/run/nginx_graceful_signature
+T-1/var/run/nginx_validate_signature
+T-1/var/run/nginx_validate_signature.status
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestMasterRequest.test_promise_run_plugin-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestMasterRequest.test_promise_run_plugin-CADDY.txt
index 83f892a0eeaf22e395f2e3b11fa4993fa539dc8d..597aeeb417b2ef8609921e647c17fedbe1cd1e72 100644
--- a/software/caddy-frontend/test/test_data/test.TestMasterRequest.test_promise_run_plugin-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestMasterRequest.test_promise_run_plugin-CADDY.txt
@@ -1,22 +1,22 @@
-TestMasterRequest-0/etc/plugin/buildout-TestMasterRequest-0-status.py: OK
-TestMasterRequest-0/etc/plugin/check-free-disk-space.py: OK
-TestMasterRequest-0/etc/plugin/monitor-bootstrap-status.py: OK
-TestMasterRequest-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-TestMasterRequest-1/etc/plugin/buildout-TestMasterRequest-1-status.py: OK
-TestMasterRequest-1/etc/plugin/caddy_cached.py: ERROR
-TestMasterRequest-1/etc/plugin/caddy_frontend_ipv4_http.py: ERROR
-TestMasterRequest-1/etc/plugin/caddy_frontend_ipv4_https.py: ERROR
-TestMasterRequest-1/etc/plugin/caddy_frontend_ipv6_http.py: OK
-TestMasterRequest-1/etc/plugin/caddy_frontend_ipv6_https.py: OK
-TestMasterRequest-1/etc/plugin/caddy_ssl_cached.py: ERROR
-TestMasterRequest-1/etc/plugin/check-free-disk-space.py: OK
-TestMasterRequest-1/etc/plugin/frontend-caddy-configuration-promise.py: ERROR
-TestMasterRequest-1/etc/plugin/monitor-bootstrap-status.py: OK
-TestMasterRequest-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-TestMasterRequest-1/etc/plugin/nginx-configuration-promise.py: ERROR
-TestMasterRequest-1/etc/plugin/nginx_frontend_ipv4_http.py: OK
-TestMasterRequest-1/etc/plugin/nginx_frontend_ipv4_https.py: OK
-TestMasterRequest-1/etc/plugin/nginx_frontend_ipv6_http.py: OK
-TestMasterRequest-1/etc/plugin/nginx_frontend_ipv6_https.py: OK
-TestMasterRequest-1/etc/plugin/re6st-connectivity.py: OK
-TestMasterRequest-1/etc/plugin/trafficserver-port-listening.py: ERROR
\ No newline at end of file
+T-0/etc/plugin/buildout-T-0-status.py: OK
+T-0/etc/plugin/check-free-disk-space.py: OK
+T-0/etc/plugin/monitor-bootstrap-status.py: OK
+T-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
+T-1/etc/plugin/buildout-T-1-status.py: OK
+T-1/etc/plugin/caddy_cached.py: ERROR
+T-1/etc/plugin/caddy_frontend_ipv4_http.py: ERROR
+T-1/etc/plugin/caddy_frontend_ipv4_https.py: ERROR
+T-1/etc/plugin/caddy_frontend_ipv6_http.py: OK
+T-1/etc/plugin/caddy_frontend_ipv6_https.py: OK
+T-1/etc/plugin/caddy_ssl_cached.py: ERROR
+T-1/etc/plugin/check-free-disk-space.py: OK
+T-1/etc/plugin/frontend-caddy-configuration-promise.py: ERROR
+T-1/etc/plugin/monitor-bootstrap-status.py: OK
+T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
+T-1/etc/plugin/nginx-configuration-promise.py: ERROR
+T-1/etc/plugin/nginx_frontend_ipv4_http.py: OK
+T-1/etc/plugin/nginx_frontend_ipv4_https.py: OK
+T-1/etc/plugin/nginx_frontend_ipv6_http.py: OK
+T-1/etc/plugin/nginx_frontend_ipv6_https.py: OK
+T-1/etc/plugin/re6st-connectivity.py: OK
+T-1/etc/plugin/trafficserver-port-listening.py: OK
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestMasterRequest.test_promise_run_promise-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestMasterRequest.test_promise_run_promise-CADDY.txt
index defbf977d8fd478b73d850f28218bd77ff6c5c8f..5105e42af08be204b45dbb4be093052c9805c0f6 100644
--- a/software/caddy-frontend/test/test_data/test.TestMasterRequest.test_promise_run_promise-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestMasterRequest.test_promise_run_promise-CADDY.txt
@@ -1,4 +1,4 @@
-TestMasterRequest-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK
-TestMasterRequest-1/etc/promise/caddy-frontend-is-running-actual-software-release: OK
-TestMasterRequest-1/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK
-TestMasterRequest-1/etc/promise/promise-nginx-is-process-older-than-dependency-set: OK
\ No newline at end of file
+T-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK
+T-1/etc/promise/caddy-frontend-is-running-actual-software-release: OK
+T-1/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK
+T-1/etc/promise/promise-nginx-is-process-older-than-dependency-set: OK
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestMasterRequest.test_supervisor_state-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestMasterRequest.test_supervisor_state-CADDY.txt
index 2b6c3d16b38f4012c4eac3b982a9564b84703a17..5ad541ba5e271a4e66c85f2b6b555faf800b0333 100644
--- a/software/caddy-frontend/test/test_data/test.TestMasterRequest.test_supervisor_state-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestMasterRequest.test_supervisor_state-CADDY.txt
@@ -1,24 +1,24 @@
-TestMasterRequest-0:bootstrap-monitor EXITED
-TestMasterRequest-0:certificate_authority-{hash}-on-watch RUNNING
-TestMasterRequest-0:crond-{hash} RUNNING
-TestMasterRequest-0:monitor-httpd-{hash}-on-watch RUNNING
-TestMasterRequest-0:monitor-httpd-graceful EXITED
-TestMasterRequest-1:6tunnel-11080-{hash}-on-watch RUNNING
-TestMasterRequest-1:6tunnel-11443-{hash}-on-watch RUNNING
-TestMasterRequest-1:6tunnel-12080-{hash}-on-watch RUNNING
-TestMasterRequest-1:6tunnel-12443-{hash}-on-watch RUNNING
-TestMasterRequest-1:6tunnel-26011-{hash}-on-watch RUNNING
-TestMasterRequest-1:6tunnel-26012-{hash}-on-watch RUNNING
-TestMasterRequest-1:bootstrap-monitor EXITED
-TestMasterRequest-1:certificate_authority-{hash}-on-watch RUNNING
-TestMasterRequest-1:crond-{hash} RUNNING
-TestMasterRequest-1:crond-on-watch RUNNING
-TestMasterRequest-1:frontend-caddy-safe-graceful EXITED
-TestMasterRequest-1:frontend-nginx-safe-graceful EXITED
-TestMasterRequest-1:frontend_caddy-{hash}-on-watch EXITED
-TestMasterRequest-1:frontend_nginx-{hash}-on-watch RUNNING
-TestMasterRequest-1:monitor-httpd-{hash}-on-watch EXITED
-TestMasterRequest-1:monitor-httpd-graceful EXITED
-TestMasterRequest-1:trafficserver-{hash}-on-watch RUNNING
-TestMasterRequest-1:trafficserver-reload EXITED
+T-0:bootstrap-monitor EXITED
+T-0:certificate_authority-{hash}-on-watch RUNNING
+T-0:crond-{hash} RUNNING
+T-0:monitor-httpd-{hash}-on-watch RUNNING
+T-0:monitor-httpd-graceful EXITED
+T-1:6tunnel-11080-{hash}-on-watch RUNNING
+T-1:6tunnel-11443-{hash}-on-watch RUNNING
+T-1:6tunnel-12080-{hash}-on-watch RUNNING
+T-1:6tunnel-12443-{hash}-on-watch RUNNING
+T-1:6tunnel-26011-{hash}-on-watch RUNNING
+T-1:6tunnel-26012-{hash}-on-watch RUNNING
+T-1:bootstrap-monitor EXITED
+T-1:certificate_authority-{hash}-on-watch RUNNING
+T-1:crond-{hash} RUNNING
+T-1:crond-on-watch RUNNING
+T-1:frontend-caddy-safe-graceful EXITED
+T-1:frontend-nginx-safe-graceful EXITED
+T-1:frontend_caddy-{hash}-on-watch EXITED
+T-1:frontend_nginx-{hash}-on-watch RUNNING
+T-1:monitor-httpd-{hash}-on-watch EXITED
+T-1:monitor-httpd-graceful EXITED
+T-1:trafficserver-{hash}-on-watch RUNNING
+T-1:trafficserver-reload EXITED
 watchdog:watchdog RUNNING
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_file_list_log-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_file_list_log-CADDY.txt
index 59f358af4b103aa458dc6a9b3df2a80662270c81..9bdcae360cd9d04cdca9385761a2e7bea746d6ae 100644
--- a/software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_file_list_log-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_file_list_log-CADDY.txt
@@ -1,5 +1,5 @@
-TestMasterRequestDomain-0/var/log/monitor-httpd-error.log
-TestMasterRequestDomain-1/var/log/nginx-access.log
-TestMasterRequestDomain-1/var/log/nginx-error.log
-TestMasterRequestDomain-1/var/log/trafficserver/manager.log
-TestMasterRequestDomain-1/var/log/trafficserver/traffic.out
\ No newline at end of file
+T-0/var/log/monitor-httpd-error.log
+T-1/var/log/nginx-access.log
+T-1/var/log/nginx-error.log
+T-1/var/log/trafficserver/manager.log
+T-1/var/log/trafficserver/traffic.out
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_file_list_run-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_file_list_run-CADDY.txt
index f8ae0b5995e7a067ae1d6f8732ee3570fb1b2206..09130368080f735397d5a30204bae2f21512deb7 100644
--- a/software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_file_list_run-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_file_list_run-CADDY.txt
@@ -1,10 +1,10 @@
-TestMasterRequestDomain-0/var/run/monitor-httpd.pid
-TestMasterRequestDomain-0/var/run/monitor/monitor-bootstrap.pid
-TestMasterRequestDomain-1/var/run/caddy_graceful_signature
-TestMasterRequestDomain-1/var/run/caddy_validate_signature
-TestMasterRequestDomain-1/var/run/caddy_validate_signature.status
-TestMasterRequestDomain-1/var/run/monitor/monitor-bootstrap.pid
-TestMasterRequestDomain-1/var/run/nginx.pid
-TestMasterRequestDomain-1/var/run/nginx_graceful_signature
-TestMasterRequestDomain-1/var/run/nginx_validate_signature
-TestMasterRequestDomain-1/var/run/nginx_validate_signature.status
\ No newline at end of file
+T-0/var/run/monitor-httpd.pid
+T-0/var/run/monitor/monitor-bootstrap.pid
+T-1/var/run/caddy_graceful_signature
+T-1/var/run/caddy_validate_signature
+T-1/var/run/caddy_validate_signature.status
+T-1/var/run/monitor/monitor-bootstrap.pid
+T-1/var/run/nginx.pid
+T-1/var/run/nginx_graceful_signature
+T-1/var/run/nginx_validate_signature
+T-1/var/run/nginx_validate_signature.status
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_promise_run_plugin-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_promise_run_plugin-CADDY.txt
index 76fcecfd5f53eb9c0dc2517631916375fce71f67..597aeeb417b2ef8609921e647c17fedbe1cd1e72 100644
--- a/software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_promise_run_plugin-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_promise_run_plugin-CADDY.txt
@@ -1,22 +1,22 @@
-TestMasterRequestDomain-0/etc/plugin/buildout-TestMasterRequestDomain-0-status.py: OK
-TestMasterRequestDomain-0/etc/plugin/check-free-disk-space.py: OK
-TestMasterRequestDomain-0/etc/plugin/monitor-bootstrap-status.py: OK
-TestMasterRequestDomain-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-TestMasterRequestDomain-1/etc/plugin/buildout-TestMasterRequestDomain-1-status.py: OK
-TestMasterRequestDomain-1/etc/plugin/caddy_cached.py: ERROR
-TestMasterRequestDomain-1/etc/plugin/caddy_frontend_ipv4_http.py: ERROR
-TestMasterRequestDomain-1/etc/plugin/caddy_frontend_ipv4_https.py: ERROR
-TestMasterRequestDomain-1/etc/plugin/caddy_frontend_ipv6_http.py: OK
-TestMasterRequestDomain-1/etc/plugin/caddy_frontend_ipv6_https.py: OK
-TestMasterRequestDomain-1/etc/plugin/caddy_ssl_cached.py: ERROR
-TestMasterRequestDomain-1/etc/plugin/check-free-disk-space.py: OK
-TestMasterRequestDomain-1/etc/plugin/frontend-caddy-configuration-promise.py: ERROR
-TestMasterRequestDomain-1/etc/plugin/monitor-bootstrap-status.py: OK
-TestMasterRequestDomain-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-TestMasterRequestDomain-1/etc/plugin/nginx-configuration-promise.py: ERROR
-TestMasterRequestDomain-1/etc/plugin/nginx_frontend_ipv4_http.py: OK
-TestMasterRequestDomain-1/etc/plugin/nginx_frontend_ipv4_https.py: OK
-TestMasterRequestDomain-1/etc/plugin/nginx_frontend_ipv6_http.py: OK
-TestMasterRequestDomain-1/etc/plugin/nginx_frontend_ipv6_https.py: OK
-TestMasterRequestDomain-1/etc/plugin/re6st-connectivity.py: OK
-TestMasterRequestDomain-1/etc/plugin/trafficserver-port-listening.py: OK
\ No newline at end of file
+T-0/etc/plugin/buildout-T-0-status.py: OK
+T-0/etc/plugin/check-free-disk-space.py: OK
+T-0/etc/plugin/monitor-bootstrap-status.py: OK
+T-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
+T-1/etc/plugin/buildout-T-1-status.py: OK
+T-1/etc/plugin/caddy_cached.py: ERROR
+T-1/etc/plugin/caddy_frontend_ipv4_http.py: ERROR
+T-1/etc/plugin/caddy_frontend_ipv4_https.py: ERROR
+T-1/etc/plugin/caddy_frontend_ipv6_http.py: OK
+T-1/etc/plugin/caddy_frontend_ipv6_https.py: OK
+T-1/etc/plugin/caddy_ssl_cached.py: ERROR
+T-1/etc/plugin/check-free-disk-space.py: OK
+T-1/etc/plugin/frontend-caddy-configuration-promise.py: ERROR
+T-1/etc/plugin/monitor-bootstrap-status.py: OK
+T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
+T-1/etc/plugin/nginx-configuration-promise.py: ERROR
+T-1/etc/plugin/nginx_frontend_ipv4_http.py: OK
+T-1/etc/plugin/nginx_frontend_ipv4_https.py: OK
+T-1/etc/plugin/nginx_frontend_ipv6_http.py: OK
+T-1/etc/plugin/nginx_frontend_ipv6_https.py: OK
+T-1/etc/plugin/re6st-connectivity.py: OK
+T-1/etc/plugin/trafficserver-port-listening.py: OK
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_promise_run_promise-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_promise_run_promise-CADDY.txt
index 4d7e73d18ac676d6d1bdf5c1c33a1143a36d5ce0..5105e42af08be204b45dbb4be093052c9805c0f6 100644
--- a/software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_promise_run_promise-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_promise_run_promise-CADDY.txt
@@ -1,4 +1,4 @@
-TestMasterRequestDomain-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK
-TestMasterRequestDomain-1/etc/promise/caddy-frontend-is-running-actual-software-release: OK
-TestMasterRequestDomain-1/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK
-TestMasterRequestDomain-1/etc/promise/promise-nginx-is-process-older-than-dependency-set: OK
\ No newline at end of file
+T-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK
+T-1/etc/promise/caddy-frontend-is-running-actual-software-release: OK
+T-1/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK
+T-1/etc/promise/promise-nginx-is-process-older-than-dependency-set: OK
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_supervisor_state-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_supervisor_state-CADDY.txt
index d28db90a4d63f80929952375b2fc06d99537ffb4..5ad541ba5e271a4e66c85f2b6b555faf800b0333 100644
--- a/software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_supervisor_state-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_supervisor_state-CADDY.txt
@@ -1,24 +1,24 @@
-TestMasterRequestDomain-0:bootstrap-monitor EXITED
-TestMasterRequestDomain-0:certificate_authority-{hash}-on-watch RUNNING
-TestMasterRequestDomain-0:crond-{hash} RUNNING
-TestMasterRequestDomain-0:monitor-httpd-{hash}-on-watch RUNNING
-TestMasterRequestDomain-0:monitor-httpd-graceful EXITED
-TestMasterRequestDomain-1:6tunnel-11080-{hash}-on-watch RUNNING
-TestMasterRequestDomain-1:6tunnel-11443-{hash}-on-watch RUNNING
-TestMasterRequestDomain-1:6tunnel-12080-{hash}-on-watch RUNNING
-TestMasterRequestDomain-1:6tunnel-12443-{hash}-on-watch RUNNING
-TestMasterRequestDomain-1:6tunnel-26011-{hash}-on-watch RUNNING
-TestMasterRequestDomain-1:6tunnel-26012-{hash}-on-watch RUNNING
-TestMasterRequestDomain-1:bootstrap-monitor EXITED
-TestMasterRequestDomain-1:certificate_authority-{hash}-on-watch RUNNING
-TestMasterRequestDomain-1:crond-{hash} RUNNING
-TestMasterRequestDomain-1:crond-on-watch RUNNING
-TestMasterRequestDomain-1:frontend-caddy-safe-graceful EXITED
-TestMasterRequestDomain-1:frontend-nginx-safe-graceful EXITED
-TestMasterRequestDomain-1:frontend_caddy-{hash}-on-watch EXITED
-TestMasterRequestDomain-1:frontend_nginx-{hash}-on-watch RUNNING
-TestMasterRequestDomain-1:monitor-httpd-{hash}-on-watch EXITED
-TestMasterRequestDomain-1:monitor-httpd-graceful EXITED
-TestMasterRequestDomain-1:trafficserver-{hash}-on-watch RUNNING
-TestMasterRequestDomain-1:trafficserver-reload EXITED
+T-0:bootstrap-monitor EXITED
+T-0:certificate_authority-{hash}-on-watch RUNNING
+T-0:crond-{hash} RUNNING
+T-0:monitor-httpd-{hash}-on-watch RUNNING
+T-0:monitor-httpd-graceful EXITED
+T-1:6tunnel-11080-{hash}-on-watch RUNNING
+T-1:6tunnel-11443-{hash}-on-watch RUNNING
+T-1:6tunnel-12080-{hash}-on-watch RUNNING
+T-1:6tunnel-12443-{hash}-on-watch RUNNING
+T-1:6tunnel-26011-{hash}-on-watch RUNNING
+T-1:6tunnel-26012-{hash}-on-watch RUNNING
+T-1:bootstrap-monitor EXITED
+T-1:certificate_authority-{hash}-on-watch RUNNING
+T-1:crond-{hash} RUNNING
+T-1:crond-on-watch RUNNING
+T-1:frontend-caddy-safe-graceful EXITED
+T-1:frontend-nginx-safe-graceful EXITED
+T-1:frontend_caddy-{hash}-on-watch EXITED
+T-1:frontend_nginx-{hash}-on-watch RUNNING
+T-1:monitor-httpd-{hash}-on-watch EXITED
+T-1:monitor-httpd-graceful EXITED
+T-1:trafficserver-{hash}-on-watch RUNNING
+T-1:trafficserver-reload EXITED
 watchdog:watchdog RUNNING
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_file_list_log-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_file_list_log-CADDY.txt
index d37c6b57706d5ceaf865282bb0a02a7ebc1a475c..e7e8d6d882b7eca339a79454b773a96847b70f90 100644
--- a/software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_file_list_log-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_file_list_log-CADDY.txt
@@ -1,10 +1,10 @@
-TestQuicEnabled-0/var/log/monitor-httpd-error.log
-TestQuicEnabled-1/var/log/frontend-access.log
-TestQuicEnabled-1/var/log/frontend-error.log
-TestQuicEnabled-1/var/log/httpd/_url_access_log
-TestQuicEnabled-1/var/log/httpd/_url_error_log
-TestQuicEnabled-1/var/log/monitor-httpd-error.log
-TestQuicEnabled-1/var/log/nginx-access.log
-TestQuicEnabled-1/var/log/nginx-error.log
-TestQuicEnabled-1/var/log/trafficserver/manager.log
-TestQuicEnabled-1/var/log/trafficserver/traffic.out
\ No newline at end of file
+T-0/var/log/monitor-httpd-error.log
+T-1/var/log/frontend-access.log
+T-1/var/log/frontend-error.log
+T-1/var/log/httpd/_url_access_log
+T-1/var/log/httpd/_url_error_log
+T-1/var/log/monitor-httpd-error.log
+T-1/var/log/nginx-access.log
+T-1/var/log/nginx-error.log
+T-1/var/log/trafficserver/manager.log
+T-1/var/log/trafficserver/traffic.out
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_file_list_run-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_file_list_run-CADDY.txt
index 196b55ea12210bfb3b0236173b2324b9d80d2239..1c68573ce5e83743455f6b80fbdafc141dbda22b 100644
--- a/software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_file_list_run-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_file_list_run-CADDY.txt
@@ -1,12 +1,12 @@
-TestQuicEnabled-0/var/run/monitor-httpd.pid
-TestQuicEnabled-0/var/run/monitor/monitor-bootstrap.pid
-TestQuicEnabled-1/var/run/caddy_graceful_signature
-TestQuicEnabled-1/var/run/caddy_validate_signature
-TestQuicEnabled-1/var/run/caddy_validate_signature.status
-TestQuicEnabled-1/var/run/httpd.pid
-TestQuicEnabled-1/var/run/monitor-httpd.pid
-TestQuicEnabled-1/var/run/monitor/monitor-bootstrap.pid
-TestQuicEnabled-1/var/run/nginx.pid
-TestQuicEnabled-1/var/run/nginx_graceful_signature
-TestQuicEnabled-1/var/run/nginx_validate_signature
-TestQuicEnabled-1/var/run/nginx_validate_signature.status
\ No newline at end of file
+T-0/var/run/monitor-httpd.pid
+T-0/var/run/monitor/monitor-bootstrap.pid
+T-1/var/run/caddy_graceful_signature
+T-1/var/run/caddy_validate_signature
+T-1/var/run/caddy_validate_signature.status
+T-1/var/run/httpd.pid
+T-1/var/run/monitor-httpd.pid
+T-1/var/run/monitor/monitor-bootstrap.pid
+T-1/var/run/nginx.pid
+T-1/var/run/nginx_graceful_signature
+T-1/var/run/nginx_validate_signature
+T-1/var/run/nginx_validate_signature.status
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_promise_run_plugin-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_promise_run_plugin-CADDY.txt
index 79c89cd9d191de52d39feb1d102b4302d9fdd931..3fbabd31891aa3eee5b84ed6411a831fcc185f8e 100644
--- a/software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_promise_run_plugin-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_promise_run_plugin-CADDY.txt
@@ -1,24 +1,24 @@
-TestQuicEnabled-0/etc/plugin/buildout-TestQuicEnabled-0-status.py: OK
-TestQuicEnabled-0/etc/plugin/check-free-disk-space.py: OK
-TestQuicEnabled-0/etc/plugin/monitor-bootstrap-status.py: OK
-TestQuicEnabled-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-TestQuicEnabled-1/etc/plugin/buildout-TestQuicEnabled-1-status.py: OK
-TestQuicEnabled-1/etc/plugin/caddy_cached.py: ERROR
-TestQuicEnabled-1/etc/plugin/caddy_frontend_ipv4_http.py: OK
-TestQuicEnabled-1/etc/plugin/caddy_frontend_ipv4_https.py: OK
-TestQuicEnabled-1/etc/plugin/caddy_frontend_ipv6_http.py: OK
-TestQuicEnabled-1/etc/plugin/caddy_frontend_ipv6_https.py: OK
-TestQuicEnabled-1/etc/plugin/caddy_ssl_cached.py: ERROR
-TestQuicEnabled-1/etc/plugin/check-_url-error-log-last-day.py: OK
-TestQuicEnabled-1/etc/plugin/check-_url-error-log-last-hour.py: OK
-TestQuicEnabled-1/etc/plugin/check-free-disk-space.py: OK
-TestQuicEnabled-1/etc/plugin/frontend-caddy-configuration-promise.py: OK
-TestQuicEnabled-1/etc/plugin/monitor-bootstrap-status.py: OK
-TestQuicEnabled-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-TestQuicEnabled-1/etc/plugin/nginx-configuration-promise.py: OK
-TestQuicEnabled-1/etc/plugin/nginx_frontend_ipv4_http.py: OK
-TestQuicEnabled-1/etc/plugin/nginx_frontend_ipv4_https.py: OK
-TestQuicEnabled-1/etc/plugin/nginx_frontend_ipv6_http.py: OK
-TestQuicEnabled-1/etc/plugin/nginx_frontend_ipv6_https.py: OK
-TestQuicEnabled-1/etc/plugin/re6st-connectivity.py: OK
-TestQuicEnabled-1/etc/plugin/trafficserver-port-listening.py: OK
\ No newline at end of file
+T-0/etc/plugin/buildout-T-0-status.py: OK
+T-0/etc/plugin/check-free-disk-space.py: OK
+T-0/etc/plugin/monitor-bootstrap-status.py: OK
+T-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
+T-1/etc/plugin/buildout-T-1-status.py: OK
+T-1/etc/plugin/caddy_cached.py: ERROR
+T-1/etc/plugin/caddy_frontend_ipv4_http.py: OK
+T-1/etc/plugin/caddy_frontend_ipv4_https.py: OK
+T-1/etc/plugin/caddy_frontend_ipv6_http.py: OK
+T-1/etc/plugin/caddy_frontend_ipv6_https.py: OK
+T-1/etc/plugin/caddy_ssl_cached.py: ERROR
+T-1/etc/plugin/check-_url-error-log-last-day.py: OK
+T-1/etc/plugin/check-_url-error-log-last-hour.py: OK
+T-1/etc/plugin/check-free-disk-space.py: OK
+T-1/etc/plugin/frontend-caddy-configuration-promise.py: OK
+T-1/etc/plugin/monitor-bootstrap-status.py: OK
+T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
+T-1/etc/plugin/nginx-configuration-promise.py: OK
+T-1/etc/plugin/nginx_frontend_ipv4_http.py: OK
+T-1/etc/plugin/nginx_frontend_ipv4_https.py: OK
+T-1/etc/plugin/nginx_frontend_ipv6_http.py: OK
+T-1/etc/plugin/nginx_frontend_ipv6_https.py: OK
+T-1/etc/plugin/re6st-connectivity.py: OK
+T-1/etc/plugin/trafficserver-port-listening.py: OK
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_promise_run_promise-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_promise_run_promise-CADDY.txt
index 2459039fddc73025b9a1804735cfbc2bff484978..5105e42af08be204b45dbb4be093052c9805c0f6 100644
--- a/software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_promise_run_promise-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_promise_run_promise-CADDY.txt
@@ -1,4 +1,4 @@
-TestQuicEnabled-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK
-TestQuicEnabled-1/etc/promise/caddy-frontend-is-running-actual-software-release: OK
-TestQuicEnabled-1/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK
-TestQuicEnabled-1/etc/promise/promise-nginx-is-process-older-than-dependency-set: OK
\ No newline at end of file
+T-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK
+T-1/etc/promise/caddy-frontend-is-running-actual-software-release: OK
+T-1/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK
+T-1/etc/promise/promise-nginx-is-process-older-than-dependency-set: OK
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_supervisor_state-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_supervisor_state-CADDY.txt
index ce7d0b1d2f4887ce74ed32dbc345a1d4498bae7e..0efdb10a5da84b6ae5157ed1172abad2fadc7736 100644
--- a/software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_supervisor_state-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_supervisor_state-CADDY.txt
@@ -1,24 +1,24 @@
-TestQuicEnabled-0:bootstrap-monitor EXITED
-TestQuicEnabled-0:certificate_authority-{hash}-on-watch RUNNING
-TestQuicEnabled-0:crond-{hash} RUNNING
-TestQuicEnabled-0:monitor-httpd-{hash}-on-watch RUNNING
-TestQuicEnabled-0:monitor-httpd-graceful EXITED
-TestQuicEnabled-1:6tunnel-11080-{hash}-on-watch RUNNING
-TestQuicEnabled-1:6tunnel-11443-{hash}-on-watch RUNNING
-TestQuicEnabled-1:6tunnel-12080-{hash}-on-watch RUNNING
-TestQuicEnabled-1:6tunnel-12443-{hash}-on-watch RUNNING
-TestQuicEnabled-1:6tunnel-26011-{hash}-on-watch RUNNING
-TestQuicEnabled-1:6tunnel-26012-{hash}-on-watch RUNNING
-TestQuicEnabled-1:bootstrap-monitor EXITED
-TestQuicEnabled-1:certificate_authority-{hash}-on-watch RUNNING
-TestQuicEnabled-1:crond-{hash} RUNNING
-TestQuicEnabled-1:crond-on-watch RUNNING
-TestQuicEnabled-1:frontend-caddy-safe-graceful EXITED
-TestQuicEnabled-1:frontend-nginx-safe-graceful EXITED
-TestQuicEnabled-1:frontend_caddy-{hash}-on-watch RUNNING
-TestQuicEnabled-1:frontend_nginx-{hash}-on-watch RUNNING
-TestQuicEnabled-1:monitor-httpd-{hash}-on-watch RUNNING
-TestQuicEnabled-1:monitor-httpd-graceful EXITED
-TestQuicEnabled-1:trafficserver-{hash}-on-watch RUNNING
-TestQuicEnabled-1:trafficserver-reload EXITED
+T-0:bootstrap-monitor EXITED
+T-0:certificate_authority-{hash}-on-watch RUNNING
+T-0:crond-{hash} RUNNING
+T-0:monitor-httpd-{hash}-on-watch RUNNING
+T-0:monitor-httpd-graceful EXITED
+T-1:6tunnel-11080-{hash}-on-watch RUNNING
+T-1:6tunnel-11443-{hash}-on-watch RUNNING
+T-1:6tunnel-12080-{hash}-on-watch RUNNING
+T-1:6tunnel-12443-{hash}-on-watch RUNNING
+T-1:6tunnel-26011-{hash}-on-watch RUNNING
+T-1:6tunnel-26012-{hash}-on-watch RUNNING
+T-1:bootstrap-monitor EXITED
+T-1:certificate_authority-{hash}-on-watch RUNNING
+T-1:crond-{hash} RUNNING
+T-1:crond-on-watch RUNNING
+T-1:frontend-caddy-safe-graceful EXITED
+T-1:frontend-nginx-safe-graceful EXITED
+T-1:frontend_caddy-{hash}-on-watch RUNNING
+T-1:frontend_nginx-{hash}-on-watch RUNNING
+T-1:monitor-httpd-{hash}-on-watch RUNNING
+T-1:monitor-httpd-graceful EXITED
+T-1:trafficserver-{hash}-on-watch RUNNING
+T-1:trafficserver-reload EXITED
 watchdog:watchdog RUNNING
diff --git a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_file_list_log-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_file_list_log-CADDY.txt
index b6182d7df3b76ef16489fa615006941f490767bb..6362273fd4403a74b92671f25ab5d3407f00b808 100644
--- a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_file_list_log-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_file_list_log-CADDY.txt
@@ -1,10 +1,10 @@
-TestRe6stVerificationUrlDefaultSlave-0/var/log/monitor-httpd-error.log
-TestRe6stVerificationUrlDefaultSlave-1/var/log/frontend-access.log
-TestRe6stVerificationUrlDefaultSlave-1/var/log/frontend-error.log
-TestRe6stVerificationUrlDefaultSlave-1/var/log/httpd/_default_access_log
-TestRe6stVerificationUrlDefaultSlave-1/var/log/httpd/_default_error_log
-TestRe6stVerificationUrlDefaultSlave-1/var/log/monitor-httpd-error.log
-TestRe6stVerificationUrlDefaultSlave-1/var/log/nginx-access.log
-TestRe6stVerificationUrlDefaultSlave-1/var/log/nginx-error.log
-TestRe6stVerificationUrlDefaultSlave-1/var/log/trafficserver/manager.log
-TestRe6stVerificationUrlDefaultSlave-1/var/log/trafficserver/traffic.out
\ No newline at end of file
+T-0/var/log/monitor-httpd-error.log
+T-1/var/log/frontend-access.log
+T-1/var/log/frontend-error.log
+T-1/var/log/httpd/_default_access_log
+T-1/var/log/httpd/_default_error_log
+T-1/var/log/monitor-httpd-error.log
+T-1/var/log/nginx-access.log
+T-1/var/log/nginx-error.log
+T-1/var/log/trafficserver/manager.log
+T-1/var/log/trafficserver/traffic.out
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_file_list_run-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_file_list_run-CADDY.txt
index e417aeaff3843e64e8562cf63a5d89433a2f3253..1c68573ce5e83743455f6b80fbdafc141dbda22b 100644
--- a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_file_list_run-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_file_list_run-CADDY.txt
@@ -1,12 +1,12 @@
-TestRe6stVerificationUrlDefaultSlave-0/var/run/monitor-httpd.pid
-TestRe6stVerificationUrlDefaultSlave-0/var/run/monitor/monitor-bootstrap.pid
-TestRe6stVerificationUrlDefaultSlave-1/var/run/caddy_graceful_signature
-TestRe6stVerificationUrlDefaultSlave-1/var/run/caddy_validate_signature
-TestRe6stVerificationUrlDefaultSlave-1/var/run/caddy_validate_signature.status
-TestRe6stVerificationUrlDefaultSlave-1/var/run/httpd.pid
-TestRe6stVerificationUrlDefaultSlave-1/var/run/monitor-httpd.pid
-TestRe6stVerificationUrlDefaultSlave-1/var/run/monitor/monitor-bootstrap.pid
-TestRe6stVerificationUrlDefaultSlave-1/var/run/nginx.pid
-TestRe6stVerificationUrlDefaultSlave-1/var/run/nginx_graceful_signature
-TestRe6stVerificationUrlDefaultSlave-1/var/run/nginx_validate_signature
-TestRe6stVerificationUrlDefaultSlave-1/var/run/nginx_validate_signature.status
\ No newline at end of file
+T-0/var/run/monitor-httpd.pid
+T-0/var/run/monitor/monitor-bootstrap.pid
+T-1/var/run/caddy_graceful_signature
+T-1/var/run/caddy_validate_signature
+T-1/var/run/caddy_validate_signature.status
+T-1/var/run/httpd.pid
+T-1/var/run/monitor-httpd.pid
+T-1/var/run/monitor/monitor-bootstrap.pid
+T-1/var/run/nginx.pid
+T-1/var/run/nginx_graceful_signature
+T-1/var/run/nginx_validate_signature
+T-1/var/run/nginx_validate_signature.status
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_promise_run_plugin-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_promise_run_plugin-CADDY.txt
index 90a1f187b81345c0e31d1cfe9bc5e03422f3376f..592142656cb44d90d2a155fba623a6afb9fe76bc 100644
--- a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_promise_run_plugin-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_promise_run_plugin-CADDY.txt
@@ -1,24 +1,24 @@
-TestRe6stVerificationUrlDefaultSlave-0/etc/plugin/buildout-TestRe6stVerificationUrlDefaultSlave-0-status.py: OK
-TestRe6stVerificationUrlDefaultSlave-0/etc/plugin/check-free-disk-space.py: OK
-TestRe6stVerificationUrlDefaultSlave-0/etc/plugin/monitor-bootstrap-status.py: OK
-TestRe6stVerificationUrlDefaultSlave-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-TestRe6stVerificationUrlDefaultSlave-1/etc/plugin/buildout-TestRe6stVerificationUrlDefaultSlave-1-status.py: OK
-TestRe6stVerificationUrlDefaultSlave-1/etc/plugin/caddy_cached.py: ERROR
-TestRe6stVerificationUrlDefaultSlave-1/etc/plugin/caddy_frontend_ipv4_http.py: OK
-TestRe6stVerificationUrlDefaultSlave-1/etc/plugin/caddy_frontend_ipv4_https.py: OK
-TestRe6stVerificationUrlDefaultSlave-1/etc/plugin/caddy_frontend_ipv6_http.py: OK
-TestRe6stVerificationUrlDefaultSlave-1/etc/plugin/caddy_frontend_ipv6_https.py: OK
-TestRe6stVerificationUrlDefaultSlave-1/etc/plugin/caddy_ssl_cached.py: ERROR
-TestRe6stVerificationUrlDefaultSlave-1/etc/plugin/check-_default-error-log-last-day.py: OK
-TestRe6stVerificationUrlDefaultSlave-1/etc/plugin/check-_default-error-log-last-hour.py: OK
-TestRe6stVerificationUrlDefaultSlave-1/etc/plugin/check-free-disk-space.py: OK
-TestRe6stVerificationUrlDefaultSlave-1/etc/plugin/frontend-caddy-configuration-promise.py: OK
-TestRe6stVerificationUrlDefaultSlave-1/etc/plugin/monitor-bootstrap-status.py: OK
-TestRe6stVerificationUrlDefaultSlave-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-TestRe6stVerificationUrlDefaultSlave-1/etc/plugin/nginx-configuration-promise.py: ERROR
-TestRe6stVerificationUrlDefaultSlave-1/etc/plugin/nginx_frontend_ipv4_http.py: OK
-TestRe6stVerificationUrlDefaultSlave-1/etc/plugin/nginx_frontend_ipv4_https.py: OK
-TestRe6stVerificationUrlDefaultSlave-1/etc/plugin/nginx_frontend_ipv6_http.py: OK
-TestRe6stVerificationUrlDefaultSlave-1/etc/plugin/nginx_frontend_ipv6_https.py: OK
-TestRe6stVerificationUrlDefaultSlave-1/etc/plugin/re6st-connectivity.py: OK
-TestRe6stVerificationUrlDefaultSlave-1/etc/plugin/trafficserver-port-listening.py: ERROR
\ No newline at end of file
+T-0/etc/plugin/buildout-T-0-status.py: OK
+T-0/etc/plugin/check-free-disk-space.py: OK
+T-0/etc/plugin/monitor-bootstrap-status.py: OK
+T-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
+T-1/etc/plugin/buildout-T-1-status.py: OK
+T-1/etc/plugin/caddy_cached.py: ERROR
+T-1/etc/plugin/caddy_frontend_ipv4_http.py: OK
+T-1/etc/plugin/caddy_frontend_ipv4_https.py: OK
+T-1/etc/plugin/caddy_frontend_ipv6_http.py: OK
+T-1/etc/plugin/caddy_frontend_ipv6_https.py: OK
+T-1/etc/plugin/caddy_ssl_cached.py: ERROR
+T-1/etc/plugin/check-_default-error-log-last-day.py: OK
+T-1/etc/plugin/check-_default-error-log-last-hour.py: OK
+T-1/etc/plugin/check-free-disk-space.py: OK
+T-1/etc/plugin/frontend-caddy-configuration-promise.py: OK
+T-1/etc/plugin/monitor-bootstrap-status.py: OK
+T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
+T-1/etc/plugin/nginx-configuration-promise.py: ERROR
+T-1/etc/plugin/nginx_frontend_ipv4_http.py: OK
+T-1/etc/plugin/nginx_frontend_ipv4_https.py: OK
+T-1/etc/plugin/nginx_frontend_ipv6_http.py: OK
+T-1/etc/plugin/nginx_frontend_ipv6_https.py: OK
+T-1/etc/plugin/re6st-connectivity.py: OK
+T-1/etc/plugin/trafficserver-port-listening.py: OK
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_promise_run_promise-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_promise_run_promise-CADDY.txt
index 98ef57a6a15ab1c0a3d3d14d3d107cb1dcfd7b90..5105e42af08be204b45dbb4be093052c9805c0f6 100644
--- a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_promise_run_promise-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_promise_run_promise-CADDY.txt
@@ -1,4 +1,4 @@
-TestRe6stVerificationUrlDefaultSlave-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK
-TestRe6stVerificationUrlDefaultSlave-1/etc/promise/caddy-frontend-is-running-actual-software-release: OK
-TestRe6stVerificationUrlDefaultSlave-1/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK
-TestRe6stVerificationUrlDefaultSlave-1/etc/promise/promise-nginx-is-process-older-than-dependency-set: OK
\ No newline at end of file
+T-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK
+T-1/etc/promise/caddy-frontend-is-running-actual-software-release: OK
+T-1/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK
+T-1/etc/promise/promise-nginx-is-process-older-than-dependency-set: OK
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_supervisor_state-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_supervisor_state-CADDY.txt
index 29c9efbade2d5dd13938ecef6bd08305d44ce3e1..0efdb10a5da84b6ae5157ed1172abad2fadc7736 100644
--- a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_supervisor_state-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_supervisor_state-CADDY.txt
@@ -1,24 +1,24 @@
-TestRe6stVerificationUrlDefaultSlave-0:bootstrap-monitor EXITED
-TestRe6stVerificationUrlDefaultSlave-0:certificate_authority-{hash}-on-watch RUNNING
-TestRe6stVerificationUrlDefaultSlave-0:crond-{hash} RUNNING
-TestRe6stVerificationUrlDefaultSlave-0:monitor-httpd-{hash}-on-watch RUNNING
-TestRe6stVerificationUrlDefaultSlave-0:monitor-httpd-graceful EXITED
-TestRe6stVerificationUrlDefaultSlave-1:6tunnel-11080-{hash}-on-watch RUNNING
-TestRe6stVerificationUrlDefaultSlave-1:6tunnel-11443-{hash}-on-watch RUNNING
-TestRe6stVerificationUrlDefaultSlave-1:6tunnel-12080-{hash}-on-watch RUNNING
-TestRe6stVerificationUrlDefaultSlave-1:6tunnel-12443-{hash}-on-watch RUNNING
-TestRe6stVerificationUrlDefaultSlave-1:6tunnel-26011-{hash}-on-watch RUNNING
-TestRe6stVerificationUrlDefaultSlave-1:6tunnel-26012-{hash}-on-watch RUNNING
-TestRe6stVerificationUrlDefaultSlave-1:bootstrap-monitor EXITED
-TestRe6stVerificationUrlDefaultSlave-1:certificate_authority-{hash}-on-watch RUNNING
-TestRe6stVerificationUrlDefaultSlave-1:crond-{hash} RUNNING
-TestRe6stVerificationUrlDefaultSlave-1:crond-on-watch RUNNING
-TestRe6stVerificationUrlDefaultSlave-1:frontend-caddy-safe-graceful EXITED
-TestRe6stVerificationUrlDefaultSlave-1:frontend-nginx-safe-graceful EXITED
-TestRe6stVerificationUrlDefaultSlave-1:frontend_caddy-{hash}-on-watch RUNNING
-TestRe6stVerificationUrlDefaultSlave-1:frontend_nginx-{hash}-on-watch RUNNING
-TestRe6stVerificationUrlDefaultSlave-1:monitor-httpd-{hash}-on-watch RUNNING
-TestRe6stVerificationUrlDefaultSlave-1:monitor-httpd-graceful EXITED
-TestRe6stVerificationUrlDefaultSlave-1:trafficserver-{hash}-on-watch RUNNING
-TestRe6stVerificationUrlDefaultSlave-1:trafficserver-reload EXITED
+T-0:bootstrap-monitor EXITED
+T-0:certificate_authority-{hash}-on-watch RUNNING
+T-0:crond-{hash} RUNNING
+T-0:monitor-httpd-{hash}-on-watch RUNNING
+T-0:monitor-httpd-graceful EXITED
+T-1:6tunnel-11080-{hash}-on-watch RUNNING
+T-1:6tunnel-11443-{hash}-on-watch RUNNING
+T-1:6tunnel-12080-{hash}-on-watch RUNNING
+T-1:6tunnel-12443-{hash}-on-watch RUNNING
+T-1:6tunnel-26011-{hash}-on-watch RUNNING
+T-1:6tunnel-26012-{hash}-on-watch RUNNING
+T-1:bootstrap-monitor EXITED
+T-1:certificate_authority-{hash}-on-watch RUNNING
+T-1:crond-{hash} RUNNING
+T-1:crond-on-watch RUNNING
+T-1:frontend-caddy-safe-graceful EXITED
+T-1:frontend-nginx-safe-graceful EXITED
+T-1:frontend_caddy-{hash}-on-watch RUNNING
+T-1:frontend_nginx-{hash}-on-watch RUNNING
+T-1:monitor-httpd-{hash}-on-watch RUNNING
+T-1:monitor-httpd-graceful EXITED
+T-1:trafficserver-{hash}-on-watch RUNNING
+T-1:trafficserver-reload EXITED
 watchdog:watchdog RUNNING
diff --git a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_file_list_log-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_file_list_log-CADDY.txt
index 29747f416ee9d6e977818d53a06f28f87df18078..6362273fd4403a74b92671f25ab5d3407f00b808 100644
--- a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_file_list_log-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_file_list_log-CADDY.txt
@@ -1,10 +1,10 @@
-TestRe6stVerificationUrlSlave-0/var/log/monitor-httpd-error.log
-TestRe6stVerificationUrlSlave-1/var/log/frontend-access.log
-TestRe6stVerificationUrlSlave-1/var/log/frontend-error.log
-TestRe6stVerificationUrlSlave-1/var/log/httpd/_default_access_log
-TestRe6stVerificationUrlSlave-1/var/log/httpd/_default_error_log
-TestRe6stVerificationUrlSlave-1/var/log/monitor-httpd-error.log
-TestRe6stVerificationUrlSlave-1/var/log/nginx-access.log
-TestRe6stVerificationUrlSlave-1/var/log/nginx-error.log
-TestRe6stVerificationUrlSlave-1/var/log/trafficserver/manager.log
-TestRe6stVerificationUrlSlave-1/var/log/trafficserver/traffic.out
\ No newline at end of file
+T-0/var/log/monitor-httpd-error.log
+T-1/var/log/frontend-access.log
+T-1/var/log/frontend-error.log
+T-1/var/log/httpd/_default_access_log
+T-1/var/log/httpd/_default_error_log
+T-1/var/log/monitor-httpd-error.log
+T-1/var/log/nginx-access.log
+T-1/var/log/nginx-error.log
+T-1/var/log/trafficserver/manager.log
+T-1/var/log/trafficserver/traffic.out
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_file_list_run-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_file_list_run-CADDY.txt
index 80a3dd4359e34599e2b3e494501ad3c24a89db86..f5960954d2c324177faa66bcf00f1e6c21945da1 100644
--- a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_file_list_run-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_file_list_run-CADDY.txt
@@ -1,12 +1,12 @@
-TestRe6stVerificationUrlSlave-0/var/run/monitor-httpd.pid
-TestRe6stVerificationUrlSlave-0/var/run/monitor/monitor-bootstrap.pid
-TestRe6stVerificationUrlSlave-1/var/run/caddy_graceful_signature
-TestRe6stVerificationUrlSlave-1/var/run/caddy_validate_signature
-TestRe6stVerificationUrlSlave-1/var/run/caddy_validate_signature.status
-TestRe6stVerificationUrlSlave-1/var/run/httpd.pid
-TestRe6stVerificationUrlSlave-1/var/run/monitor-httpd.pid
-TestRe6stVerificationUrlSlave-1/var/run/monitor/monitor-bootstrap.pid
-TestRe6stVerificationUrlSlave-1/var/run/nginx.pid
-TestRe6stVerificationUrlSlave-1/var/run/nginx_graceful_signature
-TestRe6stVerificationUrlSlave-1/var/run/nginx_validate_signature
-TestRe6stVerificationUrlSlave-1/var/run/nginx_validate_signature.status
+T-0/var/run/monitor-httpd.pid
+T-0/var/run/monitor/monitor-bootstrap.pid
+T-1/var/run/caddy_graceful_signature
+T-1/var/run/caddy_validate_signature
+T-1/var/run/caddy_validate_signature.status
+T-1/var/run/httpd.pid
+T-1/var/run/monitor-httpd.pid
+T-1/var/run/monitor/monitor-bootstrap.pid
+T-1/var/run/nginx.pid
+T-1/var/run/nginx_graceful_signature
+T-1/var/run/nginx_validate_signature
+T-1/var/run/nginx_validate_signature.status
diff --git a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_promise_run_plugin-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_promise_run_plugin-CADDY.txt
index 0beef11d6307f2e6e53a6a47f4ed6ff0600f51e4..a91286e1c8d9cee1e23da5a7e16c72c2af8f894f 100644
--- a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_promise_run_plugin-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_promise_run_plugin-CADDY.txt
@@ -1,24 +1,24 @@
-TestRe6stVerificationUrlSlave-0/etc/plugin/buildout-TestRe6stVerificationUrlSlave-0-status.py: OK
-TestRe6stVerificationUrlSlave-0/etc/plugin/check-free-disk-space.py: OK
-TestRe6stVerificationUrlSlave-0/etc/plugin/monitor-bootstrap-status.py: OK
-TestRe6stVerificationUrlSlave-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-TestRe6stVerificationUrlSlave-1/etc/plugin/buildout-TestRe6stVerificationUrlSlave-1-status.py: OK
-TestRe6stVerificationUrlSlave-1/etc/plugin/caddy_cached.py: ERROR
-TestRe6stVerificationUrlSlave-1/etc/plugin/caddy_frontend_ipv4_http.py: OK
-TestRe6stVerificationUrlSlave-1/etc/plugin/caddy_frontend_ipv4_https.py: OK
-TestRe6stVerificationUrlSlave-1/etc/plugin/caddy_frontend_ipv6_http.py: OK
-TestRe6stVerificationUrlSlave-1/etc/plugin/caddy_frontend_ipv6_https.py: OK
-TestRe6stVerificationUrlSlave-1/etc/plugin/caddy_ssl_cached.py: ERROR
-TestRe6stVerificationUrlSlave-1/etc/plugin/check-_default-error-log-last-day.py: OK
-TestRe6stVerificationUrlSlave-1/etc/plugin/check-_default-error-log-last-hour.py: OK
-TestRe6stVerificationUrlSlave-1/etc/plugin/check-free-disk-space.py: OK
-TestRe6stVerificationUrlSlave-1/etc/plugin/frontend-caddy-configuration-promise.py: OK
-TestRe6stVerificationUrlSlave-1/etc/plugin/monitor-bootstrap-status.py: OK
-TestRe6stVerificationUrlSlave-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-TestRe6stVerificationUrlSlave-1/etc/plugin/nginx-configuration-promise.py: ERROR
-TestRe6stVerificationUrlSlave-1/etc/plugin/nginx_frontend_ipv4_http.py: OK
-TestRe6stVerificationUrlSlave-1/etc/plugin/nginx_frontend_ipv4_https.py: OK
-TestRe6stVerificationUrlSlave-1/etc/plugin/nginx_frontend_ipv6_http.py: OK
-TestRe6stVerificationUrlSlave-1/etc/plugin/nginx_frontend_ipv6_https.py: OK
-TestRe6stVerificationUrlSlave-1/etc/plugin/re6st-connectivity.py: ERROR
-TestRe6stVerificationUrlSlave-1/etc/plugin/trafficserver-port-listening.py: OK
\ No newline at end of file
+T-0/etc/plugin/buildout-T-0-status.py: OK
+T-0/etc/plugin/check-free-disk-space.py: OK
+T-0/etc/plugin/monitor-bootstrap-status.py: OK
+T-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
+T-1/etc/plugin/buildout-T-1-status.py: OK
+T-1/etc/plugin/caddy_cached.py: ERROR
+T-1/etc/plugin/caddy_frontend_ipv4_http.py: OK
+T-1/etc/plugin/caddy_frontend_ipv4_https.py: OK
+T-1/etc/plugin/caddy_frontend_ipv6_http.py: OK
+T-1/etc/plugin/caddy_frontend_ipv6_https.py: OK
+T-1/etc/plugin/caddy_ssl_cached.py: ERROR
+T-1/etc/plugin/check-_default-error-log-last-day.py: OK
+T-1/etc/plugin/check-_default-error-log-last-hour.py: OK
+T-1/etc/plugin/check-free-disk-space.py: OK
+T-1/etc/plugin/frontend-caddy-configuration-promise.py: OK
+T-1/etc/plugin/monitor-bootstrap-status.py: OK
+T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
+T-1/etc/plugin/nginx-configuration-promise.py: ERROR
+T-1/etc/plugin/nginx_frontend_ipv4_http.py: OK
+T-1/etc/plugin/nginx_frontend_ipv4_https.py: OK
+T-1/etc/plugin/nginx_frontend_ipv6_http.py: OK
+T-1/etc/plugin/nginx_frontend_ipv6_https.py: OK
+T-1/etc/plugin/re6st-connectivity.py: ERROR
+T-1/etc/plugin/trafficserver-port-listening.py: OK
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_promise_run_promise-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_promise_run_promise-CADDY.txt
index 5d0d789b80fde1407857db1cbfe252cc490eb580..5105e42af08be204b45dbb4be093052c9805c0f6 100644
--- a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_promise_run_promise-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_promise_run_promise-CADDY.txt
@@ -1,4 +1,4 @@
-TestRe6stVerificationUrlSlave-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK
-TestRe6stVerificationUrlSlave-1/etc/promise/caddy-frontend-is-running-actual-software-release: OK
-TestRe6stVerificationUrlSlave-1/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK
-TestRe6stVerificationUrlSlave-1/etc/promise/promise-nginx-is-process-older-than-dependency-set: OK
\ No newline at end of file
+T-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK
+T-1/etc/promise/caddy-frontend-is-running-actual-software-release: OK
+T-1/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK
+T-1/etc/promise/promise-nginx-is-process-older-than-dependency-set: OK
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_supervisor_state-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_supervisor_state-CADDY.txt
index 83462b887a2a9c98d806dec449670006bd9a6c43..0efdb10a5da84b6ae5157ed1172abad2fadc7736 100644
--- a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_supervisor_state-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_supervisor_state-CADDY.txt
@@ -1,24 +1,24 @@
-TestRe6stVerificationUrlSlave-0:bootstrap-monitor EXITED
-TestRe6stVerificationUrlSlave-0:certificate_authority-{hash}-on-watch RUNNING
-TestRe6stVerificationUrlSlave-0:crond-{hash} RUNNING
-TestRe6stVerificationUrlSlave-0:monitor-httpd-{hash}-on-watch RUNNING
-TestRe6stVerificationUrlSlave-0:monitor-httpd-graceful EXITED
-TestRe6stVerificationUrlSlave-1:6tunnel-11080-{hash}-on-watch RUNNING
-TestRe6stVerificationUrlSlave-1:6tunnel-11443-{hash}-on-watch RUNNING
-TestRe6stVerificationUrlSlave-1:6tunnel-12080-{hash}-on-watch RUNNING
-TestRe6stVerificationUrlSlave-1:6tunnel-12443-{hash}-on-watch RUNNING
-TestRe6stVerificationUrlSlave-1:6tunnel-26011-{hash}-on-watch RUNNING
-TestRe6stVerificationUrlSlave-1:6tunnel-26012-{hash}-on-watch RUNNING
-TestRe6stVerificationUrlSlave-1:bootstrap-monitor EXITED
-TestRe6stVerificationUrlSlave-1:certificate_authority-{hash}-on-watch RUNNING
-TestRe6stVerificationUrlSlave-1:crond-{hash} RUNNING
-TestRe6stVerificationUrlSlave-1:crond-on-watch RUNNING
-TestRe6stVerificationUrlSlave-1:frontend-caddy-safe-graceful EXITED
-TestRe6stVerificationUrlSlave-1:frontend-nginx-safe-graceful EXITED
-TestRe6stVerificationUrlSlave-1:frontend_caddy-{hash}-on-watch RUNNING
-TestRe6stVerificationUrlSlave-1:frontend_nginx-{hash}-on-watch RUNNING
-TestRe6stVerificationUrlSlave-1:monitor-httpd-{hash}-on-watch RUNNING
-TestRe6stVerificationUrlSlave-1:monitor-httpd-graceful EXITED
-TestRe6stVerificationUrlSlave-1:trafficserver-{hash}-on-watch RUNNING
-TestRe6stVerificationUrlSlave-1:trafficserver-reload EXITED
+T-0:bootstrap-monitor EXITED
+T-0:certificate_authority-{hash}-on-watch RUNNING
+T-0:crond-{hash} RUNNING
+T-0:monitor-httpd-{hash}-on-watch RUNNING
+T-0:monitor-httpd-graceful EXITED
+T-1:6tunnel-11080-{hash}-on-watch RUNNING
+T-1:6tunnel-11443-{hash}-on-watch RUNNING
+T-1:6tunnel-12080-{hash}-on-watch RUNNING
+T-1:6tunnel-12443-{hash}-on-watch RUNNING
+T-1:6tunnel-26011-{hash}-on-watch RUNNING
+T-1:6tunnel-26012-{hash}-on-watch RUNNING
+T-1:bootstrap-monitor EXITED
+T-1:certificate_authority-{hash}-on-watch RUNNING
+T-1:crond-{hash} RUNNING
+T-1:crond-on-watch RUNNING
+T-1:frontend-caddy-safe-graceful EXITED
+T-1:frontend-nginx-safe-graceful EXITED
+T-1:frontend_caddy-{hash}-on-watch RUNNING
+T-1:frontend_nginx-{hash}-on-watch RUNNING
+T-1:monitor-httpd-{hash}-on-watch RUNNING
+T-1:monitor-httpd-graceful EXITED
+T-1:trafficserver-{hash}-on-watch RUNNING
+T-1:trafficserver-reload EXITED
 watchdog:watchdog RUNNING
diff --git a/software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_file_list_log-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_file_list_log-CADDY.txt
index a3f22c4d0e2ff011b5ae3717bbd9570672664420..41cd6f101afa2aa252da94e76b6149cba652bc3d 100644
--- a/software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_file_list_log-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_file_list_log-CADDY.txt
@@ -1,10 +1,10 @@
-TestReplicateSlave-0/var/log/monitor-httpd-error.log
-TestReplicateSlave-1/var/log/frontend-access.log
-TestReplicateSlave-1/var/log/frontend-error.log
-TestReplicateSlave-1/var/log/httpd/_replicate_access_log
-TestReplicateSlave-1/var/log/httpd/_replicate_error_log
-TestReplicateSlave-1/var/log/monitor-httpd-error.log
-TestReplicateSlave-1/var/log/nginx-access.log
-TestReplicateSlave-1/var/log/nginx-error.log
-TestReplicateSlave-1/var/log/trafficserver/manager.log
-TestReplicateSlave-1/var/log/trafficserver/traffic.out
\ No newline at end of file
+T-0/var/log/monitor-httpd-error.log
+T-1/var/log/frontend-access.log
+T-1/var/log/frontend-error.log
+T-1/var/log/httpd/_replicate_access_log
+T-1/var/log/httpd/_replicate_error_log
+T-1/var/log/monitor-httpd-error.log
+T-1/var/log/nginx-access.log
+T-1/var/log/nginx-error.log
+T-1/var/log/trafficserver/manager.log
+T-1/var/log/trafficserver/traffic.out
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_file_list_run-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_file_list_run-CADDY.txt
index d0cfd356a7abd2887c1c3b6de2e4fa1562ed14ca..1c68573ce5e83743455f6b80fbdafc141dbda22b 100644
--- a/software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_file_list_run-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_file_list_run-CADDY.txt
@@ -1,12 +1,12 @@
-TestReplicateSlave-0/var/run/monitor-httpd.pid
-TestReplicateSlave-0/var/run/monitor/monitor-bootstrap.pid
-TestReplicateSlave-1/var/run/caddy_graceful_signature
-TestReplicateSlave-1/var/run/caddy_validate_signature
-TestReplicateSlave-1/var/run/caddy_validate_signature.status
-TestReplicateSlave-1/var/run/httpd.pid
-TestReplicateSlave-1/var/run/monitor-httpd.pid
-TestReplicateSlave-1/var/run/monitor/monitor-bootstrap.pid
-TestReplicateSlave-1/var/run/nginx.pid
-TestReplicateSlave-1/var/run/nginx_graceful_signature
-TestReplicateSlave-1/var/run/nginx_validate_signature
-TestReplicateSlave-1/var/run/nginx_validate_signature.status
\ No newline at end of file
+T-0/var/run/monitor-httpd.pid
+T-0/var/run/monitor/monitor-bootstrap.pid
+T-1/var/run/caddy_graceful_signature
+T-1/var/run/caddy_validate_signature
+T-1/var/run/caddy_validate_signature.status
+T-1/var/run/httpd.pid
+T-1/var/run/monitor-httpd.pid
+T-1/var/run/monitor/monitor-bootstrap.pid
+T-1/var/run/nginx.pid
+T-1/var/run/nginx_graceful_signature
+T-1/var/run/nginx_validate_signature
+T-1/var/run/nginx_validate_signature.status
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_promise_run_plugin-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_promise_run_plugin-CADDY.txt
index 24f5a9fba1f526df3b0bbcf81fefa9ca39a062c1..ec47f3e38efbbb42ab8e091160ddd2615435426f 100644
--- a/software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_promise_run_plugin-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_promise_run_plugin-CADDY.txt
@@ -1,44 +1,44 @@
-TestReplicateSlave-0/etc/plugin/buildout-TestReplicateSlave-0-status.py: OK
-TestReplicateSlave-0/etc/plugin/check-free-disk-space.py: OK
-TestReplicateSlave-0/etc/plugin/monitor-bootstrap-status.py: OK
-TestReplicateSlave-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-TestReplicateSlave-1/etc/plugin/buildout-TestReplicateSlave-1-status.py: OK
-TestReplicateSlave-1/etc/plugin/caddy_cached.py: ERROR
-TestReplicateSlave-1/etc/plugin/caddy_frontend_ipv4_http.py: OK
-TestReplicateSlave-1/etc/plugin/caddy_frontend_ipv4_https.py: OK
-TestReplicateSlave-1/etc/plugin/caddy_frontend_ipv6_http.py: OK
-TestReplicateSlave-1/etc/plugin/caddy_frontend_ipv6_https.py: OK
-TestReplicateSlave-1/etc/plugin/caddy_ssl_cached.py: ERROR
-TestReplicateSlave-1/etc/plugin/check-_replicate-error-log-last-day.py: OK
-TestReplicateSlave-1/etc/plugin/check-_replicate-error-log-last-hour.py: OK
-TestReplicateSlave-1/etc/plugin/check-free-disk-space.py: OK
-TestReplicateSlave-1/etc/plugin/frontend-caddy-configuration-promise.py: OK
-TestReplicateSlave-1/etc/plugin/monitor-bootstrap-status.py: OK
-TestReplicateSlave-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-TestReplicateSlave-1/etc/plugin/nginx-configuration-promise.py: OK
-TestReplicateSlave-1/etc/plugin/nginx_frontend_ipv4_http.py: OK
-TestReplicateSlave-1/etc/plugin/nginx_frontend_ipv4_https.py: OK
-TestReplicateSlave-1/etc/plugin/nginx_frontend_ipv6_http.py: OK
-TestReplicateSlave-1/etc/plugin/nginx_frontend_ipv6_https.py: OK
-TestReplicateSlave-1/etc/plugin/re6st-connectivity.py: OK
-TestReplicateSlave-1/etc/plugin/trafficserver-port-listening.py: ERROR
-TestReplicateSlave-2/etc/plugin/buildout-TestReplicateSlave-2-status.py: OK
-TestReplicateSlave-2/etc/plugin/caddy_cached.py: ERROR
-TestReplicateSlave-2/etc/plugin/caddy_frontend_ipv4_http.py: OK
-TestReplicateSlave-2/etc/plugin/caddy_frontend_ipv4_https.py: OK
-TestReplicateSlave-2/etc/plugin/caddy_frontend_ipv6_http.py: OK
-TestReplicateSlave-2/etc/plugin/caddy_frontend_ipv6_https.py: OK
-TestReplicateSlave-2/etc/plugin/caddy_ssl_cached.py: ERROR
-TestReplicateSlave-2/etc/plugin/check-_replicate-error-log-last-day.py: OK
-TestReplicateSlave-2/etc/plugin/check-_replicate-error-log-last-hour.py: OK
-TestReplicateSlave-2/etc/plugin/check-free-disk-space.py: OK
-TestReplicateSlave-2/etc/plugin/frontend-caddy-configuration-promise.py: OK
-TestReplicateSlave-2/etc/plugin/monitor-bootstrap-status.py: OK
-TestReplicateSlave-2/etc/plugin/monitor-httpd-listening-on-tcp.py: ERROR
-TestReplicateSlave-2/etc/plugin/nginx-configuration-promise.py: OK
-TestReplicateSlave-2/etc/plugin/nginx_frontend_ipv4_http.py: OK
-TestReplicateSlave-2/etc/plugin/nginx_frontend_ipv4_https.py: OK
-TestReplicateSlave-2/etc/plugin/nginx_frontend_ipv6_http.py: OK
-TestReplicateSlave-2/etc/plugin/nginx_frontend_ipv6_https.py: OK
-TestReplicateSlave-2/etc/plugin/re6st-connectivity.py: OK
-TestReplicateSlave-2/etc/plugin/trafficserver-port-listening.py: ERROR
\ No newline at end of file
+T-0/etc/plugin/buildout-T-0-status.py: OK
+T-0/etc/plugin/check-free-disk-space.py: OK
+T-0/etc/plugin/monitor-bootstrap-status.py: OK
+T-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
+T-1/etc/plugin/buildout-T-1-status.py: OK
+T-1/etc/plugin/caddy_cached.py: ERROR
+T-1/etc/plugin/caddy_frontend_ipv4_http.py: OK
+T-1/etc/plugin/caddy_frontend_ipv4_https.py: OK
+T-1/etc/plugin/caddy_frontend_ipv6_http.py: OK
+T-1/etc/plugin/caddy_frontend_ipv6_https.py: OK
+T-1/etc/plugin/caddy_ssl_cached.py: ERROR
+T-1/etc/plugin/check-_replicate-error-log-last-day.py: OK
+T-1/etc/plugin/check-_replicate-error-log-last-hour.py: OK
+T-1/etc/plugin/check-free-disk-space.py: OK
+T-1/etc/plugin/frontend-caddy-configuration-promise.py: OK
+T-1/etc/plugin/monitor-bootstrap-status.py: OK
+T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
+T-1/etc/plugin/nginx-configuration-promise.py: OK
+T-1/etc/plugin/nginx_frontend_ipv4_http.py: OK
+T-1/etc/plugin/nginx_frontend_ipv4_https.py: OK
+T-1/etc/plugin/nginx_frontend_ipv6_http.py: OK
+T-1/etc/plugin/nginx_frontend_ipv6_https.py: OK
+T-1/etc/plugin/re6st-connectivity.py: OK
+T-1/etc/plugin/trafficserver-port-listening.py: OK
+T-2/etc/plugin/buildout-T-2-status.py: OK
+T-2/etc/plugin/caddy_cached.py: ERROR
+T-2/etc/plugin/caddy_frontend_ipv4_http.py: OK
+T-2/etc/plugin/caddy_frontend_ipv4_https.py: OK
+T-2/etc/plugin/caddy_frontend_ipv6_http.py: OK
+T-2/etc/plugin/caddy_frontend_ipv6_https.py: OK
+T-2/etc/plugin/caddy_ssl_cached.py: ERROR
+T-2/etc/plugin/check-_replicate-error-log-last-day.py: OK
+T-2/etc/plugin/check-_replicate-error-log-last-hour.py: OK
+T-2/etc/plugin/check-free-disk-space.py: OK
+T-2/etc/plugin/frontend-caddy-configuration-promise.py: OK
+T-2/etc/plugin/monitor-bootstrap-status.py: OK
+T-2/etc/plugin/monitor-httpd-listening-on-tcp.py: ERROR
+T-2/etc/plugin/nginx-configuration-promise.py: OK
+T-2/etc/plugin/nginx_frontend_ipv4_http.py: OK
+T-2/etc/plugin/nginx_frontend_ipv4_https.py: OK
+T-2/etc/plugin/nginx_frontend_ipv6_http.py: OK
+T-2/etc/plugin/nginx_frontend_ipv6_https.py: OK
+T-2/etc/plugin/re6st-connectivity.py: OK
+T-2/etc/plugin/trafficserver-port-listening.py: OK
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_promise_run_promise-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_promise_run_promise-CADDY.txt
index 92c6a15e4aabf1f75f4498fc92856a6b89a84337..178a571eb5fcb3a278bb88eea4835ab962024197 100644
--- a/software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_promise_run_promise-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_promise_run_promise-CADDY.txt
@@ -1,7 +1,7 @@
-TestReplicateSlave-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK
-TestReplicateSlave-1/etc/promise/caddy-frontend-is-running-actual-software-release: OK
-TestReplicateSlave-1/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK
-TestReplicateSlave-1/etc/promise/promise-nginx-is-process-older-than-dependency-set: OK
-TestReplicateSlave-2/etc/promise/caddy-frontend-is-running-actual-software-release: OK
-TestReplicateSlave-2/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK
-TestReplicateSlave-2/etc/promise/promise-nginx-is-process-older-than-dependency-set: OK
\ No newline at end of file
+T-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK
+T-1/etc/promise/caddy-frontend-is-running-actual-software-release: OK
+T-1/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK
+T-1/etc/promise/promise-nginx-is-process-older-than-dependency-set: OK
+T-2/etc/promise/caddy-frontend-is-running-actual-software-release: OK
+T-2/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK
+T-2/etc/promise/promise-nginx-is-process-older-than-dependency-set: OK
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_supervisor_state-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_supervisor_state-CADDY.txt
index d33f5297e4a1408e771ecd016316d95f583f2304..805d065f1ae5912b40fed45512ebd225a2222ef0 100644
--- a/software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_supervisor_state-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_supervisor_state-CADDY.txt
@@ -1,42 +1,42 @@
-TestReplicateSlave-0:bootstrap-monitor EXITED
-TestReplicateSlave-0:certificate_authority-{hash}-on-watch RUNNING
-TestReplicateSlave-0:crond-{hash} RUNNING
-TestReplicateSlave-0:monitor-httpd-{hash}-on-watch RUNNING
-TestReplicateSlave-0:monitor-httpd-graceful EXITED
-TestReplicateSlave-1:6tunnel-11080-{hash}-on-watch RUNNING
-TestReplicateSlave-1:6tunnel-11443-{hash}-on-watch RUNNING
-TestReplicateSlave-1:6tunnel-12080-{hash}-on-watch RUNNING
-TestReplicateSlave-1:6tunnel-12443-{hash}-on-watch RUNNING
-TestReplicateSlave-1:6tunnel-26011-{hash}-on-watch RUNNING
-TestReplicateSlave-1:6tunnel-26012-{hash}-on-watch RUNNING
-TestReplicateSlave-1:bootstrap-monitor EXITED
-TestReplicateSlave-1:certificate_authority-{hash}-on-watch RUNNING
-TestReplicateSlave-1:crond-{hash} RUNNING
-TestReplicateSlave-1:crond-on-watch RUNNING
-TestReplicateSlave-1:frontend-caddy-safe-graceful EXITED
-TestReplicateSlave-1:frontend-nginx-safe-graceful EXITED
-TestReplicateSlave-1:frontend_caddy-{hash}-on-watch RUNNING
-TestReplicateSlave-1:frontend_nginx-{hash}-on-watch RUNNING
-TestReplicateSlave-1:monitor-httpd-{hash}-on-watch RUNNING
-TestReplicateSlave-1:monitor-httpd-graceful EXITED
-TestReplicateSlave-1:trafficserver-{hash}-on-watch RUNNING
-TestReplicateSlave-1:trafficserver-reload EXITED
-TestReplicateSlave-2:6tunnel-11080-{hash}-on-watch STOPPED
-TestReplicateSlave-2:6tunnel-11443-{hash}-on-watch STOPPED
-TestReplicateSlave-2:6tunnel-12080-{hash}-on-watch STOPPED
-TestReplicateSlave-2:6tunnel-12443-{hash}-on-watch STOPPED
-TestReplicateSlave-2:6tunnel-26011-{hash}-on-watch STOPPED
-TestReplicateSlave-2:6tunnel-26012-{hash}-on-watch STOPPED
-TestReplicateSlave-2:bootstrap-monitor STOPPED
-TestReplicateSlave-2:certificate_authority-{hash}-on-watch STOPPED
-TestReplicateSlave-2:crond-{hash} STOPPED
-TestReplicateSlave-2:crond-on-watch STOPPED
-TestReplicateSlave-2:frontend-caddy-safe-graceful STOPPED
-TestReplicateSlave-2:frontend-nginx-safe-graceful STOPPED
-TestReplicateSlave-2:frontend_caddy-{hash}-on-watch STOPPED
-TestReplicateSlave-2:frontend_nginx-{hash}-on-watch STOPPED
-TestReplicateSlave-2:monitor-httpd-{hash}-on-watch STOPPED
-TestReplicateSlave-2:monitor-httpd-graceful STOPPED
-TestReplicateSlave-2:trafficserver-{hash}-on-watch STOPPED
-TestReplicateSlave-2:trafficserver-reload STOPPED
+T-0:bootstrap-monitor EXITED
+T-0:certificate_authority-{hash}-on-watch RUNNING
+T-0:crond-{hash} RUNNING
+T-0:monitor-httpd-{hash}-on-watch RUNNING
+T-0:monitor-httpd-graceful EXITED
+T-1:6tunnel-11080-{hash}-on-watch RUNNING
+T-1:6tunnel-11443-{hash}-on-watch RUNNING
+T-1:6tunnel-12080-{hash}-on-watch RUNNING
+T-1:6tunnel-12443-{hash}-on-watch RUNNING
+T-1:6tunnel-26011-{hash}-on-watch RUNNING
+T-1:6tunnel-26012-{hash}-on-watch RUNNING
+T-1:bootstrap-monitor EXITED
+T-1:certificate_authority-{hash}-on-watch RUNNING
+T-1:crond-{hash} RUNNING
+T-1:crond-on-watch RUNNING
+T-1:frontend-caddy-safe-graceful EXITED
+T-1:frontend-nginx-safe-graceful EXITED
+T-1:frontend_caddy-{hash}-on-watch RUNNING
+T-1:frontend_nginx-{hash}-on-watch RUNNING
+T-1:monitor-httpd-{hash}-on-watch RUNNING
+T-1:monitor-httpd-graceful EXITED
+T-1:trafficserver-{hash}-on-watch RUNNING
+T-1:trafficserver-reload EXITED
+T-2:6tunnel-11080-{hash}-on-watch STOPPED
+T-2:6tunnel-11443-{hash}-on-watch STOPPED
+T-2:6tunnel-12080-{hash}-on-watch STOPPED
+T-2:6tunnel-12443-{hash}-on-watch STOPPED
+T-2:6tunnel-26011-{hash}-on-watch STOPPED
+T-2:6tunnel-26012-{hash}-on-watch STOPPED
+T-2:bootstrap-monitor STOPPED
+T-2:certificate_authority-{hash}-on-watch STOPPED
+T-2:crond-{hash} STOPPED
+T-2:crond-on-watch STOPPED
+T-2:frontend-caddy-safe-graceful STOPPED
+T-2:frontend-nginx-safe-graceful STOPPED
+T-2:frontend_caddy-{hash}-on-watch STOPPED
+T-2:frontend_nginx-{hash}-on-watch STOPPED
+T-2:monitor-httpd-{hash}-on-watch STOPPED
+T-2:monitor-httpd-graceful STOPPED
+T-2:trafficserver-{hash}-on-watch STOPPED
+T-2:trafficserver-reload STOPPED
 watchdog:watchdog RUNNING
diff --git a/software/caddy-frontend/test/test_data/test.TestSlave.test_file_list_log-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlave.test_file_list_log-CADDY.txt
index 33a77822caba85bee8bbdb9a06bfecdb9b72f130..d7d7cfdf8a379fdd0b22bc81cb489bffdccb5d72 100644
--- a/software/caddy-frontend/test/test_data/test.TestSlave.test_file_list_log-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestSlave.test_file_list_log-CADDY.txt
@@ -1,94 +1,94 @@
-TestSlave-0/var/log/monitor-httpd-error.log
-TestSlave-1/var/log/frontend-access.log
-TestSlave-1/var/log/frontend-error.log
-TestSlave-1/var/log/httpd/_apache_custom_http_s-accepted_access_log
-TestSlave-1/var/log/httpd/_apache_custom_http_s-accepted_error_log
-TestSlave-1/var/log/httpd/_caddy_custom_http_s-accepted_access_log
-TestSlave-1/var/log/httpd/_caddy_custom_http_s-accepted_error_log
-TestSlave-1/var/log/httpd/_custom_domain_access_log
-TestSlave-1/var/log/httpd/_custom_domain_error_log
-TestSlave-1/var/log/httpd/_custom_domain_ssl_crt_ssl_key_access_log
-TestSlave-1/var/log/httpd/_custom_domain_ssl_crt_ssl_key_error_log
-TestSlave-1/var/log/httpd/_custom_domain_ssl_crt_ssl_key_ssl_ca_crt_access_log
-TestSlave-1/var/log/httpd/_custom_domain_ssl_crt_ssl_key_ssl_ca_crt_error_log
-TestSlave-1/var/log/httpd/_custom_domain_wildcard_access_log
-TestSlave-1/var/log/httpd/_custom_domain_wildcard_error_log
-TestSlave-1/var/log/httpd/_disabled-cookie-list_access_log
-TestSlave-1/var/log/httpd/_disabled-cookie-list_error_log
-TestSlave-1/var/log/httpd/_empty_access_log
-TestSlave-1/var/log/httpd/_empty_error_log
-TestSlave-1/var/log/httpd/_enable-http2-default_access_log
-TestSlave-1/var/log/httpd/_enable-http2-default_error_log
-TestSlave-1/var/log/httpd/_enable-http2-false_access_log
-TestSlave-1/var/log/httpd/_enable-http2-false_error_log
-TestSlave-1/var/log/httpd/_enable_cache-disable-no-cache-request_access_log
-TestSlave-1/var/log/httpd/_enable_cache-disable-no-cache-request_error_log
-TestSlave-1/var/log/httpd/_enable_cache-disable-via-header_access_log
-TestSlave-1/var/log/httpd/_enable_cache-disable-via-header_error_log
-TestSlave-1/var/log/httpd/_enable_cache-ssl-proxy-verify-unverified_access_log
-TestSlave-1/var/log/httpd/_enable_cache-ssl-proxy-verify-unverified_error_log
-TestSlave-1/var/log/httpd/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified_access_log
-TestSlave-1/var/log/httpd/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified_error_log
-TestSlave-1/var/log/httpd/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt_access_log
-TestSlave-1/var/log/httpd/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt_error_log
-TestSlave-1/var/log/httpd/_enable_cache_access_log
-TestSlave-1/var/log/httpd/_enable_cache_error_log
-TestSlave-1/var/log/httpd/_https-only_access_log
-TestSlave-1/var/log/httpd/_https-only_error_log
-TestSlave-1/var/log/httpd/_monitor-ipv4-test_access_log
-TestSlave-1/var/log/httpd/_monitor-ipv4-test_error_log
-TestSlave-1/var/log/httpd/_monitor-ipv6-test_access_log
-TestSlave-1/var/log/httpd/_monitor-ipv6-test_error_log
-TestSlave-1/var/log/httpd/_prefer-gzip-encoding-to-backend_access_log
-TestSlave-1/var/log/httpd/_prefer-gzip-encoding-to-backend_error_log
-TestSlave-1/var/log/httpd/_re6st-optimal-test_access_log
-TestSlave-1/var/log/httpd/_re6st-optimal-test_error_log
-TestSlave-1/var/log/httpd/_server-alias-duplicated_access_log
-TestSlave-1/var/log/httpd/_server-alias-duplicated_error_log
-TestSlave-1/var/log/httpd/_server-alias-wildcard_access_log
-TestSlave-1/var/log/httpd/_server-alias-wildcard_error_log
-TestSlave-1/var/log/httpd/_server-alias_access_log
-TestSlave-1/var/log/httpd/_server-alias_custom_domain-duplicated_access_log
-TestSlave-1/var/log/httpd/_server-alias_custom_domain-duplicated_error_log
-TestSlave-1/var/log/httpd/_server-alias_error_log
-TestSlave-1/var/log/httpd/_ssl-proxy-verify-unverified_access_log
-TestSlave-1/var/log/httpd/_ssl-proxy-verify-unverified_error_log
-TestSlave-1/var/log/httpd/_ssl-proxy-verify_ssl_proxy_ca_crt-unverified_access_log
-TestSlave-1/var/log/httpd/_ssl-proxy-verify_ssl_proxy_ca_crt-unverified_error_log
-TestSlave-1/var/log/httpd/_ssl-proxy-verify_ssl_proxy_ca_crt_access_log
-TestSlave-1/var/log/httpd/_ssl-proxy-verify_ssl_proxy_ca_crt_error_log
-TestSlave-1/var/log/httpd/_ssl_ca_crt_does_not_match_access_log
-TestSlave-1/var/log/httpd/_ssl_ca_crt_does_not_match_error_log
-TestSlave-1/var/log/httpd/_ssl_ca_crt_garbage_access_log
-TestSlave-1/var/log/httpd/_ssl_ca_crt_garbage_error_log
-TestSlave-1/var/log/httpd/_type-notebook_access_log
-TestSlave-1/var/log/httpd/_type-notebook_error_log
-TestSlave-1/var/log/httpd/_type-redirect_access_log
-TestSlave-1/var/log/httpd/_type-redirect_error_log
-TestSlave-1/var/log/httpd/_type-zope-default-path_access_log
-TestSlave-1/var/log/httpd/_type-zope-default-path_error_log
-TestSlave-1/var/log/httpd/_type-zope-path_access_log
-TestSlave-1/var/log/httpd/_type-zope-path_error_log
-TestSlave-1/var/log/httpd/_type-zope-prefer-gzip-encoding-to-backend_access_log
-TestSlave-1/var/log/httpd/_type-zope-prefer-gzip-encoding-to-backend_error_log
-TestSlave-1/var/log/httpd/_type-zope-ssl-proxy-verify-unverified_access_log
-TestSlave-1/var/log/httpd/_type-zope-ssl-proxy-verify-unverified_error_log
-TestSlave-1/var/log/httpd/_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-unverified_access_log
-TestSlave-1/var/log/httpd/_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-unverified_error_log
-TestSlave-1/var/log/httpd/_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt_access_log
-TestSlave-1/var/log/httpd/_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt_error_log
-TestSlave-1/var/log/httpd/_type-zope-virtualhostroot-http-port_access_log
-TestSlave-1/var/log/httpd/_type-zope-virtualhostroot-http-port_error_log
-TestSlave-1/var/log/httpd/_type-zope-virtualhostroot-https-port_access_log
-TestSlave-1/var/log/httpd/_type-zope-virtualhostroot-https-port_error_log
-TestSlave-1/var/log/httpd/_type-zope_access_log
-TestSlave-1/var/log/httpd/_type-zope_error_log
-TestSlave-1/var/log/httpd/_url_access_log
-TestSlave-1/var/log/httpd/_url_error_log
-TestSlave-1/var/log/httpd/_url_https-url_access_log
-TestSlave-1/var/log/httpd/_url_https-url_error_log
-TestSlave-1/var/log/monitor-httpd-error.log
-TestSlave-1/var/log/nginx-access.log
-TestSlave-1/var/log/nginx-error.log
-TestSlave-1/var/log/trafficserver/manager.log
-TestSlave-1/var/log/trafficserver/traffic.out
\ No newline at end of file
+T-0/var/log/monitor-httpd-error.log
+T-1/var/log/frontend-access.log
+T-1/var/log/frontend-error.log
+T-1/var/log/httpd/_Url_access_log
+T-1/var/log/httpd/_Url_error_log
+T-1/var/log/httpd/_apache_custom_http_s-accepted_access_log
+T-1/var/log/httpd/_apache_custom_http_s-accepted_error_log
+T-1/var/log/httpd/_caddy_custom_http_s-accepted_access_log
+T-1/var/log/httpd/_caddy_custom_http_s-accepted_error_log
+T-1/var/log/httpd/_custom_domain_access_log
+T-1/var/log/httpd/_custom_domain_error_log
+T-1/var/log/httpd/_custom_domain_ssl_crt_ssl_key_access_log
+T-1/var/log/httpd/_custom_domain_ssl_crt_ssl_key_error_log
+T-1/var/log/httpd/_custom_domain_ssl_crt_ssl_key_ssl_ca_crt_access_log
+T-1/var/log/httpd/_custom_domain_ssl_crt_ssl_key_ssl_ca_crt_error_log
+T-1/var/log/httpd/_custom_domain_wildcard_access_log
+T-1/var/log/httpd/_custom_domain_wildcard_error_log
+T-1/var/log/httpd/_disabled-cookie-list_access_log
+T-1/var/log/httpd/_disabled-cookie-list_error_log
+T-1/var/log/httpd/_empty_access_log
+T-1/var/log/httpd/_empty_error_log
+T-1/var/log/httpd/_enable-http2-default_access_log
+T-1/var/log/httpd/_enable-http2-default_error_log
+T-1/var/log/httpd/_enable-http2-false_access_log
+T-1/var/log/httpd/_enable-http2-false_error_log
+T-1/var/log/httpd/_enable_cache-disable-no-cache-request_access_log
+T-1/var/log/httpd/_enable_cache-disable-no-cache-request_error_log
+T-1/var/log/httpd/_enable_cache-disable-via-header_access_log
+T-1/var/log/httpd/_enable_cache-disable-via-header_error_log
+T-1/var/log/httpd/_enable_cache-ssl-proxy-verify-unverified_access_log
+T-1/var/log/httpd/_enable_cache-ssl-proxy-verify-unverified_error_log
+T-1/var/log/httpd/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified_access_log
+T-1/var/log/httpd/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified_error_log
+T-1/var/log/httpd/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt_access_log
+T-1/var/log/httpd/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt_error_log
+T-1/var/log/httpd/_enable_cache_access_log
+T-1/var/log/httpd/_enable_cache_error_log
+T-1/var/log/httpd/_https-only_access_log
+T-1/var/log/httpd/_https-only_error_log
+T-1/var/log/httpd/_monitor-ipv4-test_access_log
+T-1/var/log/httpd/_monitor-ipv4-test_error_log
+T-1/var/log/httpd/_monitor-ipv6-test_access_log
+T-1/var/log/httpd/_monitor-ipv6-test_error_log
+T-1/var/log/httpd/_prefer-gzip-encoding-to-backend_access_log
+T-1/var/log/httpd/_prefer-gzip-encoding-to-backend_error_log
+T-1/var/log/httpd/_re6st-optimal-test_access_log
+T-1/var/log/httpd/_re6st-optimal-test_error_log
+T-1/var/log/httpd/_server-alias-duplicated_access_log
+T-1/var/log/httpd/_server-alias-duplicated_error_log
+T-1/var/log/httpd/_server-alias-wildcard_access_log
+T-1/var/log/httpd/_server-alias-wildcard_error_log
+T-1/var/log/httpd/_server-alias_access_log
+T-1/var/log/httpd/_server-alias_custom_domain-duplicated_access_log
+T-1/var/log/httpd/_server-alias_custom_domain-duplicated_error_log
+T-1/var/log/httpd/_server-alias_error_log
+T-1/var/log/httpd/_ssl-proxy-verify-unverified_access_log
+T-1/var/log/httpd/_ssl-proxy-verify-unverified_error_log
+T-1/var/log/httpd/_ssl-proxy-verify_ssl_proxy_ca_crt-unverified_access_log
+T-1/var/log/httpd/_ssl-proxy-verify_ssl_proxy_ca_crt-unverified_error_log
+T-1/var/log/httpd/_ssl-proxy-verify_ssl_proxy_ca_crt_access_log
+T-1/var/log/httpd/_ssl-proxy-verify_ssl_proxy_ca_crt_error_log
+T-1/var/log/httpd/_ssl_ca_crt_does_not_match_access_log
+T-1/var/log/httpd/_ssl_ca_crt_does_not_match_error_log
+T-1/var/log/httpd/_ssl_ca_crt_garbage_access_log
+T-1/var/log/httpd/_ssl_ca_crt_garbage_error_log
+T-1/var/log/httpd/_type-notebook_access_log
+T-1/var/log/httpd/_type-notebook_error_log
+T-1/var/log/httpd/_type-redirect_access_log
+T-1/var/log/httpd/_type-redirect_error_log
+T-1/var/log/httpd/_type-zope-default-path_access_log
+T-1/var/log/httpd/_type-zope-default-path_error_log
+T-1/var/log/httpd/_type-zope-path_access_log
+T-1/var/log/httpd/_type-zope-path_error_log
+T-1/var/log/httpd/_type-zope-prefer-gzip-encoding-to-backend_access_log
+T-1/var/log/httpd/_type-zope-prefer-gzip-encoding-to-backend_error_log
+T-1/var/log/httpd/_type-zope-ssl-proxy-verify-unverified_access_log
+T-1/var/log/httpd/_type-zope-ssl-proxy-verify-unverified_error_log
+T-1/var/log/httpd/_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-unverified_access_log
+T-1/var/log/httpd/_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-unverified_error_log
+T-1/var/log/httpd/_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt_access_log
+T-1/var/log/httpd/_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt_error_log
+T-1/var/log/httpd/_type-zope-virtualhostroot-http-port_access_log
+T-1/var/log/httpd/_type-zope-virtualhostroot-http-port_error_log
+T-1/var/log/httpd/_type-zope-virtualhostroot-https-port_access_log
+T-1/var/log/httpd/_type-zope-virtualhostroot-https-port_error_log
+T-1/var/log/httpd/_type-zope_access_log
+T-1/var/log/httpd/_type-zope_error_log
+T-1/var/log/httpd/_url_https-url_access_log
+T-1/var/log/httpd/_url_https-url_error_log
+T-1/var/log/monitor-httpd-error.log
+T-1/var/log/nginx-access.log
+T-1/var/log/nginx-error.log
+T-1/var/log/trafficserver/manager.log
+T-1/var/log/trafficserver/traffic.out
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestSlave.test_file_list_run-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlave.test_file_list_run-CADDY.txt
index f8cd356471a459aa71ae756ad3852d779607a2cd..1c68573ce5e83743455f6b80fbdafc141dbda22b 100644
--- a/software/caddy-frontend/test/test_data/test.TestSlave.test_file_list_run-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestSlave.test_file_list_run-CADDY.txt
@@ -1,12 +1,12 @@
-TestSlave-0/var/run/monitor-httpd.pid
-TestSlave-0/var/run/monitor/monitor-bootstrap.pid
-TestSlave-1/var/run/caddy_graceful_signature
-TestSlave-1/var/run/caddy_validate_signature
-TestSlave-1/var/run/caddy_validate_signature.status
-TestSlave-1/var/run/httpd.pid
-TestSlave-1/var/run/monitor-httpd.pid
-TestSlave-1/var/run/monitor/monitor-bootstrap.pid
-TestSlave-1/var/run/nginx.pid
-TestSlave-1/var/run/nginx_graceful_signature
-TestSlave-1/var/run/nginx_validate_signature
-TestSlave-1/var/run/nginx_validate_signature.status
\ No newline at end of file
+T-0/var/run/monitor-httpd.pid
+T-0/var/run/monitor/monitor-bootstrap.pid
+T-1/var/run/caddy_graceful_signature
+T-1/var/run/caddy_validate_signature
+T-1/var/run/caddy_validate_signature.status
+T-1/var/run/httpd.pid
+T-1/var/run/monitor-httpd.pid
+T-1/var/run/monitor/monitor-bootstrap.pid
+T-1/var/run/nginx.pid
+T-1/var/run/nginx_graceful_signature
+T-1/var/run/nginx_validate_signature
+T-1/var/run/nginx_validate_signature.status
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestSlave.test_promise_run_plugin-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlave.test_promise_run_plugin-CADDY.txt
index db4297a80a76c9e9265423f118a26d256e7e6252..ce7700d14001801ddd63f95072ebac96f441f20c 100644
--- a/software/caddy-frontend/test/test_data/test.TestSlave.test_promise_run_plugin-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestSlave.test_promise_run_plugin-CADDY.txt
@@ -1,113 +1,113 @@
-TestSlave-0/etc/plugin/buildout-TestSlave-0-status.py: OK
-TestSlave-0/etc/plugin/check-free-disk-space.py: OK
-TestSlave-0/etc/plugin/monitor-bootstrap-status.py: OK
-TestSlave-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-TestSlave-1/etc/plugin/buildout-TestSlave-1-status.py: OK
-TestSlave-1/etc/plugin/caddy_cached.py: OK
-TestSlave-1/etc/plugin/caddy_frontend_ipv4_http.py: OK
-TestSlave-1/etc/plugin/caddy_frontend_ipv4_https.py: OK
-TestSlave-1/etc/plugin/caddy_frontend_ipv6_http.py: OK
-TestSlave-1/etc/plugin/caddy_frontend_ipv6_https.py: OK
-TestSlave-1/etc/plugin/caddy_ssl_cached.py: OK
-TestSlave-1/etc/plugin/check-_apache_custom_http_s-accepted-error-log-last-day.py: OK
-TestSlave-1/etc/plugin/check-_apache_custom_http_s-accepted-error-log-last-hour.py: OK
-TestSlave-1/etc/plugin/check-_caddy_custom_http_s-accepted-error-log-last-day.py: OK
-TestSlave-1/etc/plugin/check-_caddy_custom_http_s-accepted-error-log-last-hour.py: OK
-TestSlave-1/etc/plugin/check-_custom_domain-error-log-last-day.py: OK
-TestSlave-1/etc/plugin/check-_custom_domain-error-log-last-hour.py: OK
-TestSlave-1/etc/plugin/check-_custom_domain_ssl_crt_ssl_key-error-log-last-day.py: OK
-TestSlave-1/etc/plugin/check-_custom_domain_ssl_crt_ssl_key-error-log-last-hour.py: OK
-TestSlave-1/etc/plugin/check-_custom_domain_ssl_crt_ssl_key_ssl_ca_crt-error-log-last-day.py: OK
-TestSlave-1/etc/plugin/check-_custom_domain_ssl_crt_ssl_key_ssl_ca_crt-error-log-last-hour.py: OK
-TestSlave-1/etc/plugin/check-_custom_domain_wildcard-error-log-last-day.py: OK
-TestSlave-1/etc/plugin/check-_custom_domain_wildcard-error-log-last-hour.py: OK
-TestSlave-1/etc/plugin/check-_disabled-cookie-list-error-log-last-day.py: OK
-TestSlave-1/etc/plugin/check-_disabled-cookie-list-error-log-last-hour.py: OK
-TestSlave-1/etc/plugin/check-_empty-error-log-last-day.py: OK
-TestSlave-1/etc/plugin/check-_empty-error-log-last-hour.py: OK
-TestSlave-1/etc/plugin/check-_enable-http2-default-error-log-last-day.py: OK
-TestSlave-1/etc/plugin/check-_enable-http2-default-error-log-last-hour.py: OK
-TestSlave-1/etc/plugin/check-_enable-http2-false-error-log-last-day.py: OK
-TestSlave-1/etc/plugin/check-_enable-http2-false-error-log-last-hour.py: OK
-TestSlave-1/etc/plugin/check-_enable_cache-disable-no-cache-request-error-log-last-day.py: OK
-TestSlave-1/etc/plugin/check-_enable_cache-disable-no-cache-request-error-log-last-hour.py: OK
-TestSlave-1/etc/plugin/check-_enable_cache-disable-via-header-error-log-last-day.py: OK
-TestSlave-1/etc/plugin/check-_enable_cache-disable-via-header-error-log-last-hour.py: OK
-TestSlave-1/etc/plugin/check-_enable_cache-error-log-last-day.py: OK
-TestSlave-1/etc/plugin/check-_enable_cache-error-log-last-hour.py: OK
-TestSlave-1/etc/plugin/check-_enable_cache-ssl-proxy-verify-unverified-error-log-last-day.py: OK
-TestSlave-1/etc/plugin/check-_enable_cache-ssl-proxy-verify-unverified-error-log-last-hour.py: OK
-TestSlave-1/etc/plugin/check-_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-day.py: OK
-TestSlave-1/etc/plugin/check-_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-hour.py: OK
-TestSlave-1/etc/plugin/check-_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-day.py: OK
-TestSlave-1/etc/plugin/check-_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-hour.py: OK
-TestSlave-1/etc/plugin/check-_https-only-error-log-last-day.py: OK
-TestSlave-1/etc/plugin/check-_https-only-error-log-last-hour.py: OK
-TestSlave-1/etc/plugin/check-_monitor-ipv4-test-error-log-last-day.py: OK
-TestSlave-1/etc/plugin/check-_monitor-ipv4-test-error-log-last-hour.py: OK
-TestSlave-1/etc/plugin/check-_monitor-ipv4-test-ipv4-packet-list-test.py: OK
-TestSlave-1/etc/plugin/check-_monitor-ipv6-test-error-log-last-day.py: OK
-TestSlave-1/etc/plugin/check-_monitor-ipv6-test-error-log-last-hour.py: OK
-TestSlave-1/etc/plugin/check-_monitor-ipv6-test-ipv6-packet-list-test.py: OK
-TestSlave-1/etc/plugin/check-_prefer-gzip-encoding-to-backend-error-log-last-day.py: OK
-TestSlave-1/etc/plugin/check-_prefer-gzip-encoding-to-backend-error-log-last-hour.py: OK
-TestSlave-1/etc/plugin/check-_re6st-optimal-test-error-log-last-day.py: OK
-TestSlave-1/etc/plugin/check-_re6st-optimal-test-error-log-last-hour.py: OK
-TestSlave-1/etc/plugin/check-_re6st-optimal-test-re6st-optimal-test.py: OK
-TestSlave-1/etc/plugin/check-_server-alias-duplicated-error-log-last-day.py: OK
-TestSlave-1/etc/plugin/check-_server-alias-duplicated-error-log-last-hour.py: OK
-TestSlave-1/etc/plugin/check-_server-alias-error-log-last-day.py: OK
-TestSlave-1/etc/plugin/check-_server-alias-error-log-last-hour.py: OK
-TestSlave-1/etc/plugin/check-_server-alias-wildcard-error-log-last-day.py: OK
-TestSlave-1/etc/plugin/check-_server-alias-wildcard-error-log-last-hour.py: OK
-TestSlave-1/etc/plugin/check-_server-alias_custom_domain-duplicated-error-log-last-day.py: OK
-TestSlave-1/etc/plugin/check-_server-alias_custom_domain-duplicated-error-log-last-hour.py: OK
-TestSlave-1/etc/plugin/check-_ssl-proxy-verify-unverified-error-log-last-day.py: OK
-TestSlave-1/etc/plugin/check-_ssl-proxy-verify-unverified-error-log-last-hour.py: OK
-TestSlave-1/etc/plugin/check-_ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-day.py: OK
-TestSlave-1/etc/plugin/check-_ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-hour.py: OK
-TestSlave-1/etc/plugin/check-_ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-day.py: OK
-TestSlave-1/etc/plugin/check-_ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-hour.py: OK
-TestSlave-1/etc/plugin/check-_ssl_ca_crt_does_not_match-error-log-last-day.py: OK
-TestSlave-1/etc/plugin/check-_ssl_ca_crt_does_not_match-error-log-last-hour.py: OK
-TestSlave-1/etc/plugin/check-_ssl_ca_crt_garbage-error-log-last-day.py: OK
-TestSlave-1/etc/plugin/check-_ssl_ca_crt_garbage-error-log-last-hour.py: OK
-TestSlave-1/etc/plugin/check-_type-eventsource-error-log-last-day.py: OK
-TestSlave-1/etc/plugin/check-_type-eventsource-error-log-last-hour.py: OK
-TestSlave-1/etc/plugin/check-_type-notebook-error-log-last-day.py: OK
-TestSlave-1/etc/plugin/check-_type-notebook-error-log-last-hour.py: OK
-TestSlave-1/etc/plugin/check-_type-redirect-error-log-last-day.py: OK
-TestSlave-1/etc/plugin/check-_type-redirect-error-log-last-hour.py: OK
-TestSlave-1/etc/plugin/check-_type-zope-default-path-error-log-last-day.py: OK
-TestSlave-1/etc/plugin/check-_type-zope-default-path-error-log-last-hour.py: OK
-TestSlave-1/etc/plugin/check-_type-zope-error-log-last-day.py: OK
-TestSlave-1/etc/plugin/check-_type-zope-error-log-last-hour.py: OK
-TestSlave-1/etc/plugin/check-_type-zope-path-error-log-last-day.py: OK
-TestSlave-1/etc/plugin/check-_type-zope-path-error-log-last-hour.py: OK
-TestSlave-1/etc/plugin/check-_type-zope-prefer-gzip-encoding-to-backend-error-log-last-day.py: OK
-TestSlave-1/etc/plugin/check-_type-zope-prefer-gzip-encoding-to-backend-error-log-last-hour.py: OK
-TestSlave-1/etc/plugin/check-_type-zope-ssl-proxy-verify-unverified-error-log-last-day.py: OK
-TestSlave-1/etc/plugin/check-_type-zope-ssl-proxy-verify-unverified-error-log-last-hour.py: OK
-TestSlave-1/etc/plugin/check-_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-day.py: OK
-TestSlave-1/etc/plugin/check-_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-hour.py: OK
-TestSlave-1/etc/plugin/check-_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-day.py: OK
-TestSlave-1/etc/plugin/check-_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-hour.py: OK
-TestSlave-1/etc/plugin/check-_type-zope-virtualhostroot-http-port-error-log-last-day.py: OK
-TestSlave-1/etc/plugin/check-_type-zope-virtualhostroot-http-port-error-log-last-hour.py: OK
-TestSlave-1/etc/plugin/check-_type-zope-virtualhostroot-https-port-error-log-last-day.py: OK
-TestSlave-1/etc/plugin/check-_type-zope-virtualhostroot-https-port-error-log-last-hour.py: OK
-TestSlave-1/etc/plugin/check-_url-error-log-last-day.py: OK
-TestSlave-1/etc/plugin/check-_url-error-log-last-hour.py: OK
-TestSlave-1/etc/plugin/check-_url_https-url-error-log-last-day.py: OK
-TestSlave-1/etc/plugin/check-_url_https-url-error-log-last-hour.py: OK
-TestSlave-1/etc/plugin/check-free-disk-space.py: OK
-TestSlave-1/etc/plugin/frontend-caddy-configuration-promise.py: OK
-TestSlave-1/etc/plugin/monitor-bootstrap-status.py: OK
-TestSlave-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-TestSlave-1/etc/plugin/nginx-configuration-promise.py: OK
-TestSlave-1/etc/plugin/nginx_frontend_ipv4_http.py: OK
-TestSlave-1/etc/plugin/nginx_frontend_ipv4_https.py: OK
-TestSlave-1/etc/plugin/nginx_frontend_ipv6_http.py: OK
-TestSlave-1/etc/plugin/nginx_frontend_ipv6_https.py: OK
-TestSlave-1/etc/plugin/re6st-connectivity.py: OK
-TestSlave-1/etc/plugin/trafficserver-port-listening.py: OK
\ No newline at end of file
+T-0/etc/plugin/buildout-T-0-status.py: OK
+T-0/etc/plugin/check-free-disk-space.py: OK
+T-0/etc/plugin/monitor-bootstrap-status.py: OK
+T-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
+T-1/etc/plugin/buildout-T-1-status.py: OK
+T-1/etc/plugin/caddy_cached.py: OK
+T-1/etc/plugin/caddy_frontend_ipv4_http.py: OK
+T-1/etc/plugin/caddy_frontend_ipv4_https.py: OK
+T-1/etc/plugin/caddy_frontend_ipv6_http.py: OK
+T-1/etc/plugin/caddy_frontend_ipv6_https.py: OK
+T-1/etc/plugin/caddy_ssl_cached.py: OK
+T-1/etc/plugin/check-_Url-error-log-last-day.py: OK
+T-1/etc/plugin/check-_Url-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_apache_custom_http_s-accepted-error-log-last-day.py: OK
+T-1/etc/plugin/check-_apache_custom_http_s-accepted-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_caddy_custom_http_s-accepted-error-log-last-day.py: OK
+T-1/etc/plugin/check-_caddy_custom_http_s-accepted-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_custom_domain-error-log-last-day.py: OK
+T-1/etc/plugin/check-_custom_domain-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_custom_domain_ssl_crt_ssl_key-error-log-last-day.py: OK
+T-1/etc/plugin/check-_custom_domain_ssl_crt_ssl_key-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_custom_domain_ssl_crt_ssl_key_ssl_ca_crt-error-log-last-day.py: OK
+T-1/etc/plugin/check-_custom_domain_ssl_crt_ssl_key_ssl_ca_crt-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_custom_domain_wildcard-error-log-last-day.py: OK
+T-1/etc/plugin/check-_custom_domain_wildcard-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_disabled-cookie-list-error-log-last-day.py: OK
+T-1/etc/plugin/check-_disabled-cookie-list-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_empty-error-log-last-day.py: OK
+T-1/etc/plugin/check-_empty-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_enable-http2-default-error-log-last-day.py: OK
+T-1/etc/plugin/check-_enable-http2-default-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_enable-http2-false-error-log-last-day.py: OK
+T-1/etc/plugin/check-_enable-http2-false-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_enable_cache-disable-no-cache-request-error-log-last-day.py: OK
+T-1/etc/plugin/check-_enable_cache-disable-no-cache-request-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_enable_cache-disable-via-header-error-log-last-day.py: OK
+T-1/etc/plugin/check-_enable_cache-disable-via-header-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_enable_cache-error-log-last-day.py: OK
+T-1/etc/plugin/check-_enable_cache-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_enable_cache-ssl-proxy-verify-unverified-error-log-last-day.py: OK
+T-1/etc/plugin/check-_enable_cache-ssl-proxy-verify-unverified-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-day.py: OK
+T-1/etc/plugin/check-_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-day.py: OK
+T-1/etc/plugin/check-_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_https-only-error-log-last-day.py: OK
+T-1/etc/plugin/check-_https-only-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_monitor-ipv4-test-error-log-last-day.py: OK
+T-1/etc/plugin/check-_monitor-ipv4-test-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_monitor-ipv4-test-ipv4-packet-list-test.py: OK
+T-1/etc/plugin/check-_monitor-ipv6-test-error-log-last-day.py: OK
+T-1/etc/plugin/check-_monitor-ipv6-test-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_monitor-ipv6-test-ipv6-packet-list-test.py: OK
+T-1/etc/plugin/check-_prefer-gzip-encoding-to-backend-error-log-last-day.py: OK
+T-1/etc/plugin/check-_prefer-gzip-encoding-to-backend-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_re6st-optimal-test-error-log-last-day.py: OK
+T-1/etc/plugin/check-_re6st-optimal-test-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_re6st-optimal-test-re6st-optimal-test.py: OK
+T-1/etc/plugin/check-_server-alias-duplicated-error-log-last-day.py: OK
+T-1/etc/plugin/check-_server-alias-duplicated-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_server-alias-error-log-last-day.py: OK
+T-1/etc/plugin/check-_server-alias-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_server-alias-wildcard-error-log-last-day.py: OK
+T-1/etc/plugin/check-_server-alias-wildcard-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_server-alias_custom_domain-duplicated-error-log-last-day.py: OK
+T-1/etc/plugin/check-_server-alias_custom_domain-duplicated-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_ssl-proxy-verify-unverified-error-log-last-day.py: OK
+T-1/etc/plugin/check-_ssl-proxy-verify-unverified-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-day.py: OK
+T-1/etc/plugin/check-_ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-day.py: OK
+T-1/etc/plugin/check-_ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_ssl_ca_crt_does_not_match-error-log-last-day.py: OK
+T-1/etc/plugin/check-_ssl_ca_crt_does_not_match-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_ssl_ca_crt_garbage-error-log-last-day.py: OK
+T-1/etc/plugin/check-_ssl_ca_crt_garbage-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_type-eventsource-error-log-last-day.py: OK
+T-1/etc/plugin/check-_type-eventsource-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_type-notebook-error-log-last-day.py: OK
+T-1/etc/plugin/check-_type-notebook-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_type-redirect-error-log-last-day.py: OK
+T-1/etc/plugin/check-_type-redirect-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_type-zope-default-path-error-log-last-day.py: OK
+T-1/etc/plugin/check-_type-zope-default-path-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_type-zope-error-log-last-day.py: OK
+T-1/etc/plugin/check-_type-zope-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_type-zope-path-error-log-last-day.py: OK
+T-1/etc/plugin/check-_type-zope-path-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_type-zope-prefer-gzip-encoding-to-backend-error-log-last-day.py: OK
+T-1/etc/plugin/check-_type-zope-prefer-gzip-encoding-to-backend-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_type-zope-ssl-proxy-verify-unverified-error-log-last-day.py: OK
+T-1/etc/plugin/check-_type-zope-ssl-proxy-verify-unverified-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-day.py: OK
+T-1/etc/plugin/check-_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-day.py: OK
+T-1/etc/plugin/check-_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_type-zope-virtualhostroot-http-port-error-log-last-day.py: OK
+T-1/etc/plugin/check-_type-zope-virtualhostroot-http-port-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_type-zope-virtualhostroot-https-port-error-log-last-day.py: OK
+T-1/etc/plugin/check-_type-zope-virtualhostroot-https-port-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_url_https-url-error-log-last-day.py: OK
+T-1/etc/plugin/check-_url_https-url-error-log-last-hour.py: OK
+T-1/etc/plugin/check-free-disk-space.py: OK
+T-1/etc/plugin/frontend-caddy-configuration-promise.py: OK
+T-1/etc/plugin/monitor-bootstrap-status.py: OK
+T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
+T-1/etc/plugin/nginx-configuration-promise.py: OK
+T-1/etc/plugin/nginx_frontend_ipv4_http.py: OK
+T-1/etc/plugin/nginx_frontend_ipv4_https.py: OK
+T-1/etc/plugin/nginx_frontend_ipv6_http.py: OK
+T-1/etc/plugin/nginx_frontend_ipv6_https.py: OK
+T-1/etc/plugin/re6st-connectivity.py: OK
+T-1/etc/plugin/trafficserver-port-listening.py: OK
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestSlave.test_promise_run_promise-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlave.test_promise_run_promise-CADDY.txt
index a6ad29a5af4eb5611bd691a0b3172b0ea1090e4e..5105e42af08be204b45dbb4be093052c9805c0f6 100644
--- a/software/caddy-frontend/test/test_data/test.TestSlave.test_promise_run_promise-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestSlave.test_promise_run_promise-CADDY.txt
@@ -1,4 +1,4 @@
-TestSlave-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK
-TestSlave-1/etc/promise/caddy-frontend-is-running-actual-software-release: OK
-TestSlave-1/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK
-TestSlave-1/etc/promise/promise-nginx-is-process-older-than-dependency-set: OK
\ No newline at end of file
+T-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK
+T-1/etc/promise/caddy-frontend-is-running-actual-software-release: OK
+T-1/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK
+T-1/etc/promise/promise-nginx-is-process-older-than-dependency-set: OK
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestSlave.test_supervisor_state-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlave.test_supervisor_state-CADDY.txt
index 3f2bb216e5d4f36ffac267d3057f3481008e60b1..0efdb10a5da84b6ae5157ed1172abad2fadc7736 100644
--- a/software/caddy-frontend/test/test_data/test.TestSlave.test_supervisor_state-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestSlave.test_supervisor_state-CADDY.txt
@@ -1,24 +1,24 @@
-TestSlave-0:bootstrap-monitor EXITED
-TestSlave-0:certificate_authority-{hash}-on-watch RUNNING
-TestSlave-0:crond-{hash} RUNNING
-TestSlave-0:monitor-httpd-{hash}-on-watch RUNNING
-TestSlave-0:monitor-httpd-graceful EXITED
-TestSlave-1:6tunnel-11080-{hash}-on-watch RUNNING
-TestSlave-1:6tunnel-11443-{hash}-on-watch RUNNING
-TestSlave-1:6tunnel-12080-{hash}-on-watch RUNNING
-TestSlave-1:6tunnel-12443-{hash}-on-watch RUNNING
-TestSlave-1:6tunnel-26011-{hash}-on-watch RUNNING
-TestSlave-1:6tunnel-26012-{hash}-on-watch RUNNING
-TestSlave-1:bootstrap-monitor EXITED
-TestSlave-1:certificate_authority-{hash}-on-watch RUNNING
-TestSlave-1:crond-{hash} RUNNING
-TestSlave-1:crond-on-watch RUNNING
-TestSlave-1:frontend-caddy-safe-graceful EXITED
-TestSlave-1:frontend-nginx-safe-graceful EXITED
-TestSlave-1:frontend_caddy-{hash}-on-watch RUNNING
-TestSlave-1:frontend_nginx-{hash}-on-watch RUNNING
-TestSlave-1:monitor-httpd-{hash}-on-watch RUNNING
-TestSlave-1:monitor-httpd-graceful EXITED
-TestSlave-1:trafficserver-{hash}-on-watch RUNNING
-TestSlave-1:trafficserver-reload EXITED
+T-0:bootstrap-monitor EXITED
+T-0:certificate_authority-{hash}-on-watch RUNNING
+T-0:crond-{hash} RUNNING
+T-0:monitor-httpd-{hash}-on-watch RUNNING
+T-0:monitor-httpd-graceful EXITED
+T-1:6tunnel-11080-{hash}-on-watch RUNNING
+T-1:6tunnel-11443-{hash}-on-watch RUNNING
+T-1:6tunnel-12080-{hash}-on-watch RUNNING
+T-1:6tunnel-12443-{hash}-on-watch RUNNING
+T-1:6tunnel-26011-{hash}-on-watch RUNNING
+T-1:6tunnel-26012-{hash}-on-watch RUNNING
+T-1:bootstrap-monitor EXITED
+T-1:certificate_authority-{hash}-on-watch RUNNING
+T-1:crond-{hash} RUNNING
+T-1:crond-on-watch RUNNING
+T-1:frontend-caddy-safe-graceful EXITED
+T-1:frontend-nginx-safe-graceful EXITED
+T-1:frontend_caddy-{hash}-on-watch RUNNING
+T-1:frontend_nginx-{hash}-on-watch RUNNING
+T-1:monitor-httpd-{hash}-on-watch RUNNING
+T-1:monitor-httpd-graceful EXITED
+T-1:trafficserver-{hash}-on-watch RUNNING
+T-1:trafficserver-reload EXITED
 watchdog:watchdog RUNNING
diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveBadParameters.test_file_list_log-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlaveBadParameters.test_file_list_log-CADDY.txt
index 107d22d2a15d981de3c63ca4ab590c83fb6f5d82..e4fcfe8fddf89ed28f0c2fd65b8dac2b70e984d6 100644
--- a/software/caddy-frontend/test/test_data/test.TestSlaveBadParameters.test_file_list_log-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestSlaveBadParameters.test_file_list_log-CADDY.txt
@@ -1,24 +1,24 @@
-TestSlaveBadParameters-0/var/log/monitor-httpd-error.log
-TestSlaveBadParameters-1/var/log/frontend-access.log
-TestSlaveBadParameters-1/var/log/frontend-error.log
-TestSlaveBadParameters-1/var/log/httpd/_default-path-unsafe_access_log
-TestSlaveBadParameters-1/var/log/httpd/_default-path-unsafe_error_log
-TestSlaveBadParameters-1/var/log/httpd/_monitor-ipv4-test-unsafe_access_log
-TestSlaveBadParameters-1/var/log/httpd/_monitor-ipv4-test-unsafe_error_log
-TestSlaveBadParameters-1/var/log/httpd/_monitor-ipv6-test-unsafe_access_log
-TestSlaveBadParameters-1/var/log/httpd/_monitor-ipv6-test-unsafe_error_log
-TestSlaveBadParameters-1/var/log/httpd/_re6st-optimal-test-nocomma_access_log
-TestSlaveBadParameters-1/var/log/httpd/_re6st-optimal-test-nocomma_error_log
-TestSlaveBadParameters-1/var/log/httpd/_re6st-optimal-test-unsafe_access_log
-TestSlaveBadParameters-1/var/log/httpd/_re6st-optimal-test-unsafe_error_log
-TestSlaveBadParameters-1/var/log/httpd/_server-alias-same_access_log
-TestSlaveBadParameters-1/var/log/httpd/_server-alias-same_error_log
-TestSlaveBadParameters-1/var/log/httpd/_virtualhostroot-http-port-unsafe_access_log
-TestSlaveBadParameters-1/var/log/httpd/_virtualhostroot-http-port-unsafe_error_log
-TestSlaveBadParameters-1/var/log/httpd/_virtualhostroot-https-port-unsafe_access_log
-TestSlaveBadParameters-1/var/log/httpd/_virtualhostroot-https-port-unsafe_error_log
-TestSlaveBadParameters-1/var/log/monitor-httpd-error.log
-TestSlaveBadParameters-1/var/log/nginx-access.log
-TestSlaveBadParameters-1/var/log/nginx-error.log
-TestSlaveBadParameters-1/var/log/trafficserver/manager.log
-TestSlaveBadParameters-1/var/log/trafficserver/traffic.out
\ No newline at end of file
+T-0/var/log/monitor-httpd-error.log
+T-1/var/log/frontend-access.log
+T-1/var/log/frontend-error.log
+T-1/var/log/httpd/_default-path-unsafe_access_log
+T-1/var/log/httpd/_default-path-unsafe_error_log
+T-1/var/log/httpd/_monitor-ipv4-test-unsafe_access_log
+T-1/var/log/httpd/_monitor-ipv4-test-unsafe_error_log
+T-1/var/log/httpd/_monitor-ipv6-test-unsafe_access_log
+T-1/var/log/httpd/_monitor-ipv6-test-unsafe_error_log
+T-1/var/log/httpd/_re6st-optimal-test-nocomma_access_log
+T-1/var/log/httpd/_re6st-optimal-test-nocomma_error_log
+T-1/var/log/httpd/_re6st-optimal-test-unsafe_access_log
+T-1/var/log/httpd/_re6st-optimal-test-unsafe_error_log
+T-1/var/log/httpd/_server-alias-same_access_log
+T-1/var/log/httpd/_server-alias-same_error_log
+T-1/var/log/httpd/_virtualhostroot-http-port-unsafe_access_log
+T-1/var/log/httpd/_virtualhostroot-http-port-unsafe_error_log
+T-1/var/log/httpd/_virtualhostroot-https-port-unsafe_access_log
+T-1/var/log/httpd/_virtualhostroot-https-port-unsafe_error_log
+T-1/var/log/monitor-httpd-error.log
+T-1/var/log/nginx-access.log
+T-1/var/log/nginx-error.log
+T-1/var/log/trafficserver/manager.log
+T-1/var/log/trafficserver/traffic.out
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveBadParameters.test_file_list_run-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlaveBadParameters.test_file_list_run-CADDY.txt
index 919fec50f9c34b8e9c1f76f643ee8002c4a4b351..1c68573ce5e83743455f6b80fbdafc141dbda22b 100644
--- a/software/caddy-frontend/test/test_data/test.TestSlaveBadParameters.test_file_list_run-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestSlaveBadParameters.test_file_list_run-CADDY.txt
@@ -1,12 +1,12 @@
-TestSlaveBadParameters-0/var/run/monitor-httpd.pid
-TestSlaveBadParameters-0/var/run/monitor/monitor-bootstrap.pid
-TestSlaveBadParameters-1/var/run/caddy_graceful_signature
-TestSlaveBadParameters-1/var/run/caddy_validate_signature
-TestSlaveBadParameters-1/var/run/caddy_validate_signature.status
-TestSlaveBadParameters-1/var/run/httpd.pid
-TestSlaveBadParameters-1/var/run/monitor-httpd.pid
-TestSlaveBadParameters-1/var/run/monitor/monitor-bootstrap.pid
-TestSlaveBadParameters-1/var/run/nginx.pid
-TestSlaveBadParameters-1/var/run/nginx_graceful_signature
-TestSlaveBadParameters-1/var/run/nginx_validate_signature
-TestSlaveBadParameters-1/var/run/nginx_validate_signature.status
\ No newline at end of file
+T-0/var/run/monitor-httpd.pid
+T-0/var/run/monitor/monitor-bootstrap.pid
+T-1/var/run/caddy_graceful_signature
+T-1/var/run/caddy_validate_signature
+T-1/var/run/caddy_validate_signature.status
+T-1/var/run/httpd.pid
+T-1/var/run/monitor-httpd.pid
+T-1/var/run/monitor/monitor-bootstrap.pid
+T-1/var/run/nginx.pid
+T-1/var/run/nginx_graceful_signature
+T-1/var/run/nginx_validate_signature
+T-1/var/run/nginx_validate_signature.status
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveBadParameters.test_promise_run_plugin-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlaveBadParameters.test_promise_run_plugin-CADDY.txt
index aa9d6535fd03baad096d130b3fee58797bc7fe7b..0bd5dbdbbf5c43a84f0f55c545fc03da0e5696df 100644
--- a/software/caddy-frontend/test/test_data/test.TestSlaveBadParameters.test_promise_run_plugin-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestSlaveBadParameters.test_promise_run_plugin-CADDY.txt
@@ -1,41 +1,41 @@
-TestSlaveBadParameters-0/etc/plugin/buildout-TestSlaveBadParameters-0-status.py: OK
-TestSlaveBadParameters-0/etc/plugin/check-free-disk-space.py: OK
-TestSlaveBadParameters-0/etc/plugin/monitor-bootstrap-status.py: OK
-TestSlaveBadParameters-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-TestSlaveBadParameters-1/etc/plugin/buildout-TestSlaveBadParameters-1-status.py: OK
-TestSlaveBadParameters-1/etc/plugin/caddy_cached.py: ERROR
-TestSlaveBadParameters-1/etc/plugin/caddy_frontend_ipv4_http.py: OK
-TestSlaveBadParameters-1/etc/plugin/caddy_frontend_ipv4_https.py: OK
-TestSlaveBadParameters-1/etc/plugin/caddy_frontend_ipv6_http.py: OK
-TestSlaveBadParameters-1/etc/plugin/caddy_frontend_ipv6_https.py: OK
-TestSlaveBadParameters-1/etc/plugin/caddy_ssl_cached.py: ERROR
-TestSlaveBadParameters-1/etc/plugin/check-_default-path-unsafe-error-log-last-day.py: OK
-TestSlaveBadParameters-1/etc/plugin/check-_default-path-unsafe-error-log-last-hour.py: OK
-TestSlaveBadParameters-1/etc/plugin/check-_monitor-ipv4-test-unsafe-error-log-last-day.py: OK
-TestSlaveBadParameters-1/etc/plugin/check-_monitor-ipv4-test-unsafe-error-log-last-hour.py: OK
-TestSlaveBadParameters-1/etc/plugin/check-_monitor-ipv4-test-unsafe-ipv4-packet-list-test.py: OK
-TestSlaveBadParameters-1/etc/plugin/check-_monitor-ipv6-test-unsafe-error-log-last-day.py: OK
-TestSlaveBadParameters-1/etc/plugin/check-_monitor-ipv6-test-unsafe-error-log-last-hour.py: OK
-TestSlaveBadParameters-1/etc/plugin/check-_monitor-ipv6-test-unsafe-ipv6-packet-list-test.py: OK
-TestSlaveBadParameters-1/etc/plugin/check-_re6st-optimal-test-nocomma-error-log-last-day.py: OK
-TestSlaveBadParameters-1/etc/plugin/check-_re6st-optimal-test-nocomma-error-log-last-hour.py: OK
-TestSlaveBadParameters-1/etc/plugin/check-_re6st-optimal-test-unsafe-error-log-last-day.py: OK
-TestSlaveBadParameters-1/etc/plugin/check-_re6st-optimal-test-unsafe-error-log-last-hour.py: OK
-TestSlaveBadParameters-1/etc/plugin/check-_re6st-optimal-test-unsafe-re6st-optimal-test.py: OK
-TestSlaveBadParameters-1/etc/plugin/check-_server-alias-same-error-log-last-day.py: OK
-TestSlaveBadParameters-1/etc/plugin/check-_server-alias-same-error-log-last-hour.py: OK
-TestSlaveBadParameters-1/etc/plugin/check-_virtualhostroot-http-port-unsafe-error-log-last-day.py: OK
-TestSlaveBadParameters-1/etc/plugin/check-_virtualhostroot-http-port-unsafe-error-log-last-hour.py: OK
-TestSlaveBadParameters-1/etc/plugin/check-_virtualhostroot-https-port-unsafe-error-log-last-day.py: OK
-TestSlaveBadParameters-1/etc/plugin/check-_virtualhostroot-https-port-unsafe-error-log-last-hour.py: OK
-TestSlaveBadParameters-1/etc/plugin/check-free-disk-space.py: OK
-TestSlaveBadParameters-1/etc/plugin/frontend-caddy-configuration-promise.py: OK
-TestSlaveBadParameters-1/etc/plugin/monitor-bootstrap-status.py: OK
-TestSlaveBadParameters-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-TestSlaveBadParameters-1/etc/plugin/nginx-configuration-promise.py: OK
-TestSlaveBadParameters-1/etc/plugin/nginx_frontend_ipv4_http.py: OK
-TestSlaveBadParameters-1/etc/plugin/nginx_frontend_ipv4_https.py: OK
-TestSlaveBadParameters-1/etc/plugin/nginx_frontend_ipv6_http.py: OK
-TestSlaveBadParameters-1/etc/plugin/nginx_frontend_ipv6_https.py: OK
-TestSlaveBadParameters-1/etc/plugin/re6st-connectivity.py: OK
-TestSlaveBadParameters-1/etc/plugin/trafficserver-port-listening.py: OK
\ No newline at end of file
+T-0/etc/plugin/buildout-T-0-status.py: OK
+T-0/etc/plugin/check-free-disk-space.py: OK
+T-0/etc/plugin/monitor-bootstrap-status.py: OK
+T-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
+T-1/etc/plugin/buildout-T-1-status.py: OK
+T-1/etc/plugin/caddy_cached.py: ERROR
+T-1/etc/plugin/caddy_frontend_ipv4_http.py: OK
+T-1/etc/plugin/caddy_frontend_ipv4_https.py: OK
+T-1/etc/plugin/caddy_frontend_ipv6_http.py: OK
+T-1/etc/plugin/caddy_frontend_ipv6_https.py: OK
+T-1/etc/plugin/caddy_ssl_cached.py: ERROR
+T-1/etc/plugin/check-_default-path-unsafe-error-log-last-day.py: OK
+T-1/etc/plugin/check-_default-path-unsafe-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_monitor-ipv4-test-unsafe-error-log-last-day.py: OK
+T-1/etc/plugin/check-_monitor-ipv4-test-unsafe-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_monitor-ipv4-test-unsafe-ipv4-packet-list-test.py: OK
+T-1/etc/plugin/check-_monitor-ipv6-test-unsafe-error-log-last-day.py: OK
+T-1/etc/plugin/check-_monitor-ipv6-test-unsafe-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_monitor-ipv6-test-unsafe-ipv6-packet-list-test.py: OK
+T-1/etc/plugin/check-_re6st-optimal-test-nocomma-error-log-last-day.py: OK
+T-1/etc/plugin/check-_re6st-optimal-test-nocomma-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_re6st-optimal-test-unsafe-error-log-last-day.py: OK
+T-1/etc/plugin/check-_re6st-optimal-test-unsafe-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_re6st-optimal-test-unsafe-re6st-optimal-test.py: OK
+T-1/etc/plugin/check-_server-alias-same-error-log-last-day.py: OK
+T-1/etc/plugin/check-_server-alias-same-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_virtualhostroot-http-port-unsafe-error-log-last-day.py: OK
+T-1/etc/plugin/check-_virtualhostroot-http-port-unsafe-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_virtualhostroot-https-port-unsafe-error-log-last-day.py: OK
+T-1/etc/plugin/check-_virtualhostroot-https-port-unsafe-error-log-last-hour.py: OK
+T-1/etc/plugin/check-free-disk-space.py: OK
+T-1/etc/plugin/frontend-caddy-configuration-promise.py: OK
+T-1/etc/plugin/monitor-bootstrap-status.py: OK
+T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
+T-1/etc/plugin/nginx-configuration-promise.py: OK
+T-1/etc/plugin/nginx_frontend_ipv4_http.py: OK
+T-1/etc/plugin/nginx_frontend_ipv4_https.py: OK
+T-1/etc/plugin/nginx_frontend_ipv6_http.py: OK
+T-1/etc/plugin/nginx_frontend_ipv6_https.py: OK
+T-1/etc/plugin/re6st-connectivity.py: OK
+T-1/etc/plugin/trafficserver-port-listening.py: OK
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveBadParameters.test_promise_run_promise-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlaveBadParameters.test_promise_run_promise-CADDY.txt
index a7efe8fe4a90943d6cae404eed66dd336352ddf3..5105e42af08be204b45dbb4be093052c9805c0f6 100644
--- a/software/caddy-frontend/test/test_data/test.TestSlaveBadParameters.test_promise_run_promise-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestSlaveBadParameters.test_promise_run_promise-CADDY.txt
@@ -1,4 +1,4 @@
-TestSlaveBadParameters-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK
-TestSlaveBadParameters-1/etc/promise/caddy-frontend-is-running-actual-software-release: OK
-TestSlaveBadParameters-1/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK
-TestSlaveBadParameters-1/etc/promise/promise-nginx-is-process-older-than-dependency-set: OK
\ No newline at end of file
+T-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK
+T-1/etc/promise/caddy-frontend-is-running-actual-software-release: OK
+T-1/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK
+T-1/etc/promise/promise-nginx-is-process-older-than-dependency-set: OK
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveBadParameters.test_supervisor_state-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlaveBadParameters.test_supervisor_state-CADDY.txt
index 3f2003f9ee024c8f718a09fb8574ad145b6dd235..0efdb10a5da84b6ae5157ed1172abad2fadc7736 100644
--- a/software/caddy-frontend/test/test_data/test.TestSlaveBadParameters.test_supervisor_state-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestSlaveBadParameters.test_supervisor_state-CADDY.txt
@@ -1,24 +1,24 @@
-TestSlaveBadParameters-0:bootstrap-monitor EXITED
-TestSlaveBadParameters-0:certificate_authority-{hash}-on-watch RUNNING
-TestSlaveBadParameters-0:crond-{hash} RUNNING
-TestSlaveBadParameters-0:monitor-httpd-{hash}-on-watch RUNNING
-TestSlaveBadParameters-0:monitor-httpd-graceful EXITED
-TestSlaveBadParameters-1:6tunnel-11080-{hash}-on-watch RUNNING
-TestSlaveBadParameters-1:6tunnel-11443-{hash}-on-watch RUNNING
-TestSlaveBadParameters-1:6tunnel-12080-{hash}-on-watch RUNNING
-TestSlaveBadParameters-1:6tunnel-12443-{hash}-on-watch RUNNING
-TestSlaveBadParameters-1:6tunnel-26011-{hash}-on-watch RUNNING
-TestSlaveBadParameters-1:6tunnel-26012-{hash}-on-watch RUNNING
-TestSlaveBadParameters-1:bootstrap-monitor EXITED
-TestSlaveBadParameters-1:certificate_authority-{hash}-on-watch RUNNING
-TestSlaveBadParameters-1:crond-{hash} RUNNING
-TestSlaveBadParameters-1:crond-on-watch RUNNING
-TestSlaveBadParameters-1:frontend-caddy-safe-graceful EXITED
-TestSlaveBadParameters-1:frontend-nginx-safe-graceful EXITED
-TestSlaveBadParameters-1:frontend_caddy-{hash}-on-watch RUNNING
-TestSlaveBadParameters-1:frontend_nginx-{hash}-on-watch RUNNING
-TestSlaveBadParameters-1:monitor-httpd-{hash}-on-watch RUNNING
-TestSlaveBadParameters-1:monitor-httpd-graceful EXITED
-TestSlaveBadParameters-1:trafficserver-{hash}-on-watch RUNNING
-TestSlaveBadParameters-1:trafficserver-reload EXITED
+T-0:bootstrap-monitor EXITED
+T-0:certificate_authority-{hash}-on-watch RUNNING
+T-0:crond-{hash} RUNNING
+T-0:monitor-httpd-{hash}-on-watch RUNNING
+T-0:monitor-httpd-graceful EXITED
+T-1:6tunnel-11080-{hash}-on-watch RUNNING
+T-1:6tunnel-11443-{hash}-on-watch RUNNING
+T-1:6tunnel-12080-{hash}-on-watch RUNNING
+T-1:6tunnel-12443-{hash}-on-watch RUNNING
+T-1:6tunnel-26011-{hash}-on-watch RUNNING
+T-1:6tunnel-26012-{hash}-on-watch RUNNING
+T-1:bootstrap-monitor EXITED
+T-1:certificate_authority-{hash}-on-watch RUNNING
+T-1:crond-{hash} RUNNING
+T-1:crond-on-watch RUNNING
+T-1:frontend-caddy-safe-graceful EXITED
+T-1:frontend-nginx-safe-graceful EXITED
+T-1:frontend_caddy-{hash}-on-watch RUNNING
+T-1:frontend_nginx-{hash}-on-watch RUNNING
+T-1:monitor-httpd-{hash}-on-watch RUNNING
+T-1:monitor-httpd-graceful EXITED
+T-1:trafficserver-{hash}-on-watch RUNNING
+T-1:trafficserver-reload EXITED
 watchdog:watchdog RUNNING
diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_file_list_log-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_file_list_log-CADDY.txt
index 073aa6f8ea6aa200c43a862bc00abf46eae6caa9..d7d7cfdf8a379fdd0b22bc81cb489bffdccb5d72 100644
--- a/software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_file_list_log-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_file_list_log-CADDY.txt
@@ -1,94 +1,94 @@
-TestSlaveGlobalDisableHttp2-0/var/log/monitor-httpd-error.log
-TestSlaveGlobalDisableHttp2-1/var/log/frontend-access.log
-TestSlaveGlobalDisableHttp2-1/var/log/frontend-error.log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_apache_custom_http_s-accepted_access_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_apache_custom_http_s-accepted_error_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_caddy_custom_http_s-accepted_access_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_caddy_custom_http_s-accepted_error_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_custom_domain_access_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_custom_domain_error_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_custom_domain_ssl_crt_ssl_key_access_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_custom_domain_ssl_crt_ssl_key_error_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_custom_domain_ssl_crt_ssl_key_ssl_ca_crt_access_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_custom_domain_ssl_crt_ssl_key_ssl_ca_crt_error_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_custom_domain_wildcard_access_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_custom_domain_wildcard_error_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_disabled-cookie-list_access_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_disabled-cookie-list_error_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_empty_access_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_empty_error_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_enable-http2-default_access_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_enable-http2-default_error_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_enable-http2-false_access_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_enable-http2-false_error_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_enable_cache-disable-no-cache-request_access_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_enable_cache-disable-no-cache-request_error_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_enable_cache-disable-via-header_access_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_enable_cache-disable-via-header_error_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_enable_cache-ssl-proxy-verify-unverified_access_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_enable_cache-ssl-proxy-verify-unverified_error_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified_access_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified_error_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt_access_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt_error_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_enable_cache_access_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_enable_cache_error_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_https-only_access_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_https-only_error_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_monitor-ipv4-test_access_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_monitor-ipv4-test_error_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_monitor-ipv6-test_access_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_monitor-ipv6-test_error_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_prefer-gzip-encoding-to-backend_access_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_prefer-gzip-encoding-to-backend_error_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_re6st-optimal-test_access_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_re6st-optimal-test_error_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_server-alias-duplicated_access_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_server-alias-duplicated_error_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_server-alias-wildcard_access_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_server-alias-wildcard_error_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_server-alias_access_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_server-alias_custom_domain-duplicated_access_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_server-alias_custom_domain-duplicated_error_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_server-alias_error_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_ssl-proxy-verify-unverified_access_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_ssl-proxy-verify-unverified_error_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_ssl-proxy-verify_ssl_proxy_ca_crt-unverified_access_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_ssl-proxy-verify_ssl_proxy_ca_crt-unverified_error_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_ssl-proxy-verify_ssl_proxy_ca_crt_access_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_ssl-proxy-verify_ssl_proxy_ca_crt_error_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_ssl_ca_crt_does_not_match_access_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_ssl_ca_crt_does_not_match_error_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_ssl_ca_crt_garbage_access_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_ssl_ca_crt_garbage_error_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_type-notebook_access_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_type-notebook_error_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_type-redirect_access_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_type-redirect_error_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_type-zope-default-path_access_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_type-zope-default-path_error_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_type-zope-path_access_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_type-zope-path_error_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_type-zope-prefer-gzip-encoding-to-backend_access_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_type-zope-prefer-gzip-encoding-to-backend_error_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_type-zope-ssl-proxy-verify-unverified_access_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_type-zope-ssl-proxy-verify-unverified_error_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-unverified_access_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-unverified_error_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt_access_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt_error_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_type-zope-virtualhostroot-http-port_access_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_type-zope-virtualhostroot-http-port_error_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_type-zope-virtualhostroot-https-port_access_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_type-zope-virtualhostroot-https-port_error_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_type-zope_access_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_type-zope_error_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_url_access_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_url_error_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_url_https-url_access_log
-TestSlaveGlobalDisableHttp2-1/var/log/httpd/_url_https-url_error_log
-TestSlaveGlobalDisableHttp2-1/var/log/monitor-httpd-error.log
-TestSlaveGlobalDisableHttp2-1/var/log/nginx-access.log
-TestSlaveGlobalDisableHttp2-1/var/log/nginx-error.log
-TestSlaveGlobalDisableHttp2-1/var/log/trafficserver/manager.log
-TestSlaveGlobalDisableHttp2-1/var/log/trafficserver/traffic.out
\ No newline at end of file
+T-0/var/log/monitor-httpd-error.log
+T-1/var/log/frontend-access.log
+T-1/var/log/frontend-error.log
+T-1/var/log/httpd/_Url_access_log
+T-1/var/log/httpd/_Url_error_log
+T-1/var/log/httpd/_apache_custom_http_s-accepted_access_log
+T-1/var/log/httpd/_apache_custom_http_s-accepted_error_log
+T-1/var/log/httpd/_caddy_custom_http_s-accepted_access_log
+T-1/var/log/httpd/_caddy_custom_http_s-accepted_error_log
+T-1/var/log/httpd/_custom_domain_access_log
+T-1/var/log/httpd/_custom_domain_error_log
+T-1/var/log/httpd/_custom_domain_ssl_crt_ssl_key_access_log
+T-1/var/log/httpd/_custom_domain_ssl_crt_ssl_key_error_log
+T-1/var/log/httpd/_custom_domain_ssl_crt_ssl_key_ssl_ca_crt_access_log
+T-1/var/log/httpd/_custom_domain_ssl_crt_ssl_key_ssl_ca_crt_error_log
+T-1/var/log/httpd/_custom_domain_wildcard_access_log
+T-1/var/log/httpd/_custom_domain_wildcard_error_log
+T-1/var/log/httpd/_disabled-cookie-list_access_log
+T-1/var/log/httpd/_disabled-cookie-list_error_log
+T-1/var/log/httpd/_empty_access_log
+T-1/var/log/httpd/_empty_error_log
+T-1/var/log/httpd/_enable-http2-default_access_log
+T-1/var/log/httpd/_enable-http2-default_error_log
+T-1/var/log/httpd/_enable-http2-false_access_log
+T-1/var/log/httpd/_enable-http2-false_error_log
+T-1/var/log/httpd/_enable_cache-disable-no-cache-request_access_log
+T-1/var/log/httpd/_enable_cache-disable-no-cache-request_error_log
+T-1/var/log/httpd/_enable_cache-disable-via-header_access_log
+T-1/var/log/httpd/_enable_cache-disable-via-header_error_log
+T-1/var/log/httpd/_enable_cache-ssl-proxy-verify-unverified_access_log
+T-1/var/log/httpd/_enable_cache-ssl-proxy-verify-unverified_error_log
+T-1/var/log/httpd/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified_access_log
+T-1/var/log/httpd/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified_error_log
+T-1/var/log/httpd/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt_access_log
+T-1/var/log/httpd/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt_error_log
+T-1/var/log/httpd/_enable_cache_access_log
+T-1/var/log/httpd/_enable_cache_error_log
+T-1/var/log/httpd/_https-only_access_log
+T-1/var/log/httpd/_https-only_error_log
+T-1/var/log/httpd/_monitor-ipv4-test_access_log
+T-1/var/log/httpd/_monitor-ipv4-test_error_log
+T-1/var/log/httpd/_monitor-ipv6-test_access_log
+T-1/var/log/httpd/_monitor-ipv6-test_error_log
+T-1/var/log/httpd/_prefer-gzip-encoding-to-backend_access_log
+T-1/var/log/httpd/_prefer-gzip-encoding-to-backend_error_log
+T-1/var/log/httpd/_re6st-optimal-test_access_log
+T-1/var/log/httpd/_re6st-optimal-test_error_log
+T-1/var/log/httpd/_server-alias-duplicated_access_log
+T-1/var/log/httpd/_server-alias-duplicated_error_log
+T-1/var/log/httpd/_server-alias-wildcard_access_log
+T-1/var/log/httpd/_server-alias-wildcard_error_log
+T-1/var/log/httpd/_server-alias_access_log
+T-1/var/log/httpd/_server-alias_custom_domain-duplicated_access_log
+T-1/var/log/httpd/_server-alias_custom_domain-duplicated_error_log
+T-1/var/log/httpd/_server-alias_error_log
+T-1/var/log/httpd/_ssl-proxy-verify-unverified_access_log
+T-1/var/log/httpd/_ssl-proxy-verify-unverified_error_log
+T-1/var/log/httpd/_ssl-proxy-verify_ssl_proxy_ca_crt-unverified_access_log
+T-1/var/log/httpd/_ssl-proxy-verify_ssl_proxy_ca_crt-unverified_error_log
+T-1/var/log/httpd/_ssl-proxy-verify_ssl_proxy_ca_crt_access_log
+T-1/var/log/httpd/_ssl-proxy-verify_ssl_proxy_ca_crt_error_log
+T-1/var/log/httpd/_ssl_ca_crt_does_not_match_access_log
+T-1/var/log/httpd/_ssl_ca_crt_does_not_match_error_log
+T-1/var/log/httpd/_ssl_ca_crt_garbage_access_log
+T-1/var/log/httpd/_ssl_ca_crt_garbage_error_log
+T-1/var/log/httpd/_type-notebook_access_log
+T-1/var/log/httpd/_type-notebook_error_log
+T-1/var/log/httpd/_type-redirect_access_log
+T-1/var/log/httpd/_type-redirect_error_log
+T-1/var/log/httpd/_type-zope-default-path_access_log
+T-1/var/log/httpd/_type-zope-default-path_error_log
+T-1/var/log/httpd/_type-zope-path_access_log
+T-1/var/log/httpd/_type-zope-path_error_log
+T-1/var/log/httpd/_type-zope-prefer-gzip-encoding-to-backend_access_log
+T-1/var/log/httpd/_type-zope-prefer-gzip-encoding-to-backend_error_log
+T-1/var/log/httpd/_type-zope-ssl-proxy-verify-unverified_access_log
+T-1/var/log/httpd/_type-zope-ssl-proxy-verify-unverified_error_log
+T-1/var/log/httpd/_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-unverified_access_log
+T-1/var/log/httpd/_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-unverified_error_log
+T-1/var/log/httpd/_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt_access_log
+T-1/var/log/httpd/_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt_error_log
+T-1/var/log/httpd/_type-zope-virtualhostroot-http-port_access_log
+T-1/var/log/httpd/_type-zope-virtualhostroot-http-port_error_log
+T-1/var/log/httpd/_type-zope-virtualhostroot-https-port_access_log
+T-1/var/log/httpd/_type-zope-virtualhostroot-https-port_error_log
+T-1/var/log/httpd/_type-zope_access_log
+T-1/var/log/httpd/_type-zope_error_log
+T-1/var/log/httpd/_url_https-url_access_log
+T-1/var/log/httpd/_url_https-url_error_log
+T-1/var/log/monitor-httpd-error.log
+T-1/var/log/nginx-access.log
+T-1/var/log/nginx-error.log
+T-1/var/log/trafficserver/manager.log
+T-1/var/log/trafficserver/traffic.out
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_file_list_run-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_file_list_run-CADDY.txt
index 62227f521ff19066fbfe7b513659c29a6078a0ad..1c68573ce5e83743455f6b80fbdafc141dbda22b 100644
--- a/software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_file_list_run-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_file_list_run-CADDY.txt
@@ -1,12 +1,12 @@
-TestSlaveGlobalDisableHttp2-0/var/run/monitor-httpd.pid
-TestSlaveGlobalDisableHttp2-0/var/run/monitor/monitor-bootstrap.pid
-TestSlaveGlobalDisableHttp2-1/var/run/caddy_graceful_signature
-TestSlaveGlobalDisableHttp2-1/var/run/caddy_validate_signature
-TestSlaveGlobalDisableHttp2-1/var/run/caddy_validate_signature.status
-TestSlaveGlobalDisableHttp2-1/var/run/httpd.pid
-TestSlaveGlobalDisableHttp2-1/var/run/monitor-httpd.pid
-TestSlaveGlobalDisableHttp2-1/var/run/monitor/monitor-bootstrap.pid
-TestSlaveGlobalDisableHttp2-1/var/run/nginx.pid
-TestSlaveGlobalDisableHttp2-1/var/run/nginx_graceful_signature
-TestSlaveGlobalDisableHttp2-1/var/run/nginx_validate_signature
-TestSlaveGlobalDisableHttp2-1/var/run/nginx_validate_signature.status
\ No newline at end of file
+T-0/var/run/monitor-httpd.pid
+T-0/var/run/monitor/monitor-bootstrap.pid
+T-1/var/run/caddy_graceful_signature
+T-1/var/run/caddy_validate_signature
+T-1/var/run/caddy_validate_signature.status
+T-1/var/run/httpd.pid
+T-1/var/run/monitor-httpd.pid
+T-1/var/run/monitor/monitor-bootstrap.pid
+T-1/var/run/nginx.pid
+T-1/var/run/nginx_graceful_signature
+T-1/var/run/nginx_validate_signature
+T-1/var/run/nginx_validate_signature.status
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_monitor_promise_list-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_monitor_promise_list-CADDY.txt
index daec8f305ab7df48a674ea1eed42f455ce88d828..af319e709fca27f6f39259de8857ec4d536dc636 100644
--- a/software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_monitor_promise_list-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_monitor_promise_list-CADDY.txt
@@ -1,91 +1,91 @@
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_apache_custom_http_s-accepted-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_apache_custom_http_s-accepted-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_caddy_custom_http_s-accepted-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_caddy_custom_http_s-accepted-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_custom_domain-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_custom_domain-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_custom_domain_ssl_crt_ssl_key-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_custom_domain_ssl_crt_ssl_key-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_custom_domain_ssl_crt_ssl_key_ssl_ca_crt-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_custom_domain_ssl_crt_ssl_key_ssl_ca_crt-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_custom_domain_wildcard-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_custom_domain_wildcard-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_disabled-cookie-list-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_disabled-cookie-list-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_empty-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_empty-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_enable-http2-default-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_enable-http2-default-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_enable-http2-false-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_enable-http2-false-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_enable_cache-disable-no-cache-request-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_enable_cache-disable-no-cache-request-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_enable_cache-disable-via-header-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_enable_cache-disable-via-header-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_enable_cache-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_enable_cache-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_enable_cache-ssl-proxy-verify-unverified-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_enable_cache-ssl-proxy-verify-unverified-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_https-only-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_https-only-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_monitor-ipv4-test-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_monitor-ipv4-test-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_monitor-ipv4-test-ipv4-packet-list-test
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_monitor-ipv6-test-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_monitor-ipv6-test-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_monitor-ipv6-test-ipv6-packet-list-test
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_prefer-gzip-encoding-to-backend-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_prefer-gzip-encoding-to-backend-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_re6st-optimal-test-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_re6st-optimal-test-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_re6st-optimal-test-re6st-optimal-test
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_server-alias-duplicated-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_server-alias-duplicated-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_server-alias-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_server-alias-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_server-alias-wildcard-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_server-alias-wildcard-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_server-alias_custom_domain-duplicated-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_server-alias_custom_domain-duplicated-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_ssl-proxy-verify-unverified-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_ssl-proxy-verify-unverified-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_ssl_ca_crt_does_not_match-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_ssl_ca_crt_does_not_match-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_ssl_ca_crt_garbage-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_ssl_ca_crt_garbage-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_type-eventsource-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_type-eventsource-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_type-notebook-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_type-notebook-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_type-redirect-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_type-redirect-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_type-zope-default-path-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_type-zope-default-path-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_type-zope-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_type-zope-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_type-zope-path-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_type-zope-path-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_type-zope-prefer-gzip-encoding-to-backend-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_type-zope-prefer-gzip-encoding-to-backend-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_type-zope-ssl-proxy-verify-unverified-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_type-zope-ssl-proxy-verify-unverified-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_type-zope-virtualhostroot-http-port-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_type-zope-virtualhostroot-http-port-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_type-zope-virtualhostroot-https-port-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_type-zope-virtualhostroot-https-port-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_url-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_url-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_url_https-url-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/monitor-promise/check-_url_https-url-error-log-last-hour
\ No newline at end of file
+T-1/etc/monitor-promise/check-_apache_custom_http_s-accepted-error-log-last-day
+T-1/etc/monitor-promise/check-_apache_custom_http_s-accepted-error-log-last-hour
+T-1/etc/monitor-promise/check-_caddy_custom_http_s-accepted-error-log-last-day
+T-1/etc/monitor-promise/check-_caddy_custom_http_s-accepted-error-log-last-hour
+T-1/etc/monitor-promise/check-_custom_domain-error-log-last-day
+T-1/etc/monitor-promise/check-_custom_domain-error-log-last-hour
+T-1/etc/monitor-promise/check-_custom_domain_ssl_crt_ssl_key-error-log-last-day
+T-1/etc/monitor-promise/check-_custom_domain_ssl_crt_ssl_key-error-log-last-hour
+T-1/etc/monitor-promise/check-_custom_domain_ssl_crt_ssl_key_ssl_ca_crt-error-log-last-day
+T-1/etc/monitor-promise/check-_custom_domain_ssl_crt_ssl_key_ssl_ca_crt-error-log-last-hour
+T-1/etc/monitor-promise/check-_custom_domain_wildcard-error-log-last-day
+T-1/etc/monitor-promise/check-_custom_domain_wildcard-error-log-last-hour
+T-1/etc/monitor-promise/check-_disabled-cookie-list-error-log-last-day
+T-1/etc/monitor-promise/check-_disabled-cookie-list-error-log-last-hour
+T-1/etc/monitor-promise/check-_empty-error-log-last-day
+T-1/etc/monitor-promise/check-_empty-error-log-last-hour
+T-1/etc/monitor-promise/check-_enable-http2-default-error-log-last-day
+T-1/etc/monitor-promise/check-_enable-http2-default-error-log-last-hour
+T-1/etc/monitor-promise/check-_enable-http2-false-error-log-last-day
+T-1/etc/monitor-promise/check-_enable-http2-false-error-log-last-hour
+T-1/etc/monitor-promise/check-_enable_cache-disable-no-cache-request-error-log-last-day
+T-1/etc/monitor-promise/check-_enable_cache-disable-no-cache-request-error-log-last-hour
+T-1/etc/monitor-promise/check-_enable_cache-disable-via-header-error-log-last-day
+T-1/etc/monitor-promise/check-_enable_cache-disable-via-header-error-log-last-hour
+T-1/etc/monitor-promise/check-_enable_cache-error-log-last-day
+T-1/etc/monitor-promise/check-_enable_cache-error-log-last-hour
+T-1/etc/monitor-promise/check-_enable_cache-ssl-proxy-verify-unverified-error-log-last-day
+T-1/etc/monitor-promise/check-_enable_cache-ssl-proxy-verify-unverified-error-log-last-hour
+T-1/etc/monitor-promise/check-_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-day
+T-1/etc/monitor-promise/check-_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-hour
+T-1/etc/monitor-promise/check-_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-day
+T-1/etc/monitor-promise/check-_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-hour
+T-1/etc/monitor-promise/check-_https-only-error-log-last-day
+T-1/etc/monitor-promise/check-_https-only-error-log-last-hour
+T-1/etc/monitor-promise/check-_monitor-ipv4-test-error-log-last-day
+T-1/etc/monitor-promise/check-_monitor-ipv4-test-error-log-last-hour
+T-1/etc/monitor-promise/check-_monitor-ipv4-test-ipv4-packet-list-test
+T-1/etc/monitor-promise/check-_monitor-ipv6-test-error-log-last-day
+T-1/etc/monitor-promise/check-_monitor-ipv6-test-error-log-last-hour
+T-1/etc/monitor-promise/check-_monitor-ipv6-test-ipv6-packet-list-test
+T-1/etc/monitor-promise/check-_prefer-gzip-encoding-to-backend-error-log-last-day
+T-1/etc/monitor-promise/check-_prefer-gzip-encoding-to-backend-error-log-last-hour
+T-1/etc/monitor-promise/check-_re6st-optimal-test-error-log-last-day
+T-1/etc/monitor-promise/check-_re6st-optimal-test-error-log-last-hour
+T-1/etc/monitor-promise/check-_re6st-optimal-test-re6st-optimal-test
+T-1/etc/monitor-promise/check-_server-alias-duplicated-error-log-last-day
+T-1/etc/monitor-promise/check-_server-alias-duplicated-error-log-last-hour
+T-1/etc/monitor-promise/check-_server-alias-error-log-last-day
+T-1/etc/monitor-promise/check-_server-alias-error-log-last-hour
+T-1/etc/monitor-promise/check-_server-alias-wildcard-error-log-last-day
+T-1/etc/monitor-promise/check-_server-alias-wildcard-error-log-last-hour
+T-1/etc/monitor-promise/check-_server-alias_custom_domain-duplicated-error-log-last-day
+T-1/etc/monitor-promise/check-_server-alias_custom_domain-duplicated-error-log-last-hour
+T-1/etc/monitor-promise/check-_ssl-proxy-verify-unverified-error-log-last-day
+T-1/etc/monitor-promise/check-_ssl-proxy-verify-unverified-error-log-last-hour
+T-1/etc/monitor-promise/check-_ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-day
+T-1/etc/monitor-promise/check-_ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-hour
+T-1/etc/monitor-promise/check-_ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-day
+T-1/etc/monitor-promise/check-_ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-hour
+T-1/etc/monitor-promise/check-_ssl_ca_crt_does_not_match-error-log-last-day
+T-1/etc/monitor-promise/check-_ssl_ca_crt_does_not_match-error-log-last-hour
+T-1/etc/monitor-promise/check-_ssl_ca_crt_garbage-error-log-last-day
+T-1/etc/monitor-promise/check-_ssl_ca_crt_garbage-error-log-last-hour
+T-1/etc/monitor-promise/check-_type-eventsource-error-log-last-day
+T-1/etc/monitor-promise/check-_type-eventsource-error-log-last-hour
+T-1/etc/monitor-promise/check-_type-notebook-error-log-last-day
+T-1/etc/monitor-promise/check-_type-notebook-error-log-last-hour
+T-1/etc/monitor-promise/check-_type-redirect-error-log-last-day
+T-1/etc/monitor-promise/check-_type-redirect-error-log-last-hour
+T-1/etc/monitor-promise/check-_type-zope-default-path-error-log-last-day
+T-1/etc/monitor-promise/check-_type-zope-default-path-error-log-last-hour
+T-1/etc/monitor-promise/check-_type-zope-error-log-last-day
+T-1/etc/monitor-promise/check-_type-zope-error-log-last-hour
+T-1/etc/monitor-promise/check-_type-zope-path-error-log-last-day
+T-1/etc/monitor-promise/check-_type-zope-path-error-log-last-hour
+T-1/etc/monitor-promise/check-_type-zope-prefer-gzip-encoding-to-backend-error-log-last-day
+T-1/etc/monitor-promise/check-_type-zope-prefer-gzip-encoding-to-backend-error-log-last-hour
+T-1/etc/monitor-promise/check-_type-zope-ssl-proxy-verify-unverified-error-log-last-day
+T-1/etc/monitor-promise/check-_type-zope-ssl-proxy-verify-unverified-error-log-last-hour
+T-1/etc/monitor-promise/check-_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-day
+T-1/etc/monitor-promise/check-_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-hour
+T-1/etc/monitor-promise/check-_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-day
+T-1/etc/monitor-promise/check-_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-hour
+T-1/etc/monitor-promise/check-_type-zope-virtualhostroot-http-port-error-log-last-day
+T-1/etc/monitor-promise/check-_type-zope-virtualhostroot-http-port-error-log-last-hour
+T-1/etc/monitor-promise/check-_type-zope-virtualhostroot-https-port-error-log-last-day
+T-1/etc/monitor-promise/check-_type-zope-virtualhostroot-https-port-error-log-last-hour
+T-1/etc/monitor-promise/check-_url-error-log-last-day
+T-1/etc/monitor-promise/check-_url-error-log-last-hour
+T-1/etc/monitor-promise/check-_url_https-url-error-log-last-day
+T-1/etc/monitor-promise/check-_url_https-url-error-log-last-hour
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_promise_run_plugin-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_promise_run_plugin-CADDY.txt
index fe37a409c6ae1324dfdb673c52879332cced0d90..ce7700d14001801ddd63f95072ebac96f441f20c 100644
--- a/software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_promise_run_plugin-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_promise_run_plugin-CADDY.txt
@@ -1,113 +1,113 @@
-TestSlaveGlobalDisableHttp2-0/etc/plugin/buildout-TestSlaveGlobalDisableHttp2-0-status.py: OK
-TestSlaveGlobalDisableHttp2-0/etc/plugin/check-free-disk-space.py: OK
-TestSlaveGlobalDisableHttp2-0/etc/plugin/monitor-bootstrap-status.py: OK
-TestSlaveGlobalDisableHttp2-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/buildout-TestSlaveGlobalDisableHttp2-1-status.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/caddy_cached.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/caddy_frontend_ipv4_http.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/caddy_frontend_ipv4_https.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/caddy_frontend_ipv6_http.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/caddy_frontend_ipv6_https.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/caddy_ssl_cached.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_apache_custom_http_s-accepted-error-log-last-day.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_apache_custom_http_s-accepted-error-log-last-hour.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_caddy_custom_http_s-accepted-error-log-last-day.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_caddy_custom_http_s-accepted-error-log-last-hour.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_custom_domain-error-log-last-day.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_custom_domain-error-log-last-hour.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_custom_domain_ssl_crt_ssl_key-error-log-last-day.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_custom_domain_ssl_crt_ssl_key-error-log-last-hour.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_custom_domain_ssl_crt_ssl_key_ssl_ca_crt-error-log-last-day.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_custom_domain_ssl_crt_ssl_key_ssl_ca_crt-error-log-last-hour.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_custom_domain_wildcard-error-log-last-day.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_custom_domain_wildcard-error-log-last-hour.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_disabled-cookie-list-error-log-last-day.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_disabled-cookie-list-error-log-last-hour.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_empty-error-log-last-day.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_empty-error-log-last-hour.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_enable-http2-default-error-log-last-day.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_enable-http2-default-error-log-last-hour.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_enable-http2-false-error-log-last-day.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_enable-http2-false-error-log-last-hour.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_enable_cache-disable-no-cache-request-error-log-last-day.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_enable_cache-disable-no-cache-request-error-log-last-hour.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_enable_cache-disable-via-header-error-log-last-day.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_enable_cache-disable-via-header-error-log-last-hour.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_enable_cache-error-log-last-day.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_enable_cache-error-log-last-hour.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_enable_cache-ssl-proxy-verify-unverified-error-log-last-day.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_enable_cache-ssl-proxy-verify-unverified-error-log-last-hour.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-day.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-hour.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-day.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-hour.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_https-only-error-log-last-day.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_https-only-error-log-last-hour.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_monitor-ipv4-test-error-log-last-day.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_monitor-ipv4-test-error-log-last-hour.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_monitor-ipv4-test-ipv4-packet-list-test.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_monitor-ipv6-test-error-log-last-day.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_monitor-ipv6-test-error-log-last-hour.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_monitor-ipv6-test-ipv6-packet-list-test.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_prefer-gzip-encoding-to-backend-error-log-last-day.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_prefer-gzip-encoding-to-backend-error-log-last-hour.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_re6st-optimal-test-error-log-last-day.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_re6st-optimal-test-error-log-last-hour.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_re6st-optimal-test-re6st-optimal-test.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_server-alias-duplicated-error-log-last-day.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_server-alias-duplicated-error-log-last-hour.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_server-alias-error-log-last-day.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_server-alias-error-log-last-hour.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_server-alias-wildcard-error-log-last-day.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_server-alias-wildcard-error-log-last-hour.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_server-alias_custom_domain-duplicated-error-log-last-day.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_server-alias_custom_domain-duplicated-error-log-last-hour.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_ssl-proxy-verify-unverified-error-log-last-day.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_ssl-proxy-verify-unverified-error-log-last-hour.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-day.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-hour.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-day.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-hour.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_ssl_ca_crt_does_not_match-error-log-last-day.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_ssl_ca_crt_does_not_match-error-log-last-hour.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_ssl_ca_crt_garbage-error-log-last-day.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_ssl_ca_crt_garbage-error-log-last-hour.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_type-eventsource-error-log-last-day.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_type-eventsource-error-log-last-hour.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_type-notebook-error-log-last-day.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_type-notebook-error-log-last-hour.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_type-redirect-error-log-last-day.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_type-redirect-error-log-last-hour.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_type-zope-default-path-error-log-last-day.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_type-zope-default-path-error-log-last-hour.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_type-zope-error-log-last-day.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_type-zope-error-log-last-hour.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_type-zope-path-error-log-last-day.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_type-zope-path-error-log-last-hour.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_type-zope-prefer-gzip-encoding-to-backend-error-log-last-day.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_type-zope-prefer-gzip-encoding-to-backend-error-log-last-hour.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_type-zope-ssl-proxy-verify-unverified-error-log-last-day.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_type-zope-ssl-proxy-verify-unverified-error-log-last-hour.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-day.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-hour.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-day.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-hour.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_type-zope-virtualhostroot-http-port-error-log-last-day.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_type-zope-virtualhostroot-http-port-error-log-last-hour.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_type-zope-virtualhostroot-https-port-error-log-last-day.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_type-zope-virtualhostroot-https-port-error-log-last-hour.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_url-error-log-last-day.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_url-error-log-last-hour.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_url_https-url-error-log-last-day.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_url_https-url-error-log-last-hour.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/check-free-disk-space.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/frontend-caddy-configuration-promise.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/monitor-bootstrap-status.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/nginx-configuration-promise.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/nginx_frontend_ipv4_http.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/nginx_frontend_ipv4_https.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/nginx_frontend_ipv6_http.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/nginx_frontend_ipv6_https.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/re6st-connectivity.py: OK
-TestSlaveGlobalDisableHttp2-1/etc/plugin/trafficserver-port-listening.py: OK
\ No newline at end of file
+T-0/etc/plugin/buildout-T-0-status.py: OK
+T-0/etc/plugin/check-free-disk-space.py: OK
+T-0/etc/plugin/monitor-bootstrap-status.py: OK
+T-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
+T-1/etc/plugin/buildout-T-1-status.py: OK
+T-1/etc/plugin/caddy_cached.py: OK
+T-1/etc/plugin/caddy_frontend_ipv4_http.py: OK
+T-1/etc/plugin/caddy_frontend_ipv4_https.py: OK
+T-1/etc/plugin/caddy_frontend_ipv6_http.py: OK
+T-1/etc/plugin/caddy_frontend_ipv6_https.py: OK
+T-1/etc/plugin/caddy_ssl_cached.py: OK
+T-1/etc/plugin/check-_Url-error-log-last-day.py: OK
+T-1/etc/plugin/check-_Url-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_apache_custom_http_s-accepted-error-log-last-day.py: OK
+T-1/etc/plugin/check-_apache_custom_http_s-accepted-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_caddy_custom_http_s-accepted-error-log-last-day.py: OK
+T-1/etc/plugin/check-_caddy_custom_http_s-accepted-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_custom_domain-error-log-last-day.py: OK
+T-1/etc/plugin/check-_custom_domain-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_custom_domain_ssl_crt_ssl_key-error-log-last-day.py: OK
+T-1/etc/plugin/check-_custom_domain_ssl_crt_ssl_key-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_custom_domain_ssl_crt_ssl_key_ssl_ca_crt-error-log-last-day.py: OK
+T-1/etc/plugin/check-_custom_domain_ssl_crt_ssl_key_ssl_ca_crt-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_custom_domain_wildcard-error-log-last-day.py: OK
+T-1/etc/plugin/check-_custom_domain_wildcard-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_disabled-cookie-list-error-log-last-day.py: OK
+T-1/etc/plugin/check-_disabled-cookie-list-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_empty-error-log-last-day.py: OK
+T-1/etc/plugin/check-_empty-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_enable-http2-default-error-log-last-day.py: OK
+T-1/etc/plugin/check-_enable-http2-default-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_enable-http2-false-error-log-last-day.py: OK
+T-1/etc/plugin/check-_enable-http2-false-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_enable_cache-disable-no-cache-request-error-log-last-day.py: OK
+T-1/etc/plugin/check-_enable_cache-disable-no-cache-request-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_enable_cache-disable-via-header-error-log-last-day.py: OK
+T-1/etc/plugin/check-_enable_cache-disable-via-header-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_enable_cache-error-log-last-day.py: OK
+T-1/etc/plugin/check-_enable_cache-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_enable_cache-ssl-proxy-verify-unverified-error-log-last-day.py: OK
+T-1/etc/plugin/check-_enable_cache-ssl-proxy-verify-unverified-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-day.py: OK
+T-1/etc/plugin/check-_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-day.py: OK
+T-1/etc/plugin/check-_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_https-only-error-log-last-day.py: OK
+T-1/etc/plugin/check-_https-only-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_monitor-ipv4-test-error-log-last-day.py: OK
+T-1/etc/plugin/check-_monitor-ipv4-test-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_monitor-ipv4-test-ipv4-packet-list-test.py: OK
+T-1/etc/plugin/check-_monitor-ipv6-test-error-log-last-day.py: OK
+T-1/etc/plugin/check-_monitor-ipv6-test-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_monitor-ipv6-test-ipv6-packet-list-test.py: OK
+T-1/etc/plugin/check-_prefer-gzip-encoding-to-backend-error-log-last-day.py: OK
+T-1/etc/plugin/check-_prefer-gzip-encoding-to-backend-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_re6st-optimal-test-error-log-last-day.py: OK
+T-1/etc/plugin/check-_re6st-optimal-test-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_re6st-optimal-test-re6st-optimal-test.py: OK
+T-1/etc/plugin/check-_server-alias-duplicated-error-log-last-day.py: OK
+T-1/etc/plugin/check-_server-alias-duplicated-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_server-alias-error-log-last-day.py: OK
+T-1/etc/plugin/check-_server-alias-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_server-alias-wildcard-error-log-last-day.py: OK
+T-1/etc/plugin/check-_server-alias-wildcard-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_server-alias_custom_domain-duplicated-error-log-last-day.py: OK
+T-1/etc/plugin/check-_server-alias_custom_domain-duplicated-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_ssl-proxy-verify-unverified-error-log-last-day.py: OK
+T-1/etc/plugin/check-_ssl-proxy-verify-unverified-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-day.py: OK
+T-1/etc/plugin/check-_ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-day.py: OK
+T-1/etc/plugin/check-_ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_ssl_ca_crt_does_not_match-error-log-last-day.py: OK
+T-1/etc/plugin/check-_ssl_ca_crt_does_not_match-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_ssl_ca_crt_garbage-error-log-last-day.py: OK
+T-1/etc/plugin/check-_ssl_ca_crt_garbage-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_type-eventsource-error-log-last-day.py: OK
+T-1/etc/plugin/check-_type-eventsource-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_type-notebook-error-log-last-day.py: OK
+T-1/etc/plugin/check-_type-notebook-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_type-redirect-error-log-last-day.py: OK
+T-1/etc/plugin/check-_type-redirect-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_type-zope-default-path-error-log-last-day.py: OK
+T-1/etc/plugin/check-_type-zope-default-path-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_type-zope-error-log-last-day.py: OK
+T-1/etc/plugin/check-_type-zope-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_type-zope-path-error-log-last-day.py: OK
+T-1/etc/plugin/check-_type-zope-path-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_type-zope-prefer-gzip-encoding-to-backend-error-log-last-day.py: OK
+T-1/etc/plugin/check-_type-zope-prefer-gzip-encoding-to-backend-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_type-zope-ssl-proxy-verify-unverified-error-log-last-day.py: OK
+T-1/etc/plugin/check-_type-zope-ssl-proxy-verify-unverified-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-day.py: OK
+T-1/etc/plugin/check-_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-day.py: OK
+T-1/etc/plugin/check-_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_type-zope-virtualhostroot-http-port-error-log-last-day.py: OK
+T-1/etc/plugin/check-_type-zope-virtualhostroot-http-port-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_type-zope-virtualhostroot-https-port-error-log-last-day.py: OK
+T-1/etc/plugin/check-_type-zope-virtualhostroot-https-port-error-log-last-hour.py: OK
+T-1/etc/plugin/check-_url_https-url-error-log-last-day.py: OK
+T-1/etc/plugin/check-_url_https-url-error-log-last-hour.py: OK
+T-1/etc/plugin/check-free-disk-space.py: OK
+T-1/etc/plugin/frontend-caddy-configuration-promise.py: OK
+T-1/etc/plugin/monitor-bootstrap-status.py: OK
+T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
+T-1/etc/plugin/nginx-configuration-promise.py: OK
+T-1/etc/plugin/nginx_frontend_ipv4_http.py: OK
+T-1/etc/plugin/nginx_frontend_ipv4_https.py: OK
+T-1/etc/plugin/nginx_frontend_ipv6_http.py: OK
+T-1/etc/plugin/nginx_frontend_ipv6_https.py: OK
+T-1/etc/plugin/re6st-connectivity.py: OK
+T-1/etc/plugin/trafficserver-port-listening.py: OK
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_promise_run_promise-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_promise_run_promise-CADDY.txt
index 77d3ef67d5734debce76138cce7ba0bae6b59146..5105e42af08be204b45dbb4be093052c9805c0f6 100644
--- a/software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_promise_run_promise-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_promise_run_promise-CADDY.txt
@@ -1,4 +1,4 @@
-TestSlaveGlobalDisableHttp2-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK
-TestSlaveGlobalDisableHttp2-1/etc/promise/caddy-frontend-is-running-actual-software-release: OK
-TestSlaveGlobalDisableHttp2-1/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK
-TestSlaveGlobalDisableHttp2-1/etc/promise/promise-nginx-is-process-older-than-dependency-set: OK
\ No newline at end of file
+T-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK
+T-1/etc/promise/caddy-frontend-is-running-actual-software-release: OK
+T-1/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK
+T-1/etc/promise/promise-nginx-is-process-older-than-dependency-set: OK
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_supervisor_state-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_supervisor_state-CADDY.txt
index 1c430ae0737c03012ec9e5bf6ebb8f26b4e6c535..0b1c395e2625beeb399ee94cf4b6c6add3b3fb04 100644
--- a/software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_supervisor_state-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_supervisor_state-CADDY.txt
@@ -1,24 +1,24 @@
-TestSlaveGlobalDisableHttp2-0:bootstrap-monitor EXITED
-TestSlaveGlobalDisableHttp2-0:certificate_authority-{hash}-on-watch RUNNING
-TestSlaveGlobalDisableHttp2-0:crond-{hash} RUNNING
-TestSlaveGlobalDisableHttp2-0:monitor-httpd-{hash}-on-watch RUNNING
-TestSlaveGlobalDisableHttp2-0:monitor-httpd-graceful EXITED
-TestSlaveGlobalDisableHttp2-1:6tunnel-11080-{hash}-on-watch RUNNING
-TestSlaveGlobalDisableHttp2-1:6tunnel-11443-{hash}-on-watch RUNNING
-TestSlaveGlobalDisableHttp2-1:6tunnel-12080-{hash}-on-watch RUNNING
-TestSlaveGlobalDisableHttp2-1:6tunnel-12443-{hash}-on-watch RUNNING
-TestSlaveGlobalDisableHttp2-1:6tunnel-26011-{hash}-on-watch RUNNING
-TestSlaveGlobalDisableHttp2-1:6tunnel-26012-{hash}-on-watch RUNNING
-TestSlaveGlobalDisableHttp2-1:bootstrap-monitor EXITED
-TestSlaveGlobalDisableHttp2-1:certificate_authority-{hash}-on-watch RUNNING
-TestSlaveGlobalDisableHttp2-1:crond-{hash} RUNNING
-TestSlaveGlobalDisableHttp2-1:crond-on-watch RUNNING
-TestSlaveGlobalDisableHttp2-1:frontend-caddy-safe-graceful EXITED
-TestSlaveGlobalDisableHttp2-1:frontend-nginx-safe-graceful EXITED
-TestSlaveGlobalDisableHttp2-1:frontend_caddy-{hash}-on-watch RUNNING
-TestSlaveGlobalDisableHttp2-1:frontend_nginx-{hash}-on-watch RUNNING
-TestSlaveGlobalDisableHttp2-1:monitor-httpd-{hash}-on-watch RUNNING
-TestSlaveGlobalDisableHttp2-1:monitor-httpd-graceful EXITED
-TestSlaveGlobalDisableHttp2-1:trafficserver-{hash}-on-watch RUNNING
-TestSlaveGlobalDisableHttp2-1:trafficserver-reload EXITED
+T-0:bootstrap-monitor EXITED
+T-0:certificate_authority-{hash}-on-watch RUNNING
+T-0:crond-{hash} RUNNING
+T-0:monitor-httpd-{hash}-on-watch RUNNING
+T-0:monitor-httpd-graceful EXITED
+T-1:6tunnel-11080-{hash}-on-watch RUNNING
+T-1:6tunnel-11443-{hash}-on-watch RUNNING
+T-1:6tunnel-12080-{hash}-on-watch RUNNING
+T-1:6tunnel-12443-{hash}-on-watch RUNNING
+T-1:6tunnel-26011-{hash}-on-watch RUNNING
+T-1:6tunnel-26012-{hash}-on-watch RUNNING
+T-1:bootstrap-monitor EXITED
+T-1:certificate_authority-{hash}-on-watch RUNNING
+T-1:crond-{hash} RUNNING
+T-1:crond-on-watch RUNNING
+T-1:frontend-caddy-safe-graceful EXITED
+T-1:frontend-nginx-safe-graceful EXITED
+T-1:frontend_caddy-{hash}-on-watch RUNNING
+T-1:frontend_nginx-{hash}-on-watch RUNNING
+T-1:monitor-httpd-{hash}-on-watch RUNNING
+T-1:monitor-httpd-graceful EXITED
+T-1:trafficserver-{hash}-on-watch RUNNING
+T-1:trafficserver-reload EXITED
 watchdog:watchdog RUNNING
\ No newline at end of file
diff --git a/software/caddy-frontend/test/utils.py b/software/caddy-frontend/test/utils.py
index 67909012c267f0c9e0838da4d72a4354a668baad..c3e1da1e990110619d9336255ccd5937fb69ef6e 100644
--- a/software/caddy-frontend/test/utils.py
+++ b/software/caddy-frontend/test/utils.py
@@ -182,9 +182,10 @@ class SlapOSInstanceTestCase(unittest.TestCase):
       "log_directory": cls.working_directory,
       "computer_id": 'slapos.test',  # XXX
       'proxy_database': os.path.join(cls.working_directory, 'proxy.db'),
-      'partition_reference': cls.__name__,
+      'partition_reference': 'T',  # minimise path length, see https://github.com/apache/trafficserver/issues/2421
       # "proper" slapos command must be in $PATH
       'slapos_binary': 'slapos',
+      'node_quantity': '3',
     }
     # Some tests are expecting that local IP is not set to 127.0.0.1
     ipv4_address = os.environ.get('SLAPOS_TEST_IPV4', '127.0.1.1')
diff --git a/software/erp5/test/utils.py b/software/erp5/test/utils.py
index d7f696db873122a45c9e91cd366596cd1e0237cf..f5c725b52caef632ce1d8ce9f8d4f9822ea9b62f 100644
--- a/software/erp5/test/utils.py
+++ b/software/erp5/test/utils.py
@@ -195,6 +195,7 @@ class SlapOSInstanceTestCase(unittest.TestCase):
       'partition_reference': getattr(cls, '__partition_reference__', cls.__name__),
       # "proper" slapos command must be in $PATH
       'slapos_binary': 'slapos',
+      'node_quantity': '3',
     }
     # Some tests are expecting that local IP is not set to 127.0.0.1
     ipv4_address = os.environ.get('SLAPOS_TEST_IPV4', '127.0.1.1')
diff --git a/software/erp5testnode/testsuite/instance-resilient-test.cfg.jinja2 b/software/erp5testnode/testsuite/instance-resilient-test.cfg.jinja2
index a97c7c9b0913ea868407b12eb6680b3a5e88fc1e..a62632ab52d8249d229cd3d12c38aa6e7295accb 100644
--- a/software/erp5testnode/testsuite/instance-resilient-test.cfg.jinja2
+++ b/software/erp5testnode/testsuite/instance-resilient-test.cfg.jinja2
@@ -54,6 +54,7 @@ config-cpu-usage-ratio = 1
 # This is a way to preserve the latest software release build speeding up
 # the tests.)
 config-software-root = ${buildout:directory}/../../soft
+config-no-ipv4-frontend = true
 # XXX hardcoded
 #config-frontend-domain = google.com
 # XXX Hack to deploy Root Instance on the same computer as the type-test Instance
diff --git a/software/erp5testnode/testsuite/slaprunner.cfg b/software/erp5testnode/testsuite/slaprunner.cfg
index a0855cee02fa3c757ee8dbc35201991b0cd66dbc..9279301d05b0a06b1eeb5a751c4cc9479c094f09 100644
--- a/software/erp5testnode/testsuite/slaprunner.cfg
+++ b/software/erp5testnode/testsuite/slaprunner.cfg
@@ -7,7 +7,7 @@ parts += template-erp5testnode
 
 [template-resilient-test]
 filename = instance-resilient-test.cfg.jinja2 
-md5sum = dadf1e8599ba7d96c5af827ec389a9cf 
+md5sum = b366f23bbac55d9686485dd2d9531a8b
 
 [exporter-default-configuration]
 # Define shorter interaction to speed up tests
diff --git a/software/helloworld/test/utils.py b/software/helloworld/test/utils.py
index be416becb995518ee1aa77bf6bfcb4ea1370eba7..f5fb6c0deb7974a46cacfa5614f78c143981b52c 100644
--- a/software/helloworld/test/utils.py
+++ b/software/helloworld/test/utils.py
@@ -185,6 +185,7 @@ class SlapOSInstanceTestCase(unittest.TestCase):
       'partition_reference': cls.__name__,
       # "proper" slapos command must be in $PATH
       'slapos_binary': 'slapos',
+      'node_quantity': '3',
     }
     # Some tests are expecting that local IP is not set to 127.0.0.1
     ipv4_address = os.environ.get('SLAPOS_TEST_IPV4', '127.0.1.1')
diff --git a/software/kvm/buildout.hash.cfg b/software/kvm/buildout.hash.cfg
index 4f45f5ef81bf5162415e8ce6261f4fc61442d07a..c86adebd7597763fce021babcd2239f17f419f6d 100644
--- a/software/kvm/buildout.hash.cfg
+++ b/software/kvm/buildout.hash.cfg
@@ -19,7 +19,7 @@ md5sum = 028b6a6456d744c11b1bb2c51ecd51b2
 
 [template-kvm]
 filename = instance-kvm.cfg.jinja2
-md5sum = e30912b1256bb093329ee3c108666f05
+md5sum = c51026e815ca43b5de5ddc6cbd8bf1e2
 
 [template-kvm-cluster]
 filename = instance-kvm-cluster.cfg.jinja2.in
@@ -27,7 +27,7 @@ md5sum = 63fa784d8946d0b6e3fbd6381e1ea9f4
 
 [template-kvm-resilient]
 filename = instance-kvm-resilient.cfg.jinja2
-md5sum = c189bce8b196a3b5bcb01526a3f9b2aa
+md5sum = 6677ac6074f6be671fe8e8b8a6a4afe8
 
 [template-kvm-import]
 filename = instance-kvm-import.cfg.jinja2.in
diff --git a/software/kvm/instance-kvm-input-schema.json b/software/kvm/instance-kvm-input-schema.json
index bc7ad4c31b20c5ea6e2d5d3ba9aaf5ca1f235c68..a0a4f67352d68d39a69789e3d03d840194391677 100644
--- a/software/kvm/instance-kvm-input-schema.json
+++ b/software/kvm/instance-kvm-input-schema.json
@@ -278,8 +278,9 @@
     },
     "nat-rules": {
       "title": "List of rules for NAT of QEMU user mode network stack.",
-      "description": "List of rules for NAT of QEMU user mode network stack, as comma-separated list of ports (with optional protocol). For each port specified, it will redirect port x of the VM (example: 80, udp:53) to the port x + 10000 of the public IPv6 (example: 10080, udp:10053). Defaults to \"22 80 443\". Ignored if \"use-tap\" parameter is enabled.",
-      "type": "string"
+      "description": "List of rules for NAT of QEMU user mode network stack, as space-separated list of ports (with optional protocol). For each port specified, it will redirect port x of the VM (example: \"80 udp:53\") to the port x + 10000 of the public IPv6 of the host (example: \"10080 udp:10053\"). Ignored if \"use-tap\" parameter is enabled.",
+      "type": "string",
+      "default": "22 80 443"
     },
     "nat-restrict-mode": {
       "title": "Isolate the NAT Interface (No Internet access)",
diff --git a/software/kvm/instance-kvm-resilient.cfg.jinja2 b/software/kvm/instance-kvm-resilient.cfg.jinja2
index 3888c90a9c4647a888f5c96f75d128c378198f2a..b9209dd252e9b30455904e79ed6a8addae5999f9 100644
--- a/software/kvm/instance-kvm-resilient.cfg.jinja2
+++ b/software/kvm/instance-kvm-resilient.cfg.jinja2
@@ -68,12 +68,14 @@ return =
 # KVM related parameters
 # XXX: return ALL parameters (like nat rules), through jinja
   backend-url url ip
+{{ '  ' }}ipv6-network-info
 
 [publish-connection-information]
 recipe = slapos.cookbook:publish
 backend-url = ${request-kvm:connection-backend-url}
 url = ${request-kvm:connection-url}
 ipv6 = ${request-kvm:connection-ip}
+ipv6-network-info = ${request-kvm:connection-ipv6-network-info}
 monitor-password = ${publish-early:monitor-password}
 monitor-user = ${monitor-publish-parameters:monitor-user}
 {% if monitor_dict -%}
diff --git a/software/kvm/instance-kvm.cfg.jinja2 b/software/kvm/instance-kvm.cfg.jinja2
index fca0e6b9d34fecf9029fdc19c87ba4522b106a1b..36461ec206a1530e6d8fe03f889157d0facbe591 100644
--- a/software/kvm/instance-kvm.cfg.jinja2
+++ b/software/kvm/instance-kvm.cfg.jinja2
@@ -133,7 +133,7 @@ external-disk-number = ${slap-parameter:external-disk-number}
 external-disk-size = ${slap-parameter:external-disk-size}
 external-disk-format = ${slap-parameter:external-disk-format}
 
-{% if enable_http == 'true' or ( use_tap == 'true' and slap_configuration.get('tap-ipv4-addr', '') != "") -%}
+{% if enable_http == 'true' -%}
 httpd-port = ${slap-parameter:httpd-port}
 {% else -%}
 httpd-port = 0
@@ -464,14 +464,14 @@ key_info = Get the publick key file in your VM with the command: wget {{ kvm_htt
 {%   endif %}
 {% endif %}
 
-{% if use_tap == 'true' and slap_configuration.get('tap-ipv4-addr', '') != "" -%}
+{% if use_tap == 'true' and slap_configuration.get('tap-ipv4-addr') -%}
 ipv4-network-info =
-  Use these configurations below to configure IPv4 on interface {{ iface }} in your VM.
-  IFACE={{ iface }}
-  ${network-config-ipv4:ifconfig}
-  ${network-config-ipv4:route-iface}
-  ${network-config-ipv4:route-network}
-  ${network-config-ipv4:route-default}
+  Use this configuration in /etc/network/interfaces to configure IPv4 on interface {{ iface }} in your VM.
+  auto {{ iface }}
+  iface {{ iface }} inet static
+  	address {{ slap_configuration.get('tap-ipv4-addr') }}
+  	netmask {{ slap_configuration.get('tap-ipv4-netmask') }}
+  	gateway {{ slap_configuration.get('tap-ipv4-gateway') }}
 {% if enable_http == 'true' %}
   ${helper:blank-line}
   Or run in your VM the command: wget -O- {{ kvm_http }}/netconfig.sh | /bin/sh -
@@ -479,20 +479,21 @@ ipv4-network-info =
 {% endif %}
 
 ipv6-network-info =
-{% if use_tap == 'true' and slap_configuration.get('tap-ipv6-addr', '') != "" %}
-  Use these configurations below to configure IPv6 on interface {{ iface }} in your VM.
-  IFACE={{ iface }}
-  ip link set dev $IFACE up
-  ${network-config-ipv6:ipv6-add-address}
-  ${network-config-ipv6:ipv6-add-default-route}
+{% if use_tap == 'true' and slap_configuration.get('tap-ipv6-addr') %}
+  Use this configuration in /etc/network/interfaces to configure IPv6 on interface {{ iface }} in your VM.
+  auto {{ iface }}
+  iface {{ iface }} inet6 static
+  	address {{ slap_configuration.get('tap-ipv6-gateway') }}
+  	netmask {{ slap_configuration.get('tap-ipv6-network').split('/')[1] }}
+  	gateway {{ slap_configuration.get('tap-ipv6-addr') }}
 {% if enable_http == 'true' %}
   ${helper:blank-line}
-  Or run in your VM the command: wget -O- {{ kvm_http }}/ipv6_config.sh | /bin/sh -
+  Or run in your VM the command: wget -O- {{ kvm_http }}/${network-config-ipv6:filename} | /bin/sh -
 {% endif %}
 {% endif %}
 
 
-{% if use_tap == 'true' and slap_configuration.get('tap-ipv4-addr', '') != "" -%}
+{% if use_tap == 'true' and slap_configuration.get('tap-ipv4-addr') -%}
 [network-config-ipv4]
 recipe = plone.recipe.command
 path = ${directory:public}/netconfig.sh
@@ -521,19 +522,22 @@ command =
 update-command = ${:command}
 {% endif -%}
 
-{% if use_tap == 'true' and slap_configuration.get('tap-ipv6-addr', '') != "" -%}
+{% if use_tap == 'true' and slap_configuration.get('tap-ipv6-addr') -%}
 [network-config-ipv6]
 recipe = plone.recipe.command
-path = ${directory:public}/ipv6_config.sh
-ipv6-add-address = ip -6 address add {{ slap_configuration.get('tap-ipv6-network') }} dev \$IFACE
+filename = ipv6_config.sh
+path = ${directory:public}/${:filename}
+ipv6-add-address = ip -6 address add {{ slap_configuration.get('tap-ipv6-gateway') }}/{{ slap_configuration.get('tap-ipv6-network').split('/')[1] }} dev \$IFACE
 ipv6-add-default-route =
-  ip -6 route del default ; ip -6 route add default dev \$IFACE via {{ slap_configuration.get('tap-ipv6-gateway') }}
+  ip -6 route del default ; ip -6 route add default dev \$IFACE via {{ slap_configuration.get('tap-ipv6-addr') }}
+ipv6-set-link-up = ip link set dev \$IFACE up
 command =
   cat > ${:path} << EOF
   #!/bin/sh
   IFACE={{ iface }}
   ${:ipv6-add-address}
   ${:ipv6-add-default-route}
+  ${:ipv6-set-link-up}
   EOF
 update-command = ${:command}
 {% endif -%}
@@ -565,7 +569,7 @@ mode = {{ mode }}
 [publish-host-config]
 recipe = plone.recipe.command
 name = {{ slapparameter_dict.get('name', 'localhost') }}
-{% if use_tap == 'true' and slap_configuration.get('tap-ipv4-addr', '') != "" -%}
+{% if use_tap == 'true' and slap_configuration.get('tap-ipv4-addr') -%}
 local-ipv4 = {{ slap_configuration['tap-ipv4-addr'] }}
 gateway = {{ slap_configuration.get('tap-ipv4-gateway') }}
 netmask = {{ slap_configuration.get('tap-ipv4-network') }}
diff --git a/software/kvm/test/utils.py b/software/kvm/test/utils.py
index be416becb995518ee1aa77bf6bfcb4ea1370eba7..f5fb6c0deb7974a46cacfa5614f78c143981b52c 100644
--- a/software/kvm/test/utils.py
+++ b/software/kvm/test/utils.py
@@ -185,6 +185,7 @@ class SlapOSInstanceTestCase(unittest.TestCase):
       'partition_reference': cls.__name__,
       # "proper" slapos command must be in $PATH
       'slapos_binary': 'slapos',
+      'node_quantity': '3',
     }
     # Some tests are expecting that local IP is not set to 127.0.0.1
     ipv4_address = os.environ.get('SLAPOS_TEST_IPV4', '127.0.1.1')
diff --git a/software/monitor/test/utils.py b/software/monitor/test/utils.py
index be416becb995518ee1aa77bf6bfcb4ea1370eba7..f5fb6c0deb7974a46cacfa5614f78c143981b52c 100644
--- a/software/monitor/test/utils.py
+++ b/software/monitor/test/utils.py
@@ -185,6 +185,7 @@ class SlapOSInstanceTestCase(unittest.TestCase):
       'partition_reference': cls.__name__,
       # "proper" slapos command must be in $PATH
       'slapos_binary': 'slapos',
+      'node_quantity': '3',
     }
     # Some tests are expecting that local IP is not set to 127.0.0.1
     ipv4_address = os.environ.get('SLAPOS_TEST_IPV4', '127.0.1.1')
diff --git a/software/plantuml/test/utils.py b/software/plantuml/test/utils.py
index 3c81f97596d576bb99672fcf76c6462995f05672..8996616ca963178db024555e9d31df610e051784 100644
--- a/software/plantuml/test/utils.py
+++ b/software/plantuml/test/utils.py
@@ -185,6 +185,7 @@ class SlapOSInstanceTestCase(unittest.TestCase):
       'partition_reference': cls.__name__,
       # "proper" slapos command must be in $PATH
       'slapos_binary': 'slapos',
+      'node_quantity': '3',
     }
     # Some tests are expecting that local IP is not set to 127.0.0.1
     ipv4_address = os.environ.get('SLAPOS_TEST_IPV4', '127.0.1.1')
diff --git a/software/powerdns/test/utils.py b/software/powerdns/test/utils.py
index be416becb995518ee1aa77bf6bfcb4ea1370eba7..f5fb6c0deb7974a46cacfa5614f78c143981b52c 100644
--- a/software/powerdns/test/utils.py
+++ b/software/powerdns/test/utils.py
@@ -185,6 +185,7 @@ class SlapOSInstanceTestCase(unittest.TestCase):
       'partition_reference': cls.__name__,
       # "proper" slapos command must be in $PATH
       'slapos_binary': 'slapos',
+      'node_quantity': '3',
     }
     # Some tests are expecting that local IP is not set to 127.0.0.1
     ipv4_address = os.environ.get('SLAPOS_TEST_IPV4', '127.0.1.1')
diff --git a/software/proftpd/test/utils.py b/software/proftpd/test/utils.py
index be416becb995518ee1aa77bf6bfcb4ea1370eba7..f5fb6c0deb7974a46cacfa5614f78c143981b52c 100644
--- a/software/proftpd/test/utils.py
+++ b/software/proftpd/test/utils.py
@@ -185,6 +185,7 @@ class SlapOSInstanceTestCase(unittest.TestCase):
       'partition_reference': cls.__name__,
       # "proper" slapos command must be in $PATH
       'slapos_binary': 'slapos',
+      'node_quantity': '3',
     }
     # Some tests are expecting that local IP is not set to 127.0.0.1
     ipv4_address = os.environ.get('SLAPOS_TEST_IPV4', '127.0.1.1')
diff --git a/software/re6stnet/test/utils.py b/software/re6stnet/test/utils.py
index be416becb995518ee1aa77bf6bfcb4ea1370eba7..f5fb6c0deb7974a46cacfa5614f78c143981b52c 100644
--- a/software/re6stnet/test/utils.py
+++ b/software/re6stnet/test/utils.py
@@ -185,6 +185,7 @@ class SlapOSInstanceTestCase(unittest.TestCase):
       'partition_reference': cls.__name__,
       # "proper" slapos command must be in $PATH
       'slapos_binary': 'slapos',
+      'node_quantity': '3',
     }
     # Some tests are expecting that local IP is not set to 127.0.0.1
     ipv4_address = os.environ.get('SLAPOS_TEST_IPV4', '127.0.1.1')
diff --git a/software/seleniumserver/test/utils.py b/software/seleniumserver/test/utils.py
index 3c81f97596d576bb99672fcf76c6462995f05672..8996616ca963178db024555e9d31df610e051784 100644
--- a/software/seleniumserver/test/utils.py
+++ b/software/seleniumserver/test/utils.py
@@ -185,6 +185,7 @@ class SlapOSInstanceTestCase(unittest.TestCase):
       'partition_reference': cls.__name__,
       # "proper" slapos command must be in $PATH
       'slapos_binary': 'slapos',
+      'node_quantity': '3',
     }
     # Some tests are expecting that local IP is not set to 127.0.0.1
     ipv4_address = os.environ.get('SLAPOS_TEST_IPV4', '127.0.1.1')
diff --git a/software/slapos-master/apache-backend.conf.in b/software/slapos-master/apache-backend.conf.in
index e1e8914d84427c56346c551a80a75c02494ba1d9..2d1f4e2823ed5eaaf38fa54e2527e96642a45900 100644
--- a/software/slapos-master/apache-backend.conf.in
+++ b/software/slapos-master/apache-backend.conf.in
@@ -187,6 +187,7 @@ Listen {{ ip }}:{{ port }}
 Listen {{ ip }}:{{ port }}
 <VirtualHost {{ ip }}:{{ port }}>
   SSLEngine on
+  Timeout 3600
 {%   if enable_authentication and parameter_dict['ca-cert'] and parameter_dict['crl'] -%}
   SSLVerifyClient require
   SSLCACertificateFile {{ parameter_dict['ca-cert'] }}
diff --git a/software/slapos-master/buildout.hash.cfg b/software/slapos-master/buildout.hash.cfg
index 3c6be7f7d8e87e710e6767c72cd12c90688f068c..a0f8026bf0c899a521beb07382275df3e96136df 100644
--- a/software/slapos-master/buildout.hash.cfg
+++ b/software/slapos-master/buildout.hash.cfg
@@ -14,12 +14,12 @@
 # not need these here).
 [template-erp5]
 filename = instance-erp5.cfg.in
-md5sum = a617197b7be3cc40d97a97c75f923a48
+md5sum = edf81a602137858cd5835c050ac6e08c
 
 [template-balancer]
 filename = instance-balancer.cfg.in
-md5sum = 0f0ff00eca0b2ba1f1626b6415acb719
+md5sum = 356cb73670ea4599ad608b29fb86b278
 
 [template-apache-backend-conf]
 filename = apache-backend.conf.in
-md5sum = 7d1d13f4a888c2735ff8d7a4a961d9b2
+md5sum = c16342bd6af60296aa4325677f5827c4
diff --git a/software/slapos-master/instance-balancer.cfg.in b/software/slapos-master/instance-balancer.cfg.in
index 6b7efc28bd149308bb76c3175bd25c924944b725..96d0651c5e197fef4a8fafef4762d7db2f721e2a 100644
--- a/software/slapos-master/instance-balancer.cfg.in
+++ b/software/slapos-master/instance-balancer.cfg.in
@@ -1,8 +1,7 @@
+{% import "caucase" as caucase with context %}
 {% set part_list = [] -%}
-{% set ssl_parameter_dict = slapparameter_dict.get('ssl', {}) %}
-{% set caucase_url = slapparameter_dict.get('caucase-url', '') -%}
 {% macro section(name) %}{% do part_list.append(name) %}{{ name }}{% endmacro -%}
-{% set use_ipv6 = slapparameter_dict.get('use-ipv6', False) -%}
+{% set ssl_parameter_dict = slapparameter_dict['ssl'] -%}
 {% set shared_ca_path = slapparameter_dict.get('shared-certificate-authority-path') -%}
 {#
 XXX: This template only supports exactly one IPv4 and (if ipv6 is used) one IPv6
@@ -22,80 +21,23 @@ per partition. No more (undefined result), no less (IndexError).
 recipe = slapos.recipe.template:jinja2
 mode = 644
 
-[simplefile]
-< = jinja2-template-base
-template = inline:{{ '{{ content }}' }}
-
-{% macro simplefile(section_name, file_path, content, mode='') -%}
-{%   set content_section_name = section_name ~ '-content' -%}
-[{{  content_section_name }}]
-content = {{ dumps(content) }}
-
-[{{  section(section_name) }}]
-< = simplefile
-rendered = {{ file_path }}
-context = key content {{content_section_name}}:content
-mode = {{ mode }}
-{%- endmacro %}
-
-[certificate-request-base]
-recipe = slapos.cookbook:wrapper
-wrapper-path = ${directory:bin}/request-instance-certificate
-command-line = {{ parameter_dict['bin-directory'] }}/caucase-cliweb
-  --crt-file ${apache-conf-ssl:cert}
-  --key-file ${apache-conf-ssl:key}
-  --crl-file ${apache-conf-ssl:crl}
-  --ca-url {{ caucase_url }}
-  --ca-crt-file ${apache-conf-ssl:ca-cert}
+{{ caucase.updater(
+     prefix='caucase-updater',
+     buildout_bin_directory=parameter_dict['bin-directory'],
+     updater_path='${directory:services-on-watch}/caucase-updater',
+     url=ssl_parameter_dict['caucase-url'],
+     data_dir='${directory:srv}/caucase-updater',
+     crt_path='${apache-conf-ssl:cert}',
+     ca_path='${apache-conf-ssl:ca-cert}',
+     crl_path='${apache-conf-ssl:crl}',
+     key_path='${apache-conf-ssl:key}',
+     on_renew='${apache-graceful:output}',
+     max_sleep=ssl_parameter_dict.get('max-crl-update-delay', 1.0),
+     template_csr_pem=ssl_parameter_dict.get('csr'),
+     openssl=parameter_dict['openssl'] ~ '/bin/openssl',
+)}}
+{% do section('caucase-updater') -%}
 
-{% macro request_cert(name, common_name) -%}
-{% set get_crl_periodicity = slapparameter_dict.get('crl-update-periodicity', 'daily') -%}
-
-[{{ section(name ~ '-certificate-request') }}]
-recipe = slapos.cookbook:wrapper
-wrapper-path = ${directory:services}/request-{{ name }}-certificate
-command-line =
-  ${certificate-request-base:wrapper-path}
-  --cn {{ common_name }}
-  --request
-
-[{{ section(name ~ '-renew-cron-entry') }}]
-recipe = slapos.cookbook:cron.d
-cron-entries = ${cron:cron-entries}
-name = {{ name }}-certificate-auto-renew
-time = weekly
-# 2592000 = 30*24*60*60  equivalent to one month in seconds
-command = ${certificate-request-base:wrapper-path} --renew --threshold 2592000 --on-renew="${apache-graceful:output}"
-
-[{{ section(name ~ '-download-crl') }}]
-# download the crl for the first time
-recipe = plone.recipe.command
-command = 
-  if [ ! -s "${apache-conf-ssl:crl}" ]; then
-    ${certificate-request-base:wrapper-path} --update-crl
-  fi
-update-command = ${:command}
-stop-on-error = true
-
-[{{ section(name ~ '-update-crl-cron-entry') }}]
-recipe = slapos.cookbook:cron.d
-cron-entries = ${cron:cron-entries}
-name = {{ name }}-update-crl
-time = {{ get_crl_periodicity }}
-# XXX - Update crl call apache graceful restart, it's not recommended to check crl too often, Apache
-# has an issue with reload and can be frozen and stop responding. Default periodicity time = daily
-command = ${certificate-request-base:wrapper-path} --update-crl --on-crl-update="${apache-graceful:output}"
-{%- endmacro %}
-
-{% if use_ipv6 -%}
-[zope-tunnel-base]
-recipe = slapos.cookbook:ipv4toipv6
-runner-path = ${directory:services}/${:base-name}
-6tunnel-path = {{ parameter_dict['6tunnel'] }}/bin/6tunnel
-shell-path = {{ parameter_dict['dash'] }}/bin/dash
-ipv4 = {{ ipv4 }}
-
-{% endif -%}
 {% set haproxy_dict = {} -%}
 {% set apache_dict = {} -%}
 {% set zope_virtualhost_monster_backend_dict = {} %}
@@ -112,18 +54,7 @@ ipv4 = {{ ipv4 }}
 {%       if webdav -%}
 {%         do has_webdav.append(None) %}
 {%       endif -%}
-{%       if use_ipv6 -%}
-{%         set current_port = next_port() -%}
-[{{ section('zope-tunnel-' ~ current_port) }}]
-< = zope-tunnel-base
-base-name = {{ 'zeo-tunnel-' ~ current_port }}
-ipv4-port = {{ current_port }}
-ipv6-port = {{ zope_address.split(']:')[1] }}
-ipv6 = {{ zope_address.split(']:')[0][1:] }}
-{%         set zope_effective_address = ipv4 ~ ":" ~ current_port -%}
-{%       else -%}
-{%         set zope_effective_address = zope_address -%}
-{%       endif -%}
+{%       set zope_effective_address = zope_address -%}
 {%       do zope_family_address_list.append((zope_effective_address, maxconn, webdav)) -%}
 
 {#       # Generate entries with rewrite rule for test runnners #}
@@ -163,7 +94,7 @@ ipv6 = {{ zope_address.split(']:')[0][1:] }}
 {%     set internal_scheme = 'http' -%}
 {%     set external_scheme = 'https' -%}
 {%   endif -%}
-{%   do apache_dict.__setitem__(family_name, (next_port(), external_scheme, internal_scheme ~ '://' ~ ipv4 ~ ':' ~ haproxy_port ~ backend_path, ssl_authentication)) -%}
+{%   do apache_dict.__setitem__(family_name, (next_port(), external_scheme, internal_scheme ~ '://' ~ ipv4 ~ ':' ~ haproxy_port ~ backend_path, slapparameter_dict['ssl-authentication-dict'].get(family_name, False))) -%}
 {% endfor -%}
 
 [haproxy-cfg-parameter-dict]
@@ -185,8 +116,6 @@ wrapper-path = ${directory:services}/haproxy
 command-line = "{{ parameter_dict['haproxy'] }}/sbin/haproxy" -f "${haproxy-cfg:rendered}"
 hash-files = ${haproxy-cfg:rendered}
 
-{# TODO: build socat and wrap it as "${directory:bin}/haproxy-ctl" to connect to "${haproxy-cfg-parameter-dict:socket-path}" #}
-
 [apache-conf-ssl]
 cert = ${directory:apache-conf}/apache.crt
 key = ${directory:apache-conf}/apache.pem
@@ -204,17 +133,17 @@ access-log = ${directory:log}/apache-access.log
 # Apache 2.4's default value (60 seconds) can be a bit too short
 timeout = 300
 # Basic SSL server configuration
-cert = ${apache-ssl:cert}
-key = ${apache-ssl:key}
+cert = ${apache-conf-ssl:cert}
+key = ${apache-conf-ssl:key}
 cipher =
 ssl-session-cache = ${directory:log}/apache-ssl-session-cache
 # Client x509 auth
-ca-cert = ${apache-ssl-client:cert}
-crl = ${apache-ssl-client:crl}
+ca-cert = ${apache-conf-ssl:ca-cert}
+crl = ${apache-conf-ssl:crl}
 
 {% if shared_ca_path -%}
-shared-ca-cert = {{ shared_ca_path }}/cacert.pem 
-shared-crl = {{ shared_ca_path }}/crl
+shared-ca-cert = {{ shared_ca_path }}/cacert.pem
+shared-crl = {{ shared_ca_path }}/crl 
 {%- endif %}
 
 [apache-conf]
@@ -233,13 +162,12 @@ wait-for-files =
 
 [apache-graceful]
 recipe = collective.recipe.template
+output = ${directory:bin}/apache-httpd-graceful
+mode = 700
 input = inline:
   #!/bin/sh
   kill -USR1 "$(cat '${apache-conf-parameter-dict:pid-file}')"
 
-output = ${directory:bin}/apache-httpd-graceful
-mode = 700
-
 [{{ section('apache-promise') }}]
 # Check any apache port in ipv4, expect other ports and ipv6 to behave consistently
 recipe = slapos.cookbook:check_port_listening
@@ -259,39 +187,6 @@ recipe = slapos.cookbook:publish.serialised
 
 monitor-base-url = ${monitor-publish-parameters:monitor-base-url}
 
-[apache-ssl]
-{% if ssl_parameter_dict.get('key') -%}
-key = ${apache-ssl-key:rendered}
-cert = ${apache-ssl-cert:rendered}
-{{ simplefile('apache-ssl-key', '${apache-conf-ssl:key}', ssl_parameter_dict['key']) }}
-{{ simplefile('apache-ssl-cert', '${apache-conf-ssl:cert}', ssl_parameter_dict['cert']) }}
-{% elif caucase_url -%}
-key = ${apache-conf-ssl:key}
-cert = ${apache-conf-ssl:cert}
-
-{{ request_cert('erp5', 'instance.apache@erp5') }}
-{% else %}
-recipe = plone.recipe.command
-command = "{{ parameter_dict['openssl'] }}/bin/openssl" req -newkey rsa -batch -new -x509 -days 3650 -nodes -keyout "${:key}" -out "${:cert}"
-key = ${apache-conf-ssl:key}
-cert = ${apache-conf-ssl:cert}
-{%- endif %}
-
-[apache-ssl-client]
-{% if ssl_parameter_dict.get('ca-cert') -%}
-cert = ${apache-ssl-ca:rendered}
-crl = ${apache-ssl-crl:rendered}
-{{ simplefile('apache-ssl-ca', '${apache-conf-ssl:ca-cert}', ssl_parameter_dict['ca-cert']) }}
-{{ simplefile('apache-ssl-crl', '${apache-conf-ssl:crl}', ssl_parameter_dict['crl']) }}
-{% elif caucase_url -%}
-cert = ${apache-conf-ssl:ca-cert}
-crl = ${apache-conf-ssl:crl}
-
-{% else %}
-cert =
-crl =
-{%- endif %}
-
 {% set apache_service_log_list = {} -%}
 {% for family_name, (_, _, _, authentication) in apache_dict.items() -%}
 {%   if authentication -%}
@@ -319,6 +214,7 @@ bin = ${buildout:directory}/bin
 etc = ${buildout:directory}/etc
 promise = ${:etc}/promise
 services = ${:etc}/run
+services-on-watch = ${:etc}/service
 var = ${buildout:directory}/var
 run = ${:var}/run
 log = ${:var}/log
diff --git a/software/slapos-master/instance-erp5.cfg.in b/software/slapos-master/instance-erp5.cfg.in
index 306443ddc9c7400c333ee45980d2bcb650300a71..87b10818d51e4edfc6f0be7af31c109433c6daf3 100644
--- a/software/slapos-master/instance-erp5.cfg.in
+++ b/software/slapos-master/instance-erp5.cfg.in
@@ -1,4 +1,5 @@
 {% import "root_common" as root_common with context -%}
+{% import "caucase" as caucase with context %}
 {% set frontend_dict = slapparameter_dict.get('frontend', {}) -%}
 {% set has_frontend = frontend_dict.get('software-url', '') != '' -%}
 {% set site_id = slapparameter_dict.get('site-id', 'erp5') -%}
@@ -19,13 +20,13 @@
 {%   set test_runner_enabled = mariadb_test_database_amount > 0 %}
 {% endif -%}
 {% set monitor_base_url_dict = {} -%}
-{% set caucase_url = slapparameter_dict.get('caucase', {}).pop('url', '') -%}
 {% set monitor_dict = slapparameter_dict.get('monitor', {}) %}
-{% set crl_update_period = slapparameter_dict.get('caucase', {}).pop('crl-update-periodicity', 'daily') -%}
+{% set use_ipv6 = slapparameter_dict.get('use-ipv6', False) -%}
 [request-common]
 <= request-common-base
 config-use-ipv6 = {{ dumps(slapparameter_dict.get('use-ipv6', False)) }}
 config-computer-memory-percent-threshold = {{ dumps(monitor_dict.get('computer-memory-percent-threshold', 80)) }}
+{% set caucase_url = slapparameter_dict.get('caucase', {}).pop('url', '') -%}
 
 {% macro request(name, software_type, config_key, config, ret={'url': True}, key_config={}) -%}
 {% do config.update(slapparameter_dict.get(config_key, {})) -%}
@@ -53,6 +54,44 @@ config-{{ k }} = {{ '${' ~ v ~ '}' }}
 config-name = {{ name }}
 {% endmacro -%}
 
+[directory]
+recipe = slapos.cookbook:mkdirectory
+etc = ${buildout:directory}/etc
+promise = ${:etc}/promise
+service-on-watch = ${:etc}/service
+srv = ${buildout:directory}/srv
+backup-caucased = ${:srv}/backup/caucased
+
+{% set caucase_dict = slapparameter_dict.get('caucase', {}) -%}
+{% set caucase_url = caucase_dict.get('url') -%}
+{% if not caucase_url -%}
+{%   if use_ipv6 -%}
+{%     set caucase_host = '[' ~ (ipv6_set | list)[0] ~ ']' %}
+{%-  else -%}
+{%     set caucase_host = (ipv4_set | list)[0] %}
+{%-  endif %}
+{%   set caucase_port = caucase_dict.get('base-port', 8890) -%}
+{%   set caucase_netloc = caucase_host ~ ':' ~ caucase_port -%}
+{%   set caucase_url = 'http://' ~ caucase_netloc -%}
+{{   caucase.caucased(
+       prefix='caucased',
+       buildout_bin_directory=bin_directory,
+       caucased_path='${directory:service-on-watch}/caucased',
+       backup_dir='${directory:backup-caucased}',
+       data_dir='${directory:srv}/caucased',
+       netloc=caucase_netloc,
+       service_auto_approve_count=caucase_dict.get('service-auto-approve-amount', 1),
+       user_auto_approve_count=caucase_dict.get('user-auto-approve-amount', 0),
+       key_len=caucase_dict.get('key-length', 2048),
+       promise='${directory:promise}/caucased',
+)}}
+{% do root_common.section('caucased') -%}
+{% do root_common.section('caucased-promise') -%}
+{% endif -%}
+{% do publish_dict.__setitem__('caucase-http-url', caucase_url) -%}
+{% set balancer_dict = slapparameter_dict.get('balancer', {}) -%}
+{% do balancer_dict.setdefault('ssl', {}).setdefault('caucase-url', caucase_url) -%}
+
 {{ request('memcached-persistent', 'kumofs', 'kumofs', {'tcpv4-port': 2000}, {'url': True, 'monitor-base-url': False}, key_config={'monitor-passwd': 'monitor-htpasswd:passwd'}) }}
 {{ request('memcached-volatile', 'kumofs', 'memcached', {'tcpv4-port': 2010, 'ram-storage-size': 64}, {'url': True, 'monitor-base-url': False}, key_config={'monitor-passwd': 'monitor-htpasswd:passwd'}) }}
 {{ request('mariadb', 'mariadb', 'mariadb', {'tcpv4-port': 2099, 'max-slowqueries-threshold': monitor_dict.get('max-slowqueries-threshold', 1000), 'slowest-query-threshold': monitor_dict.get('slowest-query-threshold', ''), 'test-database-amount': test_runner_total_database_count}, {'database-list': True, 'test-database-list': True, 'monitor-base-url': False}, key_config={'monitor-passwd': 'monitor-htpasswd:passwd'}) }}
@@ -64,14 +103,6 @@ config-name = {{ name }}
 connection-url = smtp://127.0.0.2:0/
 {%- endif %}
 
-{% if caucase_url -%}
-{%   do publish_dict.__setitem__('caucase-http-url', caucase_url) -%}
-[request-caucase]
-connection-http-url = {{ caucase_url }}
-{%- else %}
-{{ request('caucase', 'caucase', 'caucase', {'server-port': 8890, 'server-https-port': 8891, 'auto-sign-csr-amount': 2}, {'http-url': True, 'https-url': False}) }}
-{% endif -%}
-
 {# ZODB -#}
 {% set zodb_dict = {} -%}
 {% set storage_dict = {} -%}
@@ -124,14 +155,16 @@ return =
 {% endif -%}
 config-bt5 = {{ dumps(slapparameter_dict.get('bt5', bt5_default_list)) }}
 config-bt5-repository-url = {{ dumps(slapparameter_dict.get('bt5-repository-url', local_bt5_repository)) }}
-config-caucase-url = ${request-caucase:connection-http-url}
 config-cloudooo-url = {{ dumps(slapparameter_dict.get('cloudooo-url', default_cloudooo_url)) }}
+config-caucase-url = {{ dumps(caucase_url) }}
 config-deadlock-debugger-password = ${publish-early:deadlock-debugger-password}
 config-developer-list = {{ dumps(slapparameter_dict.get('developer-list', [inituser_login])) }}
 config-saucelabs-dict = {{ dumps(slapparameter_dict.get('saucelabs-dict', {})) }}
 config-hosts-dict = {{ dumps(slapparameter_dict.get('hosts-dict', {})) }}
 config-hostalias-dict = {{ dumps(slapparameter_dict.get('hostalias-dict', {})) }}
 config-id-store-interval = {{ dumps(slapparameter_dict.get('id-store-interval')) }}
+config-zope-longrequest-logger-error-threshold = {{ dumps(monitor_dict.get('zope-longrequest-logger-error-threshold', 20)) }}
+config-zope-longrequest-logger-maximum-delay = {{ dumps(monitor_dict.get('zope-longrequest-logger-maximum-delay', 0)) }}
 config-inituser-login = {{ dumps(inituser_login) }}
 config-inituser-password = ${publish-early:inituser-password}
 config-kumofs-url = ${request-memcached-persistent:connection-url}
@@ -282,7 +315,6 @@ command =
   chmod 644 ${apache-certificate-authority:ca-dir}/openssl.cnf
 update-command = ${:command}
 
-{% set balancer_dict = slapparameter_dict.get('balancer', {}) -%}
 [request-balancer]
 <= request-common
 name = balancer
@@ -298,7 +330,6 @@ return =
   {% endif %}
 {% endfor -%}
 {% do monitor_base_url_dict.__setitem__('request-balancer', '${' ~ 'request-balancer' ~ ':connection-monitor-base-url}') -%}
-
 config-zope-family-dict = {{ dumps(zope_family_parameter_dict) }}
 config-tcpv4-port = {{ dumps(balancer_dict.get('tcpv4-port', 2150)) }}
 {% for zope_section_id, name in zope_address_list_id_dict.items() -%}
@@ -309,11 +340,9 @@ config-{{ name }}-test-runner-address-list = {{ ' ${' ~ zope_section_id ~ ':conn
 {% endfor -%}
 # XXX: should those really be same for all families ?
 config-haproxy-server-check-path = {{ dumps(balancer_dict.get('haproxy-server-check-path', '/') % {'site-id': site_id}) }}
-config-ssl = {{ dumps(balancer_dict.get('ssl', {})) }}
 config-monitor-passwd = ${monitor-htpasswd:passwd}
+config-ssl = {{ dumps(balancer_dict['ssl']) }}
 config-name = ${:name}
-config-caucase-url = ${request-caucase:connection-http-url}
-config-crl-update-periodicity = {{ crl_update_period }}
 config-shared-certificate-authority-path = ${directory:ca-dir} 
 config-backend-path-dict = {{ dumps(zope_backend_path_dict) }}
 config-ssl-authentication-dict = {{ dumps(ssl_authentication_dict) }}
@@ -444,4 +473,3 @@ password = ${monitor-htpasswd:passwd}
 {% for key, value in monitor_base_url_dict.items() -%}
 {{ key }} = {{ value }}
 {% endfor %}
-
diff --git a/software/slapos-master/software.cfg b/software/slapos-master/software.cfg
index c596aacefa0c4b024fbe136ab926c996bec9cd8f..b2590317e3192d89a3ad7efb870eab102cdd9918 100644
--- a/software/slapos-master/software.cfg
+++ b/software/slapos-master/software.cfg
@@ -68,3 +68,4 @@ revision = 1ac787e9b408b4dfc46350123899ac64c1b530e8
 
 [versions]
 python-memcached = 1.47
+xml-marshaller = 1.0.2
diff --git a/software/slapos-master/test/README.md b/software/slapos-master/test/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..333edab8855fc85cc5e65aeb50e35efdfd772308
--- /dev/null
+++ b/software/slapos-master/test/README.md
@@ -0,0 +1 @@
+Tests for ERP5 software release
diff --git a/software/slapos-master/test/setup.py b/software/slapos-master/test/setup.py
new file mode 100644
index 0000000000000000000000000000000000000000..8400700af5acb09ec9f3586e8dbd2d821d43464b
--- /dev/null
+++ b/software/slapos-master/test/setup.py
@@ -0,0 +1,52 @@
+##############################################################################
+#
+# Copyright (c) 2018 Nexedi SA and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+from setuptools import setup, find_packages
+
+version = '0.0.1.dev0'
+name = 'slapos.test.slapos-master'
+long_description = open("README.md").read()
+
+setup(name=name,
+      version=version,
+      description="Test for SlapOS' Slapos Master software releae",
+      long_description=long_description,
+      long_description_content_type='text/markdown',
+      maintainer="Nexedi",
+      maintainer_email="info@nexedi.com",
+      url="https://lab.nexedi.com/nexedi/slapos",
+      packages=find_packages(),
+      install_requires=[
+        'slapos.core',
+        'supervisor',
+        'slapos.libnetworkcache',
+        'erp5.util',
+        'psutil',
+        'requests',
+        ],
+      zip_safe=True,
+      test_suite='test',
+    )
diff --git a/software/slapos-master/test/test/__init__.py b/software/slapos-master/test/test/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..8501814df902a077145daadad2faa767f23fcd9f
--- /dev/null
+++ b/software/slapos-master/test/test/__init__.py
@@ -0,0 +1,39 @@
+##############################################################################
+#
+# Copyright (c) 2018 Nexedi SA and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+
+import os
+import unittest
+import logging
+
+if os.environ.get('DEBUG'):
+  raise ValueError("Don't set DEBUG - it breaks postfix compilation - set SLAPOS_TEST_DEBUG instead.")
+
+debug_mode = os.environ.get('SLAPOS_TEST_DEBUG')
+# for development: debugging logs and install Ctrl+C handler
+if debug_mode:
+  logging.basicConfig(level=logging.DEBUG)
+  unittest.installHandler()
diff --git a/software/slapos-master/test/test/test_erp5.py b/software/slapos-master/test/test/test_erp5.py
new file mode 100644
index 0000000000000000000000000000000000000000..63b22b218404b976c38ac8854346314198dd44af
--- /dev/null
+++ b/software/slapos-master/test/test/test_erp5.py
@@ -0,0 +1,116 @@
+##############################################################################
+#
+# Copyright (c) 2018 Nexedi SA and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+
+import os
+import json
+import glob
+import urlparse
+import logging
+import time
+
+import requests
+
+from utils import SlapOSInstanceTestCase
+
+
+class ERP5TestCase(SlapOSInstanceTestCase):
+  """Test the remote driver on a minimal web server.
+  """
+  logger = logging.getLogger(__name__)
+  @classmethod
+  def getSoftwareURLList(cls):
+    return (os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..', 'software.cfg')), )
+
+  def getRootPartitionConnectionParameterDict(self):
+    """Return the output paramters from the root partition"""
+    return json.loads(
+        self.computer_partition.getConnectionParameterDict()['_'])
+
+
+class TestPublishedURLIsReachableMixin(object):
+  """Mixin that checks that default page of ERP5 is reachable.
+  """
+  def _checkERP5IsReachable(self, url):
+    # What happens is that instanciation just create the services, but does not
+    # wait for ERP5 to be initialized. When this test run ERP5 instance is
+    # instanciated, but zope is still busy creating the site and haproxy replies
+    # with 503 Service Unavailable.
+    # If we can move the "create site" in slapos node instance, then this retry loop
+    # would not be necessary.
+    for i in range(1, 20):
+      r = requests.get(url, verify=False) # XXX can we get CA from caucase already ?
+      if r.status_code == requests.codes.service_unavailable:
+        delay = i * 2
+        self.logger.warn("ERP5 was not available, sleeping for %ds and retrying", delay)
+        time.sleep(delay)
+        continue
+      if r.status_code != requests.codes.ok:
+        r.raise_for_status()
+      break
+
+    self.assertIn("ERP5", r.text)
+
+  def test_published_family_default_v6_is_reachable(self):
+    """Tests the IPv6 URL published by the root partition is reachable.
+    """
+    param_dict = self.getRootPartitionConnectionParameterDict()
+    self._checkERP5IsReachable(
+      urlparse.urljoin(param_dict['family-default-v6'], param_dict['site-id']))
+
+  def test_published_family_default_v4_is_reachable(self):
+    """Tests the IPv4 URL published by the root partition is reachable.
+    """
+    param_dict = self.getRootPartitionConnectionParameterDict()
+    self._checkERP5IsReachable(
+      urlparse.urljoin(param_dict['family-default'], param_dict['site-id']))
+
+
+class TestDefaultParameters(ERP5TestCase, TestPublishedURLIsReachableMixin):
+  """Test ERP5 can be instanciated with no parameters
+  """
+  __partition_reference__ = 'defp'
+
+
+class TestDisableTestRunner(ERP5TestCase, TestPublishedURLIsReachableMixin):
+  """Test ERP5 can be instanciated without test runner.
+  """
+  __partition_reference__ = 'distr'
+  @classmethod
+  def getInstanceParameterDict(cls):
+    return {'_': json.dumps({'test-runner': {'enabled': False}})}
+
+  def test_no_runUnitTestScript(self):
+    """No runUnitTest script should be generated in any partition.
+    """
+    # self.computer_partition_root_path is the path of root partition.
+    # we want to assert that no scripts exist in any partition.
+    bin_programs = [os.path.basename(path) for path in
+      glob.glob("{}/../*/bin/*".format(self.computer_partition_root_path))]
+
+    self.assertTrue(bin_programs) # just to check the glob was correct.
+    self.assertNotIn('runUnitTest', bin_programs)
+    self.assertNotIn('runTestSuite', bin_programs)
diff --git a/software/slapos-master/test/utils.py b/software/slapos-master/test/utils.py
new file mode 100644
index 0000000000000000000000000000000000000000..f5c725b52caef632ce1d8ce9f8d4f9822ea9b62f
--- /dev/null
+++ b/software/slapos-master/test/utils.py
@@ -0,0 +1,331 @@
+##############################################################################
+#
+# Copyright (c) 2018 Nexedi SA and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+
+import unittest
+import os
+import socket
+from contextlib import closing
+import logging
+import StringIO
+import xmlrpclib
+
+import supervisor.xmlrpc
+from erp5.util.testnode.SlapOSControler import SlapOSControler
+from erp5.util.testnode.ProcessManager import ProcessManager
+
+
+# Utility functions
+def findFreeTCPPort(ip=''):
+  """Find a free TCP port to listen to.
+  """
+  family = socket.AF_INET6 if ':' in ip else socket.AF_INET
+  with closing(socket.socket(family, socket.SOCK_STREAM)) as s:
+    s.bind((ip, 0))
+    return s.getsockname()[1]
+
+
+# TODO:
+#  - allow requesting multiple instances ?
+
+class SlapOSInstanceTestCase(unittest.TestCase):
+  """Install one slapos instance.
+
+  This test case install software(s) and request one instance during `setUpClass`
+  and destroy the instance during `tearDownClass`.
+
+  Software Release URL, Instance Software Type and Instance Parameters can be defined
+  on the class.
+
+  All tests from the test class will run with the same instance.
+
+  The following class attributes are available:
+
+    * `computer_partition`:  the `slapos.core.XXX` computer partition instance.
+
+    * `computer_partition_root_path`: the path of the instance root directory,
+
+  A note about paths:
+    SlapOS itself and some services running in SlapOS uses unix sockets and (sometimes very)
+    deep path, which does not play very well together. To workaround this, users can
+    set SLAPOS_TEST_WORKING_DIR enivonment variable to the path of a short enough directory
+    and local slapos will be in this directory.
+    The partitions references will be named after the unittest class name, which can also lead
+    to long paths. For this, unit test classes can define a __partition_reference__ attribute
+    which will be used as partition reference. The trick is then to use a shorter
+    __partition_reference__
+  See https://lab.nexedi.com/kirr/slapns for the solution to all these problems.
+
+  """
+  # Methods to be defined by subclasses.
+  @classmethod
+  def getSoftwareURLList(cls):
+    """Return URL of software releases to install.
+
+    To be defined by subclasses.
+    """
+    raise NotImplementedError()
+
+  @classmethod
+  def getInstanceParameterDict(cls):
+    """Return instance parameters
+
+    To be defined by subclasses if they need to request instance with specific
+    parameters.
+    """
+    return {}
+
+  @classmethod
+  def getInstanceSoftwareType(cls):
+    """Return software type for instance, default "default"
+
+    To be defined by subclasses if they need to request instance with specific
+    software type.
+    """
+    return "default"
+
+  # Utility methods.
+  def getSupervisorRPCServer(self):
+    """Returns a XML-RPC connection to the supervisor used by slapos node
+
+    Refer to http://supervisord.org/api.html for details of available methods.
+    """
+    # xmlrpc over unix socket https://stackoverflow.com/a/11746051/7294664
+    return xmlrpclib.ServerProxy(
+       'http://slapos-supervisor',
+       transport=supervisor.xmlrpc.SupervisorTransport(
+           None,
+           None,
+           # XXX hardcoded socket path
+           serverurl="unix://{working_directory}/inst/supervisord.socket".format(
+             **self.config)))
+
+  # Unittest methods
+  @classmethod
+  def setUpClass(cls):
+    """Setup the class, build software and request an instance.
+    
+    If you have to override this method, do not forget to call this method on
+    parent class.
+    """
+    try:
+      cls.setUpWorkingDirectory()
+      cls.setUpConfig()
+      cls.setUpSlapOSController()
+
+      cls.runSoftwareRelease()
+      # XXX instead of "runSoftwareRelease", it would be better to be closer to slapos usage:
+      # cls.supplySoftwares()
+      # cls.installSoftwares()
+
+      cls.runComputerPartition()
+      # XXX instead of "runComputerPartition", it would be better to be closer to slapos usage:
+      # cls.requestInstances()
+      # cls.createInstances()
+      # cls.requestInstances()
+
+    except BaseException:
+      cls.stopSlapOSProcesses()
+      cls.setUp = lambda self: self.fail('Setup Class failed.')
+      raise
+
+  @classmethod
+  def tearDownClass(cls):
+    """Tear down class, stop the processes and destroy instance.
+    """
+    cls.stopSlapOSProcesses()
+
+  # Implementation
+  @classmethod
+  def stopSlapOSProcesses(cls):
+    if hasattr(cls, '_process_manager'):
+      cls._process_manager.killPreviousRun()
+
+  @classmethod
+  def setUpWorkingDirectory(cls):
+    """Initialise the directories"""
+    cls.working_directory = os.environ.get(
+        'SLAPOS_TEST_WORKING_DIR',
+        os.path.join(os.path.dirname(__file__), '.slapos'))
+    # To prevent error: Cannot open an HTTP server: socket.error reported
+    # AF_UNIX path too long This `working_directory` should not be too deep.
+    # Socket path is 108 char max on linux
+    # https://github.com/torvalds/linux/blob/3848ec5/net/unix/af_unix.c#L234-L238
+    # Supervisord socket name contains the pid number, which is why we add
+    # .xxxxxxx in this check.
+    if len(cls.working_directory + '/inst/supervisord.socket.xxxxxxx') > 108:
+      raise RuntimeError('working directory ( {} ) is too deep, try setting '
+              'SLAPOS_TEST_WORKING_DIR'.format(cls.working_directory))
+
+    if not os.path.exists(cls.working_directory):
+      os.mkdir(cls.working_directory)
+
+  @classmethod
+  def setUpConfig(cls):
+    """Create slapos configuration"""
+    cls.config = {
+      "working_directory": cls.working_directory,
+      "slapos_directory": cls.working_directory,
+      "log_directory": cls.working_directory,
+      "computer_id": 'slapos.test',  # XXX
+      'proxy_database': os.path.join(cls.working_directory, 'proxy.db'),
+      'partition_reference': getattr(cls, '__partition_reference__', cls.__name__),
+      # "proper" slapos command must be in $PATH
+      'slapos_binary': 'slapos',
+      'node_quantity': '3',
+    }
+    # Some tests are expecting that local IP is not set to 127.0.0.1
+    ipv4_address = os.environ.get('SLAPOS_TEST_IPV4', '127.0.1.1')
+    ipv6_address = os.environ['SLAPOS_TEST_IPV6']
+
+    cls.config['proxy_host'] = cls.config['ipv4_address'] = ipv4_address
+    cls.config['ipv6_address'] = ipv6_address
+    cls.config['proxy_port'] = findFreeTCPPort(ipv4_address)
+    cls.config['master_url'] = 'http://{proxy_host}:{proxy_port}'.format(
+      **cls.config)
+
+  @classmethod
+  def setUpSlapOSController(cls):
+    """Create the a "slapos controller" and supply softwares from `getSoftwareURLList`.
+
+    This is equivalent to:
+
+    slapos proxy start
+    for sr in getSoftwareURLList; do
+      slapos supply $SR $COMP
+    done
+    """ 
+    cls._process_manager = ProcessManager()
+
+    # XXX this code is copied from testnode code
+    cls.slapos_controler = SlapOSControler(
+        cls.working_directory,
+        cls.config
+    )
+
+    slapproxy_log = os.path.join(cls.config['log_directory'], 'slapproxy.log')
+    logger = logging.getLogger(__name__)
+    logger.debug('Configured slapproxy log to %r', slapproxy_log)
+
+    cls.software_url_list = cls.getSoftwareURLList()
+    cls.slapos_controler.initializeSlapOSControler(
+        slapproxy_log=slapproxy_log,
+        process_manager=cls._process_manager,
+        reset_software=False,
+        software_path_list=cls.software_url_list)
+
+    # XXX we should check *earlier* if that pidfile exist and if supervisord
+    # process still running, because if developer started supervisord (or bugs?)
+    # then another supervisord will start and starting services a second time
+    # will fail.
+    cls._process_manager.supervisord_pid_file = os.path.join(
+      cls.slapos_controler.instance_root, 'var', 'run', 'supervisord.pid')
+
+  @classmethod
+  def runSoftwareRelease(cls):
+    """Run all the software releases that were supplied before.
+
+    This is the equivalent of `slapos node software`.
+
+    The tests will be marked file if software building fail.
+    """
+    logger = logging.getLogger()
+    logger.level = logging.DEBUG
+    stream = StringIO.StringIO()
+    stream_handler = logging.StreamHandler(stream)
+    logger.addHandler(stream_handler)
+
+    try:
+      cls.software_status_dict = cls.slapos_controler.runSoftwareRelease(
+        cls.config, environment=os.environ)
+      stream.seek(0)
+      stream.flush()
+      message = ''.join(stream.readlines()[-100:])
+      assert cls.software_status_dict['status_code'] == 0, message
+    finally:
+      logger.removeHandler(stream_handler)
+      del stream
+
+
+  @classmethod
+  def runComputerPartition(cls):
+    """Instanciate the software.
+
+    This is the equivalent of doing:
+
+    slapos request --type=getInstanceSoftwareType --parameters=getInstanceParameterDict
+    slapos node instance
+
+    and return the slapos request instance parameters.
+
+    This can be called by tests to simulate re-request with different parameters.
+    """
+    logger = logging.getLogger()
+    logger.level = logging.DEBUG
+    stream = StringIO.StringIO()
+    stream_handler = logging.StreamHandler(stream)
+    logger.addHandler(stream_handler)
+
+    if cls.getInstanceSoftwareType() != 'default':
+      raise NotImplementedError
+
+    instance_parameter_dict = cls.getInstanceParameterDict()
+    try:
+      cls.instance_status_dict = cls.slapos_controler.runComputerPartition(
+        cls.config,
+        cluster_configuration=instance_parameter_dict,
+        environment=os.environ)
+      stream.seek(0)
+      stream.flush()
+      message = ''.join(stream.readlines()[-100:])
+      assert cls.instance_status_dict['status_code'] == 0, message
+    finally:
+      logger.removeHandler(stream_handler)
+      del stream
+
+    # FIXME: similar to test node, only one (root) partition is really
+    #        supported for now.
+    computer_partition_list = []
+    for i in range(len(cls.software_url_list)):
+      computer_partition_list.append(
+          cls.slapos_controler.slap.registerOpenOrder().request(
+            cls.software_url_list[i],
+            # This is how testnode's SlapOSControler name created partitions
+            partition_reference='testing partition {i}'.format(
+              i=i, **cls.config),
+            partition_parameter_kw=instance_parameter_dict))
+
+    # expose some class attributes so that tests can use them:
+    # the ComputerPartition instances, to getInstanceParameterDict
+    cls.computer_partition = computer_partition_list[0]
+
+    # the path of the instance on the filesystem, for low level inspection
+    cls.computer_partition_root_path = os.path.join(
+        cls.config['working_directory'],
+        'inst',
+        cls.computer_partition.getId())
+
+
diff --git a/software/slapos-sr-testing/buildout.hash.cfg b/software/slapos-sr-testing/buildout.hash.cfg
index b3c96b8b1b8abb2a9c6a85536e1128e946b0b332..3c1f5a3f1406dca5544aed37a830fcfdb3395630 100644
--- a/software/slapos-sr-testing/buildout.hash.cfg
+++ b/software/slapos-sr-testing/buildout.hash.cfg
@@ -15,4 +15,4 @@
 
 [template]
 filename = instance.cfg
-md5sum = ceb421decde6512ffee3abea463c4c7a
+md5sum = 72c3b8bfb061a73e7a225c222bb598b4
diff --git a/software/slapos-sr-testing/instance.cfg b/software/slapos-sr-testing/instance.cfg
index 40e33acec50ef193226f1ffb818810520649dd03..3fa9012e7c3fce86b4103c08684a825f705d7d2d 100644
--- a/software/slapos-sr-testing/instance.cfg
+++ b/software/slapos-sr-testing/instance.cfg
@@ -28,7 +28,7 @@ bin = $${buildout:directory}/bin
 working-dir = $${buildout:directory}/tmp
 
 [test-list]
-path_list = ${slapos.test.caddy-frontend-setup:setup},${slapos.test.erp5-setup:setup},${slapos.test.kvm-setup:setup},${slapos.test.monitor-setup:setup},${slapos.test.plantuml-setup:setup},${slapos.test.powerdns-setup:setup},${slapos.test.proftpd-setup:setup},${slapos.test.re6stnet-setup:setup},${slapos.test.seleniumserver-setup:setup},${slapos.test.slaprunner-setup:setup},${slapos.test.helloworld-setup:setup}
+path_list = ${slapos.test.caddy-frontend-setup:setup},${slapos.test.erp5-setup:setup},${slapos.test.slapos-master-setup:setup},${slapos.test.kvm-setup:setup},${slapos.test.monitor-setup:setup},${slapos.test.plantuml-setup:setup},${slapos.test.powerdns-setup:setup},${slapos.test.proftpd-setup:setup},${slapos.test.re6stnet-setup:setup},${slapos.test.seleniumserver-setup:setup},${slapos.test.slaprunner-setup:setup},${slapos.test.helloworld-setup:setup}
 
 [slapos-test-runner]
 recipe = slapos.cookbook:wrapper
diff --git a/software/slapos-sr-testing/software.cfg b/software/slapos-sr-testing/software.cfg
index cdfcf0d28741c1d2e151530908e9330ed462303c..d642dbaf1a5197561bed99895e197c4aacb91cc9 100644
--- a/software/slapos-sr-testing/software.cfg
+++ b/software/slapos-sr-testing/software.cfg
@@ -31,6 +31,11 @@ setup = ${slapos-repository:location}/software/caddy-frontend/test/
 egg = slapos.test.erp5
 setup = ${slapos-repository:location}/software/erp5/test/
 
+[slapos.test.slapos-master-setup]
+<= setup-develop-egg
+egg = slapos.test.slapos-master
+setup = ${slapos-repository:location}/software/slapos-master/test/
+
 [slapos.test.kvm-setup]
 <= setup-develop-egg
 egg = slapos.test.kvm
@@ -76,23 +81,18 @@ setup = ${slapos-repository:location}/software/slaprunner/test/
 egg = slapos.test.helloworld
 setup = ${slapos-repository:location}/software/helloworld/test/
 
-[erp5.util-setup]
-<= setup-develop-egg
-egg = erp5.util[testnode]
-setup = ${erp5.util-repository:location}
-
-
 [eggs]
 recipe = zc.recipe.egg
 eggs =
   ${pillow-python:egg}
+  erp5.util
   ${python-pynacl:egg}
-  ${erp5.util-setup:egg}
   ${python-cryptography:egg}
   ${bcrypt:egg}
   slapos.core
   ${slapos.test.caddy-frontend-setup:egg}
   ${slapos.test.erp5-setup:egg}
+  ${slapos.test.slapos-master-setup:egg}
   ${slapos.test.kvm-setup:egg}
   ${slapos.test.monitor-setup:egg}
   ${slapos.test.plantuml-setup:egg}
@@ -120,13 +120,6 @@ forbid-download-cache = true
 repository = https://lab.nexedi.com/nexedi/slapos.git
 branch = master
 
-# XXX we need an unreleased version of erp5.util for better test uniqe naming
-# later we can stop fetching it from git and just use egg
-[erp5.util-repository]
-<= git-clone-repository
-repository = https://lab.nexedi.com/nexedi/erp5.git
-revision = aa516c7eb88308127949675bcc77d651630ebf5e
-
 [template]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/${:filename}
@@ -134,12 +127,12 @@ output = ${buildout:directory}/template.cfg
 mode = 640
 
 [versions]
+# Recent erp5.util is needed
+erp5.util = 0.4.58
+
 # Use slapos.core <= 1.4.16 for correctly working slapos proxy
 slapos.core = 1.4.15
 
-# clear the version of tested eggs, to make sure we installed the developped ones
-erp5.util =
-
 # Various needed versions
 Pillow = 5.3.0
 PyNaCl = 1.3.0
diff --git a/software/slaprunner/buildout.hash.cfg b/software/slaprunner/buildout.hash.cfg
index 5db04d469bd7216f79f20b8b7d381b2720de858d..398e3344b8ad4e23dfce3d7990dd5f1bc86cc0ad 100644
--- a/software/slaprunner/buildout.hash.cfg
+++ b/software/slaprunner/buildout.hash.cfg
@@ -18,7 +18,7 @@ md5sum = f0cab61c7b8478afb8b676fc725d50d5
 
 [template-runner]
 filename = instance-runner.cfg
-md5sum = a897ae4e90696516c4a6f831999f2c34
+md5sum = 7c48c89f33ad243f0dffb3eeef8c56e8
 
 [template-runner-import-script]
 filename = template/runner-import.sh.jinja2
@@ -30,7 +30,7 @@ md5sum = 1ed9526a6e5ac9a80e5b3add2d0a88fe
 
 [instance-runner-export]
 filename = instance-runner-export.cfg.in
-md5sum = 7f87e6d220934eb13ab2b5d67dca8922
+md5sum = 4b19026c50af55c8b7387aeaf624b47c
 
 [template-resilient]
 filename = instance-resilient.cfg.jinja2
diff --git a/software/slaprunner/instance-runner-export.cfg.in b/software/slaprunner/instance-runner-export.cfg.in
index 6a6c171856257027a1f6d9190c7eafec6caa3866..027d4307844d0e186d86797d10a4c53a51c7b3bb 100644
--- a/software/slaprunner/instance-runner-export.cfg.in
+++ b/software/slaprunner/instance-runner-export.cfg.in
@@ -2,49 +2,9 @@
 extends = {{ template_runner_path }}
           {{ pbsready_export_template_path }}
 
-parts +=
-  nginx_conf
-  nginx-launcher
-  certificate-authority
-  ca-nginx
-  certificate-authority-service
-  ca-nginx-service
-  logrotate-entry-nginx
-  gunicorn-launcher
-  gunicorn-graceful
-  publish-connection-information
-  slaprunner-promise
-  apache-httpd-promise
-  logrotate-entry-apache-httpd
-  slaprunner-supervisord-wrapper
-  runner-sshd-add-authorized-key
-  runner-sshd-graceful
-  runner-sshd-promise
-  runner-sshkeys-authority
-  runner-sshkeys-authority-service
-  runner-sshkeys-sshd
-  runner-sshkeys-sshd-service
-  runtestsuite
-  symlinks
-  shellinabox
-  shellinabox-service
-  slapos-cfg
-  cron-entry-prepare-software
-  deploy-instance-parameters
-  instance-software
-  instance-software-type
-  minishell-cwd
-  bash-profile
-  supervisord-wrapper
-  supervisord-promise
-  logrotate-entry-supervisord
-  logrotate-entry-slapgrid
-  httpd-graceful-wrapper
-## Monitoring part
-## Monitor for runner
-  monitor-base
-  monitor-check-resilient-feed-file
-  monitor-check-webrunner-internal-instance
+# parts from {{ template_runner_path }} are overriden by
+# {{ pbsready_export_template_path }} so we reinclude them here
+parts += ${:common-runner-parts}
 
 [directory]
 recipe = slapos.cookbook:mkdirectory
diff --git a/software/slaprunner/instance-runner.cfg b/software/slaprunner/instance-runner.cfg
index c4b07bc8c31bd36eb6948ea81cf9cd4c0ccb4053..fbc2a1d5974d55e6b0cc62319449e7ce91c1a984 100644
--- a/software/slaprunner/instance-runner.cfg
+++ b/software/slaprunner/instance-runner.cfg
@@ -1,5 +1,5 @@
 [buildout]
-parts =
+common-runner-parts =
   nginx_conf
   nginx-launcher
   certificate-authority
@@ -50,6 +50,7 @@ parts =
 ## Usability part
   template-slapuser-script
 
+parts = $${:common-runner-parts}
 extends = ${monitor2-template:rendered}
 
 eggs-directory = ${buildout:eggs-directory}
diff --git a/software/slaprunner/test/utils.py b/software/slaprunner/test/utils.py
index be416becb995518ee1aa77bf6bfcb4ea1370eba7..f5fb6c0deb7974a46cacfa5614f78c143981b52c 100644
--- a/software/slaprunner/test/utils.py
+++ b/software/slaprunner/test/utils.py
@@ -185,6 +185,7 @@ class SlapOSInstanceTestCase(unittest.TestCase):
       'partition_reference': cls.__name__,
       # "proper" slapos command must be in $PATH
       'slapos_binary': 'slapos',
+      'node_quantity': '3',
     }
     # Some tests are expecting that local IP is not set to 127.0.0.1
     ipv4_address = os.environ.get('SLAPOS_TEST_IPV4', '127.0.1.1')
diff --git a/stack/slapos.cfg b/stack/slapos.cfg
index 83b6ed887927808af19f6829f40b3d2336ea0a5e..33e75e47f14ae523d34782de9205fa99ca15f72e 100644
--- a/stack/slapos.cfg
+++ b/stack/slapos.cfg
@@ -135,14 +135,14 @@ pytz = 2016.10
 requests = 2.13.0
 six = 1.11.0
 slapos.cookbook = 1.0.92
-slapos.core = 1.4.18
+slapos.core = 1.4.20
 slapos.extension.strip = 0.4
 slapos.extension.shared = 1.0
 slapos.libnetworkcache = 0.16
 slapos.rebootstrap = 4.1
 slapos.recipe.build = 0.40
 slapos.recipe.cmmi = 0.10
-slapos.toolbox = 0.87
+slapos.toolbox = 0.88
 stevedore = 1.21.0
 subprocess32 = 3.5.3
 unicodecsv = 0.14.1
@@ -150,11 +150,11 @@ xml-marshaller = 0.9.7
 paramiko = 2.1.3
 
 # Required by:
-# slapos.core==1.4.18
+# slapos.core==1.4.19
 Flask = 0.12
 
 # Required by:
-# slapos.toolbox==0.87
+# slapos.toolbox==0.88
 GitPython = 2.1.11
 
 # Required by:
@@ -166,23 +166,23 @@ gitdb2 = 2.0.5
 smmap2 = 2.0.5
 
 # Required by:
-# slapos.toolbox==0.87
+# slapos.toolbox==0.88
 PyRSS2Gen = 1.1
 
 # Required by:
-# slapos.toolbox==0.87
+# slapos.toolbox==0.88
 apache-libcloud = 2.4.0
 
 # Required by:
-# slapos.toolbox==0.87
+# slapos.toolbox==0.88
 atomize = 0.2.0
 
 # Required by:
-# slapos.toolbox==0.87
+# slapos.toolbox==0.88
 croniter = 0.3.25
 
 # Required by:
-# slapos.toolbox==0.87
+# slapos.toolbox==0.88
 dnspython = 1.15.0
 
 # Required by:
@@ -190,11 +190,11 @@ dnspython = 1.15.0
 enum34 = 1.1.6
 
 # Required by:
-# slapos.toolbox==0.87
+# slapos.toolbox==0.88
 erp5.util = 0.4.51
 
 # Required by:
-# slapos.toolbox==0.87
+# slapos.toolbox==0.88
 feedparser = 5.2.1
 
 # Required by:
@@ -218,11 +218,11 @@ ipaddress = 1.0.18
 jsonschema = 3.0.0a3
 
 # Required by:
-# slapos.toolbox==0.87
+# slapos.toolbox==0.88
 lockfile = 0.12.2
 
 # Required by:
-# slapos.core==1.4.18
+# slapos.core==1.4.19
 # XXX 'slapos node format' raises an exception with netifaces 0.10.5.
 netifaces = 0.10.4
 
@@ -231,11 +231,11 @@ netifaces = 0.10.4
 packaging = 16.8
 
 # Required by:
-# slapos.toolbox==0.87
+# slapos.toolbox==0.88
 passlib = 1.7.1
 
 # Required by:
-# slapos.toolbox==0.87
+# slapos.toolbox==0.88
 pyasn1 = 0.4.5
 
 # Required by:
@@ -243,31 +243,31 @@ pyasn1 = 0.4.5
 pycparser = 2.17
 
 # Required by:
-# slapos.toolbox==0.87
+# slapos.toolbox==0.88
 pycurl = 7.43.0
 
 # Required by:
-# slapos.toolbox==0.87
+# slapos.toolbox==0.88
 python-dateutil = 2.7.3
 
 # Required by:
-# slapos.toolbox==0.87
+# slapos.toolbox==0.88
 rpdb = 0.1.5
 
 # Required by:
-# slapos.core==1.4.18
+# slapos.core==1.4.19
 supervisor = 3.3.3
 
 # Required by:
-# slapos.toolbox==0.87
+# slapos.toolbox==0.88
 tzlocal = 1.5.1
 
 # Required by:
-# slapos.core==1.4.18
+# slapos.core==1.4.19
 uritemplate = 3.0.0
 
 # Required by:
-# slapos.core==1.4.18
+# slapos.core==1.4.19
 zope.interface = 4.3.3
 
 [networkcache]