diff --git a/software/caddy-frontend/test/test_data/test.TestDefaultMonitorHttpdPort.test_plugin_list-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestDefaultMonitorHttpdPort.test_plugin_list-CADDY.txt
index abbe0ecb2bf57c93764a7da4cf9f3e570a4f3487..bad2eb2153c23529651b9506915d1adc74435aab 100644
--- a/software/caddy-frontend/test/test_data/test.TestDefaultMonitorHttpdPort.test_plugin_list-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestDefaultMonitorHttpdPort.test_plugin_list-CADDY.txt
@@ -2,6 +2,27 @@ TestDefaultMonitorHttpdPort-0/etc/plugin/__init__.py
 TestDefaultMonitorHttpdPort-0/etc/plugin/buildout-TestDefaultMonitorHttpdPort-0-status.py
 TestDefaultMonitorHttpdPort-0/etc/plugin/check-free-disk-space.py
 TestDefaultMonitorHttpdPort-0/etc/plugin/monitor-bootstrap-status.py
+TestDefaultMonitorHttpdPort-0/etc/plugin/monitor-http-frontend.py
+TestDefaultMonitorHttpdPort-0/etc/plugin/monitor-httpd-listening-on-tcp.py
 TestDefaultMonitorHttpdPort-1/etc/plugin/buildout-TestDefaultMonitorHttpdPort-1-status.py
+TestDefaultMonitorHttpdPort-1/etc/plugin/caddy_cached.py
+TestDefaultMonitorHttpdPort-1/etc/plugin/caddy_frontend_ipv4_http.py
+TestDefaultMonitorHttpdPort-1/etc/plugin/caddy_frontend_ipv4_https.py
+TestDefaultMonitorHttpdPort-1/etc/plugin/caddy_frontend_ipv6_http.py
+TestDefaultMonitorHttpdPort-1/etc/plugin/caddy_frontend_ipv6_https.py
+TestDefaultMonitorHttpdPort-1/etc/plugin/caddy_ssl_cached.py
+TestDefaultMonitorHttpdPort-1/etc/plugin/check-_test-error-log-last-day.py
+TestDefaultMonitorHttpdPort-1/etc/plugin/check-_test-error-log-last-hour.py
 TestDefaultMonitorHttpdPort-1/etc/plugin/check-free-disk-space.py
-TestDefaultMonitorHttpdPort-1/etc/plugin/monitor-bootstrap-status.py
\ No newline at end of file
+TestDefaultMonitorHttpdPort-1/etc/plugin/frontend-caddy-configuration-promise.py
+TestDefaultMonitorHttpdPort-1/etc/plugin/monitor-bootstrap-status.py
+TestDefaultMonitorHttpdPort-1/etc/plugin/monitor-http-frontend.py
+TestDefaultMonitorHttpdPort-1/etc/plugin/monitor-httpd-listening-on-tcp.py
+TestDefaultMonitorHttpdPort-1/etc/plugin/nginx-configuration-promise.py
+TestDefaultMonitorHttpdPort-1/etc/plugin/nginx_frontend_ipv4_http.py
+TestDefaultMonitorHttpdPort-1/etc/plugin/nginx_frontend_ipv4_https.py
+TestDefaultMonitorHttpdPort-1/etc/plugin/nginx_frontend_ipv6_http.py
+TestDefaultMonitorHttpdPort-1/etc/plugin/nginx_frontend_ipv6_https.py
+TestDefaultMonitorHttpdPort-1/etc/plugin/re6st-connectivity.py
+TestDefaultMonitorHttpdPort-1/etc/plugin/trafficserver-cache-availability.py
+TestDefaultMonitorHttpdPort-1/etc/plugin/trafficserver-port-listening.py
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestDefaultMonitorHttpdPort.test_promise_list-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestDefaultMonitorHttpdPort.test_promise_list-CADDY.txt
index a5c26bc3895d7feb25434a6d8a16332b01a9ed09..cf47c00cae0d74cac86e687e17fd716f8887ecd0 100644
--- a/software/caddy-frontend/test/test_data/test.TestDefaultMonitorHttpdPort.test_promise_list-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestDefaultMonitorHttpdPort.test_promise_list-CADDY.txt
@@ -1,25 +1,4 @@
-TestDefaultMonitorHttpdPort-0/etc/promise/monitor-http-frontend
-TestDefaultMonitorHttpdPort-0/etc/promise/monitor-httpd-listening-on-tcp
 TestDefaultMonitorHttpdPort-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set
 TestDefaultMonitorHttpdPort-1/etc/promise/caddy-frontend-is-running-actual-software-release
-TestDefaultMonitorHttpdPort-1/etc/promise/caddy_cached
-TestDefaultMonitorHttpdPort-1/etc/promise/caddy_frontend_ipv4_http
-TestDefaultMonitorHttpdPort-1/etc/promise/caddy_frontend_ipv4_https
-TestDefaultMonitorHttpdPort-1/etc/promise/caddy_frontend_ipv6_http
-TestDefaultMonitorHttpdPort-1/etc/promise/caddy_frontend_ipv6_https
-TestDefaultMonitorHttpdPort-1/etc/promise/caddy_ssl_cached
-TestDefaultMonitorHttpdPort-1/etc/promise/check-_test-error-log-last-day
-TestDefaultMonitorHttpdPort-1/etc/promise/check-_test-error-log-last-hour
-TestDefaultMonitorHttpdPort-1/etc/promise/frontend-caddy-configuration-promise
-TestDefaultMonitorHttpdPort-1/etc/promise/monitor-http-frontend
-TestDefaultMonitorHttpdPort-1/etc/promise/monitor-httpd-listening-on-tcp
-TestDefaultMonitorHttpdPort-1/etc/promise/nginx-configuration-promise
-TestDefaultMonitorHttpdPort-1/etc/promise/nginx_frontend_ipv4_http
-TestDefaultMonitorHttpdPort-1/etc/promise/nginx_frontend_ipv4_https
-TestDefaultMonitorHttpdPort-1/etc/promise/nginx_frontend_ipv6_http
-TestDefaultMonitorHttpdPort-1/etc/promise/nginx_frontend_ipv6_https
 TestDefaultMonitorHttpdPort-1/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set
-TestDefaultMonitorHttpdPort-1/etc/promise/promise-nginx-is-process-older-than-dependency-set
-TestDefaultMonitorHttpdPort-1/etc/promise/re6st-connectivity
-TestDefaultMonitorHttpdPort-1/etc/promise/trafficserver-cache-availability
-TestDefaultMonitorHttpdPort-1/etc/promise/trafficserver-port-listening
\ No newline at end of file
+TestDefaultMonitorHttpdPort-1/etc/promise/promise-nginx-is-process-older-than-dependency-set
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestDuplicateSiteKeyProtection.test_plugin_list-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestDuplicateSiteKeyProtection.test_plugin_list-CADDY.txt
index 32e4f8ab43bed59fe667d9d26d9ab544d0d70f49..edbaedbf0504700e711373ed5aa79e80fd44d687 100644
--- a/software/caddy-frontend/test/test_data/test.TestDuplicateSiteKeyProtection.test_plugin_list-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestDuplicateSiteKeyProtection.test_plugin_list-CADDY.txt
@@ -2,7 +2,28 @@ TestDuplicateSiteKeyProtection-0/etc/plugin/__init__.py
 TestDuplicateSiteKeyProtection-0/etc/plugin/buildout-TestDuplicateSiteKeyProtection-0-status.py
 TestDuplicateSiteKeyProtection-0/etc/plugin/check-free-disk-space.py
 TestDuplicateSiteKeyProtection-0/etc/plugin/monitor-bootstrap-status.py
+TestDuplicateSiteKeyProtection-0/etc/plugin/monitor-http-frontend.py
+TestDuplicateSiteKeyProtection-0/etc/plugin/monitor-httpd-listening-on-tcp.py
 TestDuplicateSiteKeyProtection-1/etc/plugin/__init__.py
 TestDuplicateSiteKeyProtection-1/etc/plugin/buildout-TestDuplicateSiteKeyProtection-1-status.py
+TestDuplicateSiteKeyProtection-1/etc/plugin/caddy_cached.py
+TestDuplicateSiteKeyProtection-1/etc/plugin/caddy_frontend_ipv4_http.py
+TestDuplicateSiteKeyProtection-1/etc/plugin/caddy_frontend_ipv4_https.py
+TestDuplicateSiteKeyProtection-1/etc/plugin/caddy_frontend_ipv6_http.py
+TestDuplicateSiteKeyProtection-1/etc/plugin/caddy_frontend_ipv6_https.py
+TestDuplicateSiteKeyProtection-1/etc/plugin/caddy_ssl_cached.py
+TestDuplicateSiteKeyProtection-1/etc/plugin/check-_site_2-error-log-last-day.py
+TestDuplicateSiteKeyProtection-1/etc/plugin/check-_site_2-error-log-last-hour.py
 TestDuplicateSiteKeyProtection-1/etc/plugin/check-free-disk-space.py
-TestDuplicateSiteKeyProtection-1/etc/plugin/monitor-bootstrap-status.py
\ No newline at end of file
+TestDuplicateSiteKeyProtection-1/etc/plugin/frontend-caddy-configuration-promise.py
+TestDuplicateSiteKeyProtection-1/etc/plugin/monitor-bootstrap-status.py
+TestDuplicateSiteKeyProtection-1/etc/plugin/monitor-http-frontend.py
+TestDuplicateSiteKeyProtection-1/etc/plugin/monitor-httpd-listening-on-tcp.py
+TestDuplicateSiteKeyProtection-1/etc/plugin/nginx-configuration-promise.py
+TestDuplicateSiteKeyProtection-1/etc/plugin/nginx_frontend_ipv4_http.py
+TestDuplicateSiteKeyProtection-1/etc/plugin/nginx_frontend_ipv4_https.py
+TestDuplicateSiteKeyProtection-1/etc/plugin/nginx_frontend_ipv6_http.py
+TestDuplicateSiteKeyProtection-1/etc/plugin/nginx_frontend_ipv6_https.py
+TestDuplicateSiteKeyProtection-1/etc/plugin/re6st-connectivity.py
+TestDuplicateSiteKeyProtection-1/etc/plugin/trafficserver-cache-availability.py
+TestDuplicateSiteKeyProtection-1/etc/plugin/trafficserver-port-listening.py
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestDuplicateSiteKeyProtection.test_promise_list-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestDuplicateSiteKeyProtection.test_promise_list-CADDY.txt
index ffac50d83292a9a198612862ae1a18b52d00d08d..791a50afb38eb4c1cf5074a54289b74256009424 100644
--- a/software/caddy-frontend/test/test_data/test.TestDuplicateSiteKeyProtection.test_promise_list-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestDuplicateSiteKeyProtection.test_promise_list-CADDY.txt
@@ -1,25 +1,4 @@
-TestDuplicateSiteKeyProtection-0/etc/promise/monitor-http-frontend
-TestDuplicateSiteKeyProtection-0/etc/promise/monitor-httpd-listening-on-tcp
 TestDuplicateSiteKeyProtection-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set
 TestDuplicateSiteKeyProtection-1/etc/promise/caddy-frontend-is-running-actual-software-release
-TestDuplicateSiteKeyProtection-1/etc/promise/caddy_cached
-TestDuplicateSiteKeyProtection-1/etc/promise/caddy_frontend_ipv4_http
-TestDuplicateSiteKeyProtection-1/etc/promise/caddy_frontend_ipv4_https
-TestDuplicateSiteKeyProtection-1/etc/promise/caddy_frontend_ipv6_http
-TestDuplicateSiteKeyProtection-1/etc/promise/caddy_frontend_ipv6_https
-TestDuplicateSiteKeyProtection-1/etc/promise/caddy_ssl_cached
-TestDuplicateSiteKeyProtection-1/etc/promise/check-_site_2-error-log-last-day
-TestDuplicateSiteKeyProtection-1/etc/promise/check-_site_2-error-log-last-hour
-TestDuplicateSiteKeyProtection-1/etc/promise/frontend-caddy-configuration-promise
-TestDuplicateSiteKeyProtection-1/etc/promise/monitor-http-frontend
-TestDuplicateSiteKeyProtection-1/etc/promise/monitor-httpd-listening-on-tcp
-TestDuplicateSiteKeyProtection-1/etc/promise/nginx-configuration-promise
-TestDuplicateSiteKeyProtection-1/etc/promise/nginx_frontend_ipv4_http
-TestDuplicateSiteKeyProtection-1/etc/promise/nginx_frontend_ipv4_https
-TestDuplicateSiteKeyProtection-1/etc/promise/nginx_frontend_ipv6_http
-TestDuplicateSiteKeyProtection-1/etc/promise/nginx_frontend_ipv6_https
 TestDuplicateSiteKeyProtection-1/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set
-TestDuplicateSiteKeyProtection-1/etc/promise/promise-nginx-is-process-older-than-dependency-set
-TestDuplicateSiteKeyProtection-1/etc/promise/re6st-connectivity
-TestDuplicateSiteKeyProtection-1/etc/promise/trafficserver-cache-availability
-TestDuplicateSiteKeyProtection-1/etc/promise/trafficserver-port-listening
\ No newline at end of file
+TestDuplicateSiteKeyProtection-1/etc/promise/promise-nginx-is-process-older-than-dependency-set
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_plugin_list-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_plugin_list-CADDY.txt
index 75683bb5885f224e7728851f1a0827c920cb7665..57b76a404be00429392428c6e1795c1618cd5d7a 100644
--- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_plugin_list-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_plugin_list-CADDY.txt
@@ -2,7 +2,32 @@ TestEnableHttp2ByDefaultDefaultSlave-0/etc/plugin/__init__.py
 TestEnableHttp2ByDefaultDefaultSlave-0/etc/plugin/buildout-TestEnableHttp2ByDefaultDefaultSlave-0-status.py
 TestEnableHttp2ByDefaultDefaultSlave-0/etc/plugin/check-free-disk-space.py
 TestEnableHttp2ByDefaultDefaultSlave-0/etc/plugin/monitor-bootstrap-status.py
+TestEnableHttp2ByDefaultDefaultSlave-0/etc/plugin/monitor-http-frontend.py
+TestEnableHttp2ByDefaultDefaultSlave-0/etc/plugin/monitor-httpd-listening-on-tcp.py
 TestEnableHttp2ByDefaultDefaultSlave-1/etc/plugin/__init__.py
 TestEnableHttp2ByDefaultDefaultSlave-1/etc/plugin/buildout-TestEnableHttp2ByDefaultDefaultSlave-1-status.py
+TestEnableHttp2ByDefaultDefaultSlave-1/etc/plugin/caddy_cached.py
+TestEnableHttp2ByDefaultDefaultSlave-1/etc/plugin/caddy_frontend_ipv4_http.py
+TestEnableHttp2ByDefaultDefaultSlave-1/etc/plugin/caddy_frontend_ipv4_https.py
+TestEnableHttp2ByDefaultDefaultSlave-1/etc/plugin/caddy_frontend_ipv6_http.py
+TestEnableHttp2ByDefaultDefaultSlave-1/etc/plugin/caddy_frontend_ipv6_https.py
+TestEnableHttp2ByDefaultDefaultSlave-1/etc/plugin/caddy_ssl_cached.py
+TestEnableHttp2ByDefaultDefaultSlave-1/etc/plugin/check-_enable-http2-default-error-log-last-day.py
+TestEnableHttp2ByDefaultDefaultSlave-1/etc/plugin/check-_enable-http2-default-error-log-last-hour.py
+TestEnableHttp2ByDefaultDefaultSlave-1/etc/plugin/check-_enable-http2-false-error-log-last-day.py
+TestEnableHttp2ByDefaultDefaultSlave-1/etc/plugin/check-_enable-http2-false-error-log-last-hour.py
+TestEnableHttp2ByDefaultDefaultSlave-1/etc/plugin/check-_enable-http2-true-error-log-last-day.py
+TestEnableHttp2ByDefaultDefaultSlave-1/etc/plugin/check-_enable-http2-true-error-log-last-hour.py
 TestEnableHttp2ByDefaultDefaultSlave-1/etc/plugin/check-free-disk-space.py
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/plugin/monitor-bootstrap-status.py
\ No newline at end of file
+TestEnableHttp2ByDefaultDefaultSlave-1/etc/plugin/frontend-caddy-configuration-promise.py
+TestEnableHttp2ByDefaultDefaultSlave-1/etc/plugin/monitor-bootstrap-status.py
+TestEnableHttp2ByDefaultDefaultSlave-1/etc/plugin/monitor-http-frontend.py
+TestEnableHttp2ByDefaultDefaultSlave-1/etc/plugin/monitor-httpd-listening-on-tcp.py
+TestEnableHttp2ByDefaultDefaultSlave-1/etc/plugin/nginx-configuration-promise.py
+TestEnableHttp2ByDefaultDefaultSlave-1/etc/plugin/nginx_frontend_ipv4_http.py
+TestEnableHttp2ByDefaultDefaultSlave-1/etc/plugin/nginx_frontend_ipv4_https.py
+TestEnableHttp2ByDefaultDefaultSlave-1/etc/plugin/nginx_frontend_ipv6_http.py
+TestEnableHttp2ByDefaultDefaultSlave-1/etc/plugin/nginx_frontend_ipv6_https.py
+TestEnableHttp2ByDefaultDefaultSlave-1/etc/plugin/re6st-connectivity.py
+TestEnableHttp2ByDefaultDefaultSlave-1/etc/plugin/trafficserver-cache-availability.py
+TestEnableHttp2ByDefaultDefaultSlave-1/etc/plugin/trafficserver-port-listening.py
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_promise_list-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_promise_list-CADDY.txt
index 60fef8ca9aa2d034eff5350d0b54b347d8558d25..5e274579d7bd0543662c1b9fc33bd531dc1e33bf 100644
--- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_promise_list-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_promise_list-CADDY.txt
@@ -1,29 +1,4 @@
-TestEnableHttp2ByDefaultDefaultSlave-0/etc/promise/monitor-http-frontend
-TestEnableHttp2ByDefaultDefaultSlave-0/etc/promise/monitor-httpd-listening-on-tcp
 TestEnableHttp2ByDefaultDefaultSlave-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set
 TestEnableHttp2ByDefaultDefaultSlave-1/etc/promise/caddy-frontend-is-running-actual-software-release
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/promise/caddy_cached
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/promise/caddy_frontend_ipv4_http
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/promise/caddy_frontend_ipv4_https
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/promise/caddy_frontend_ipv6_http
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/promise/caddy_frontend_ipv6_https
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/promise/caddy_ssl_cached
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/promise/check-_enable-http2-default-error-log-last-day
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/promise/check-_enable-http2-default-error-log-last-hour
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/promise/check-_enable-http2-false-error-log-last-day
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/promise/check-_enable-http2-false-error-log-last-hour
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/promise/check-_enable-http2-true-error-log-last-day
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/promise/check-_enable-http2-true-error-log-last-hour
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/promise/frontend-caddy-configuration-promise
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/promise/monitor-http-frontend
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/promise/monitor-httpd-listening-on-tcp
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/promise/nginx-configuration-promise
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/promise/nginx_frontend_ipv4_http
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/promise/nginx_frontend_ipv4_https
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/promise/nginx_frontend_ipv6_http
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/promise/nginx_frontend_ipv6_https
 TestEnableHttp2ByDefaultDefaultSlave-1/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/promise/promise-nginx-is-process-older-than-dependency-set
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/promise/re6st-connectivity
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/promise/trafficserver-cache-availability
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/promise/trafficserver-port-listening
\ No newline at end of file
+TestEnableHttp2ByDefaultDefaultSlave-1/etc/promise/promise-nginx-is-process-older-than-dependency-set
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_plugin_list-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_plugin_list-CADDY.txt
index 033a8d7b71d9e490370be7c6053ef10a0c707c1b..4da89b8cc2446dd47f5bbef4a19063001a0bb7bc 100644
--- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_plugin_list-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_plugin_list-CADDY.txt
@@ -2,7 +2,32 @@ TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-0/etc/plugin/__init__.py
 TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-0/etc/plugin/buildout-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-0-status.py
 TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-0/etc/plugin/check-free-disk-space.py
 TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-0/etc/plugin/monitor-bootstrap-status.py
+TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-0/etc/plugin/monitor-http-frontend.py
+TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-0/etc/plugin/monitor-httpd-listening-on-tcp.py
 TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/plugin/__init__.py
 TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/plugin/buildout-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1-status.py
+TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/plugin/caddy_cached.py
+TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/plugin/caddy_frontend_ipv4_http.py
+TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/plugin/caddy_frontend_ipv4_https.py
+TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/plugin/caddy_frontend_ipv6_http.py
+TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/plugin/caddy_frontend_ipv6_https.py
+TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/plugin/caddy_ssl_cached.py
+TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/plugin/check-_enable-http2-default-error-log-last-day.py
+TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/plugin/check-_enable-http2-default-error-log-last-hour.py
+TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/plugin/check-_enable-http2-false-error-log-last-day.py
+TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/plugin/check-_enable-http2-false-error-log-last-hour.py
+TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/plugin/check-_enable-http2-true-error-log-last-day.py
+TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/plugin/check-_enable-http2-true-error-log-last-hour.py
 TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/plugin/check-free-disk-space.py
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/plugin/monitor-bootstrap-status.py
\ No newline at end of file
+TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/plugin/frontend-caddy-configuration-promise.py
+TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/plugin/monitor-bootstrap-status.py
+TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/plugin/monitor-http-frontend.py
+TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/plugin/monitor-httpd-listening-on-tcp.py
+TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/plugin/nginx-configuration-promise.py
+TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/plugin/nginx_frontend_ipv4_http.py
+TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/plugin/nginx_frontend_ipv4_https.py
+TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/plugin/nginx_frontend_ipv6_http.py
+TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/plugin/nginx_frontend_ipv6_https.py
+TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/plugin/re6st-connectivity.py
+TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/plugin/trafficserver-cache-availability.py
+TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/plugin/trafficserver-port-listening.py
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_promise_list-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_promise_list-CADDY.txt
index 41f0b9149f10af10289ae6194bbf9bb15f19a5bf..59da62f3555ac702f367b6ce1aab4bffb3b6c86a 100644
--- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_promise_list-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_promise_list-CADDY.txt
@@ -1,29 +1,4 @@
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-0/etc/promise/monitor-http-frontend
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-0/etc/promise/monitor-httpd-listening-on-tcp
 TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set
 TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/promise/caddy-frontend-is-running-actual-software-release
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/promise/caddy_cached
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/promise/caddy_frontend_ipv4_http
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/promise/caddy_frontend_ipv4_https
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/promise/caddy_frontend_ipv6_http
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/promise/caddy_frontend_ipv6_https
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/promise/caddy_ssl_cached
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/promise/check-_enable-http2-default-error-log-last-day
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/promise/check-_enable-http2-default-error-log-last-hour
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/promise/check-_enable-http2-false-error-log-last-day
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/promise/check-_enable-http2-false-error-log-last-hour
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/promise/check-_enable-http2-true-error-log-last-day
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/promise/check-_enable-http2-true-error-log-last-hour
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/promise/frontend-caddy-configuration-promise
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/promise/monitor-http-frontend
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/promise/monitor-httpd-listening-on-tcp
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/promise/nginx-configuration-promise
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/promise/nginx_frontend_ipv4_http
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/promise/nginx_frontend_ipv4_https
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/promise/nginx_frontend_ipv6_http
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/promise/nginx_frontend_ipv6_https
 TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/promise/promise-nginx-is-process-older-than-dependency-set
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/promise/re6st-connectivity
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/promise/trafficserver-cache-availability
-TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/promise/trafficserver-port-listening
\ No newline at end of file
+TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/promise/promise-nginx-is-process-older-than-dependency-set
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_plugin_list-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_plugin_list-CADDY.txt
index 5e72922acab6c23d3ab5ceb16bb30d58183be15d..78f70a644745f8fb3440e716614a38a945717069 100644
--- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_plugin_list-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_plugin_list-CADDY.txt
@@ -2,7 +2,32 @@ TestEnableHttp2ByDefaultFalseSlave-0/etc/plugin/__init__.py
 TestEnableHttp2ByDefaultFalseSlave-0/etc/plugin/buildout-TestEnableHttp2ByDefaultFalseSlave-0-status.py
 TestEnableHttp2ByDefaultFalseSlave-0/etc/plugin/check-free-disk-space.py
 TestEnableHttp2ByDefaultFalseSlave-0/etc/plugin/monitor-bootstrap-status.py
+TestEnableHttp2ByDefaultFalseSlave-0/etc/plugin/monitor-http-frontend.py
+TestEnableHttp2ByDefaultFalseSlave-0/etc/plugin/monitor-httpd-listening-on-tcp.py
 TestEnableHttp2ByDefaultFalseSlave-1/etc/plugin/__init__.py
 TestEnableHttp2ByDefaultFalseSlave-1/etc/plugin/buildout-TestEnableHttp2ByDefaultFalseSlave-1-status.py
+TestEnableHttp2ByDefaultFalseSlave-1/etc/plugin/caddy_cached.py
+TestEnableHttp2ByDefaultFalseSlave-1/etc/plugin/caddy_frontend_ipv4_http.py
+TestEnableHttp2ByDefaultFalseSlave-1/etc/plugin/caddy_frontend_ipv4_https.py
+TestEnableHttp2ByDefaultFalseSlave-1/etc/plugin/caddy_frontend_ipv6_http.py
+TestEnableHttp2ByDefaultFalseSlave-1/etc/plugin/caddy_frontend_ipv6_https.py
+TestEnableHttp2ByDefaultFalseSlave-1/etc/plugin/caddy_ssl_cached.py
+TestEnableHttp2ByDefaultFalseSlave-1/etc/plugin/check-_enable-http2-default-error-log-last-day.py
+TestEnableHttp2ByDefaultFalseSlave-1/etc/plugin/check-_enable-http2-default-error-log-last-hour.py
+TestEnableHttp2ByDefaultFalseSlave-1/etc/plugin/check-_enable-http2-false-error-log-last-day.py
+TestEnableHttp2ByDefaultFalseSlave-1/etc/plugin/check-_enable-http2-false-error-log-last-hour.py
+TestEnableHttp2ByDefaultFalseSlave-1/etc/plugin/check-_enable-http2-true-error-log-last-day.py
+TestEnableHttp2ByDefaultFalseSlave-1/etc/plugin/check-_enable-http2-true-error-log-last-hour.py
 TestEnableHttp2ByDefaultFalseSlave-1/etc/plugin/check-free-disk-space.py
-TestEnableHttp2ByDefaultFalseSlave-1/etc/plugin/monitor-bootstrap-status.py
\ No newline at end of file
+TestEnableHttp2ByDefaultFalseSlave-1/etc/plugin/frontend-caddy-configuration-promise.py
+TestEnableHttp2ByDefaultFalseSlave-1/etc/plugin/monitor-bootstrap-status.py
+TestEnableHttp2ByDefaultFalseSlave-1/etc/plugin/monitor-http-frontend.py
+TestEnableHttp2ByDefaultFalseSlave-1/etc/plugin/monitor-httpd-listening-on-tcp.py
+TestEnableHttp2ByDefaultFalseSlave-1/etc/plugin/nginx-configuration-promise.py
+TestEnableHttp2ByDefaultFalseSlave-1/etc/plugin/nginx_frontend_ipv4_http.py
+TestEnableHttp2ByDefaultFalseSlave-1/etc/plugin/nginx_frontend_ipv4_https.py
+TestEnableHttp2ByDefaultFalseSlave-1/etc/plugin/nginx_frontend_ipv6_http.py
+TestEnableHttp2ByDefaultFalseSlave-1/etc/plugin/nginx_frontend_ipv6_https.py
+TestEnableHttp2ByDefaultFalseSlave-1/etc/plugin/re6st-connectivity.py
+TestEnableHttp2ByDefaultFalseSlave-1/etc/plugin/trafficserver-cache-availability.py
+TestEnableHttp2ByDefaultFalseSlave-1/etc/plugin/trafficserver-port-listening.py
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_promise_list-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_promise_list-CADDY.txt
index 3301746e13d9c1fe6fca082d4c705064662c09ca..2ed2aa54d9584d4eadf98cc68d6ae861585feed1 100644
--- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_promise_list-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_promise_list-CADDY.txt
@@ -1,29 +1,4 @@
-TestEnableHttp2ByDefaultFalseSlave-0/etc/promise/monitor-http-frontend
-TestEnableHttp2ByDefaultFalseSlave-0/etc/promise/monitor-httpd-listening-on-tcp
 TestEnableHttp2ByDefaultFalseSlave-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set
 TestEnableHttp2ByDefaultFalseSlave-1/etc/promise/caddy-frontend-is-running-actual-software-release
-TestEnableHttp2ByDefaultFalseSlave-1/etc/promise/caddy_cached
-TestEnableHttp2ByDefaultFalseSlave-1/etc/promise/caddy_frontend_ipv4_http
-TestEnableHttp2ByDefaultFalseSlave-1/etc/promise/caddy_frontend_ipv4_https
-TestEnableHttp2ByDefaultFalseSlave-1/etc/promise/caddy_frontend_ipv6_http
-TestEnableHttp2ByDefaultFalseSlave-1/etc/promise/caddy_frontend_ipv6_https
-TestEnableHttp2ByDefaultFalseSlave-1/etc/promise/caddy_ssl_cached
-TestEnableHttp2ByDefaultFalseSlave-1/etc/promise/check-_enable-http2-default-error-log-last-day
-TestEnableHttp2ByDefaultFalseSlave-1/etc/promise/check-_enable-http2-default-error-log-last-hour
-TestEnableHttp2ByDefaultFalseSlave-1/etc/promise/check-_enable-http2-false-error-log-last-day
-TestEnableHttp2ByDefaultFalseSlave-1/etc/promise/check-_enable-http2-false-error-log-last-hour
-TestEnableHttp2ByDefaultFalseSlave-1/etc/promise/check-_enable-http2-true-error-log-last-day
-TestEnableHttp2ByDefaultFalseSlave-1/etc/promise/check-_enable-http2-true-error-log-last-hour
-TestEnableHttp2ByDefaultFalseSlave-1/etc/promise/frontend-caddy-configuration-promise
-TestEnableHttp2ByDefaultFalseSlave-1/etc/promise/monitor-http-frontend
-TestEnableHttp2ByDefaultFalseSlave-1/etc/promise/monitor-httpd-listening-on-tcp
-TestEnableHttp2ByDefaultFalseSlave-1/etc/promise/nginx-configuration-promise
-TestEnableHttp2ByDefaultFalseSlave-1/etc/promise/nginx_frontend_ipv4_http
-TestEnableHttp2ByDefaultFalseSlave-1/etc/promise/nginx_frontend_ipv4_https
-TestEnableHttp2ByDefaultFalseSlave-1/etc/promise/nginx_frontend_ipv6_http
-TestEnableHttp2ByDefaultFalseSlave-1/etc/promise/nginx_frontend_ipv6_https
 TestEnableHttp2ByDefaultFalseSlave-1/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set
-TestEnableHttp2ByDefaultFalseSlave-1/etc/promise/promise-nginx-is-process-older-than-dependency-set
-TestEnableHttp2ByDefaultFalseSlave-1/etc/promise/re6st-connectivity
-TestEnableHttp2ByDefaultFalseSlave-1/etc/promise/trafficserver-cache-availability
-TestEnableHttp2ByDefaultFalseSlave-1/etc/promise/trafficserver-port-listening
\ No newline at end of file
+TestEnableHttp2ByDefaultFalseSlave-1/etc/promise/promise-nginx-is-process-older-than-dependency-set
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_plugin_list-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_plugin_list-CADDY.txt
index 9e4ba3e5f2983b2a1906e79a34f2ba55d7e7a750..79a27ca60a3dac819ed5ae8fb6e82a42f4722a64 100644
--- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_plugin_list-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_plugin_list-CADDY.txt
@@ -2,7 +2,32 @@ TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-0/etc/plugin/__init__.py
 TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-0/etc/plugin/buildout-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-0-status.py
 TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-0/etc/plugin/check-free-disk-space.py
 TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-0/etc/plugin/monitor-bootstrap-status.py
+TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-0/etc/plugin/monitor-http-frontend.py
+TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-0/etc/plugin/monitor-httpd-listening-on-tcp.py
 TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/plugin/__init__.py
 TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/plugin/buildout-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1-status.py
+TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/plugin/caddy_cached.py
+TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/plugin/caddy_frontend_ipv4_http.py
+TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/plugin/caddy_frontend_ipv4_https.py
+TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/plugin/caddy_frontend_ipv6_http.py
+TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/plugin/caddy_frontend_ipv6_https.py
+TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/plugin/caddy_ssl_cached.py
+TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/plugin/check-_enable-http2-default-error-log-last-day.py
+TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/plugin/check-_enable-http2-default-error-log-last-hour.py
+TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/plugin/check-_enable-http2-false-error-log-last-day.py
+TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/plugin/check-_enable-http2-false-error-log-last-hour.py
+TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/plugin/check-_enable-http2-true-error-log-last-day.py
+TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/plugin/check-_enable-http2-true-error-log-last-hour.py
 TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/plugin/check-free-disk-space.py
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/plugin/monitor-bootstrap-status.py
\ No newline at end of file
+TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/plugin/frontend-caddy-configuration-promise.py
+TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/plugin/monitor-bootstrap-status.py
+TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/plugin/monitor-http-frontend.py
+TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/plugin/monitor-httpd-listening-on-tcp.py
+TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/plugin/nginx-configuration-promise.py
+TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/plugin/nginx_frontend_ipv4_http.py
+TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/plugin/nginx_frontend_ipv4_https.py
+TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/plugin/nginx_frontend_ipv6_http.py
+TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/plugin/nginx_frontend_ipv6_https.py
+TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/plugin/re6st-connectivity.py
+TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/plugin/trafficserver-cache-availability.py
+TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/plugin/trafficserver-port-listening.py
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_promise_list-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_promise_list-CADDY.txt
index 993b0026dc963c6f530daa87fc0ee7fa1f69788f..30b00b9c0ff8f48f68c25fd833572e96baed3872 100644
--- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_promise_list-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_promise_list-CADDY.txt
@@ -1,29 +1,4 @@
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-0/etc/promise/monitor-http-frontend
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-0/etc/promise/monitor-httpd-listening-on-tcp
 TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set
 TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/promise/caddy-frontend-is-running-actual-software-release
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/promise/caddy_cached
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/promise/caddy_frontend_ipv4_http
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/promise/caddy_frontend_ipv4_https
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/promise/caddy_frontend_ipv6_http
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/promise/caddy_frontend_ipv6_https
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/promise/caddy_ssl_cached
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/promise/check-_enable-http2-default-error-log-last-day
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/promise/check-_enable-http2-default-error-log-last-hour
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/promise/check-_enable-http2-false-error-log-last-day
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/promise/check-_enable-http2-false-error-log-last-hour
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/promise/check-_enable-http2-true-error-log-last-day
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/promise/check-_enable-http2-true-error-log-last-hour
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/promise/frontend-caddy-configuration-promise
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/promise/monitor-http-frontend
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/promise/monitor-httpd-listening-on-tcp
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/promise/nginx-configuration-promise
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/promise/nginx_frontend_ipv4_http
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/promise/nginx_frontend_ipv4_https
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/promise/nginx_frontend_ipv6_http
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/promise/nginx_frontend_ipv6_https
 TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/promise/promise-nginx-is-process-older-than-dependency-set
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/promise/re6st-connectivity
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/promise/trafficserver-cache-availability
-TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/promise/trafficserver-port-listening
\ No newline at end of file
+TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/promise/promise-nginx-is-process-older-than-dependency-set
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestMalformedBackenUrlSlave.test_plugin_list-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestMalformedBackenUrlSlave.test_plugin_list-CADDY.txt
index 055cbad38bfdc91c43807654d3a0ba079b05ca32..78383d48130bd7e9a93af9a37cbdfd2df7f356d3 100644
--- a/software/caddy-frontend/test/test_data/test.TestMalformedBackenUrlSlave.test_plugin_list-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestMalformedBackenUrlSlave.test_plugin_list-CADDY.txt
@@ -2,7 +2,28 @@ TestMalformedBackenUrlSlave-0/etc/plugin/__init__.py
 TestMalformedBackenUrlSlave-0/etc/plugin/buildout-TestMalformedBackenUrlSlave-0-status.py
 TestMalformedBackenUrlSlave-0/etc/plugin/check-free-disk-space.py
 TestMalformedBackenUrlSlave-0/etc/plugin/monitor-bootstrap-status.py
+TestMalformedBackenUrlSlave-0/etc/plugin/monitor-http-frontend.py
+TestMalformedBackenUrlSlave-0/etc/plugin/monitor-httpd-listening-on-tcp.py
 TestMalformedBackenUrlSlave-1/etc/plugin/__init__.py
 TestMalformedBackenUrlSlave-1/etc/plugin/buildout-TestMalformedBackenUrlSlave-1-status.py
+TestMalformedBackenUrlSlave-1/etc/plugin/caddy_cached.py
+TestMalformedBackenUrlSlave-1/etc/plugin/caddy_frontend_ipv4_http.py
+TestMalformedBackenUrlSlave-1/etc/plugin/caddy_frontend_ipv4_https.py
+TestMalformedBackenUrlSlave-1/etc/plugin/caddy_frontend_ipv6_http.py
+TestMalformedBackenUrlSlave-1/etc/plugin/caddy_frontend_ipv6_https.py
+TestMalformedBackenUrlSlave-1/etc/plugin/caddy_ssl_cached.py
+TestMalformedBackenUrlSlave-1/etc/plugin/check-_empty-error-log-last-day.py
+TestMalformedBackenUrlSlave-1/etc/plugin/check-_empty-error-log-last-hour.py
 TestMalformedBackenUrlSlave-1/etc/plugin/check-free-disk-space.py
-TestMalformedBackenUrlSlave-1/etc/plugin/monitor-bootstrap-status.py
\ No newline at end of file
+TestMalformedBackenUrlSlave-1/etc/plugin/frontend-caddy-configuration-promise.py
+TestMalformedBackenUrlSlave-1/etc/plugin/monitor-bootstrap-status.py
+TestMalformedBackenUrlSlave-1/etc/plugin/monitor-http-frontend.py
+TestMalformedBackenUrlSlave-1/etc/plugin/monitor-httpd-listening-on-tcp.py
+TestMalformedBackenUrlSlave-1/etc/plugin/nginx-configuration-promise.py
+TestMalformedBackenUrlSlave-1/etc/plugin/nginx_frontend_ipv4_http.py
+TestMalformedBackenUrlSlave-1/etc/plugin/nginx_frontend_ipv4_https.py
+TestMalformedBackenUrlSlave-1/etc/plugin/nginx_frontend_ipv6_http.py
+TestMalformedBackenUrlSlave-1/etc/plugin/nginx_frontend_ipv6_https.py
+TestMalformedBackenUrlSlave-1/etc/plugin/re6st-connectivity.py
+TestMalformedBackenUrlSlave-1/etc/plugin/trafficserver-cache-availability.py
+TestMalformedBackenUrlSlave-1/etc/plugin/trafficserver-port-listening.py
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestMalformedBackenUrlSlave.test_promise_list-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestMalformedBackenUrlSlave.test_promise_list-CADDY.txt
index f01d1043de2444f79b73bc37b9a03be4136ea068..00a84a438b8d9319af9d1f3344426ec0f95e9ee5 100644
--- a/software/caddy-frontend/test/test_data/test.TestMalformedBackenUrlSlave.test_promise_list-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestMalformedBackenUrlSlave.test_promise_list-CADDY.txt
@@ -1,25 +1,4 @@
-TestMalformedBackenUrlSlave-0/etc/promise/monitor-http-frontend
-TestMalformedBackenUrlSlave-0/etc/promise/monitor-httpd-listening-on-tcp
 TestMalformedBackenUrlSlave-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set
 TestMalformedBackenUrlSlave-1/etc/promise/caddy-frontend-is-running-actual-software-release
-TestMalformedBackenUrlSlave-1/etc/promise/caddy_cached
-TestMalformedBackenUrlSlave-1/etc/promise/caddy_frontend_ipv4_http
-TestMalformedBackenUrlSlave-1/etc/promise/caddy_frontend_ipv4_https
-TestMalformedBackenUrlSlave-1/etc/promise/caddy_frontend_ipv6_http
-TestMalformedBackenUrlSlave-1/etc/promise/caddy_frontend_ipv6_https
-TestMalformedBackenUrlSlave-1/etc/promise/caddy_ssl_cached
-TestMalformedBackenUrlSlave-1/etc/promise/check-_empty-error-log-last-day
-TestMalformedBackenUrlSlave-1/etc/promise/check-_empty-error-log-last-hour
-TestMalformedBackenUrlSlave-1/etc/promise/frontend-caddy-configuration-promise
-TestMalformedBackenUrlSlave-1/etc/promise/monitor-http-frontend
-TestMalformedBackenUrlSlave-1/etc/promise/monitor-httpd-listening-on-tcp
-TestMalformedBackenUrlSlave-1/etc/promise/nginx-configuration-promise
-TestMalformedBackenUrlSlave-1/etc/promise/nginx_frontend_ipv4_http
-TestMalformedBackenUrlSlave-1/etc/promise/nginx_frontend_ipv4_https
-TestMalformedBackenUrlSlave-1/etc/promise/nginx_frontend_ipv6_http
-TestMalformedBackenUrlSlave-1/etc/promise/nginx_frontend_ipv6_https
 TestMalformedBackenUrlSlave-1/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set
-TestMalformedBackenUrlSlave-1/etc/promise/promise-nginx-is-process-older-than-dependency-set
-TestMalformedBackenUrlSlave-1/etc/promise/re6st-connectivity
-TestMalformedBackenUrlSlave-1/etc/promise/trafficserver-cache-availability
-TestMalformedBackenUrlSlave-1/etc/promise/trafficserver-port-listening
\ No newline at end of file
+TestMalformedBackenUrlSlave-1/etc/promise/promise-nginx-is-process-older-than-dependency-set
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestMasterRequest.test_plugin_list-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestMasterRequest.test_plugin_list-CADDY.txt
index 08d8789ba0c13754278fedaa1d2e9128f2f84407..9ab3597aa0825b9b8b723930fe890db3b220b66f 100644
--- a/software/caddy-frontend/test/test_data/test.TestMasterRequest.test_plugin_list-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestMasterRequest.test_plugin_list-CADDY.txt
@@ -2,7 +2,26 @@ TestMasterRequest-0/etc/plugin/__init__.py
 TestMasterRequest-0/etc/plugin/buildout-TestMasterRequest-0-status.py
 TestMasterRequest-0/etc/plugin/check-free-disk-space.py
 TestMasterRequest-0/etc/plugin/monitor-bootstrap-status.py
+TestMasterRequest-0/etc/plugin/monitor-http-frontend.py
+TestMasterRequest-0/etc/plugin/monitor-httpd-listening-on-tcp.py
 TestMasterRequest-1/etc/plugin/__init__.py
 TestMasterRequest-1/etc/plugin/buildout-TestMasterRequest-1-status.py
+TestMasterRequest-1/etc/plugin/caddy_cached.py
+TestMasterRequest-1/etc/plugin/caddy_frontend_ipv4_http.py
+TestMasterRequest-1/etc/plugin/caddy_frontend_ipv4_https.py
+TestMasterRequest-1/etc/plugin/caddy_frontend_ipv6_http.py
+TestMasterRequest-1/etc/plugin/caddy_frontend_ipv6_https.py
+TestMasterRequest-1/etc/plugin/caddy_ssl_cached.py
 TestMasterRequest-1/etc/plugin/check-free-disk-space.py
-TestMasterRequest-1/etc/plugin/monitor-bootstrap-status.py
\ No newline at end of file
+TestMasterRequest-1/etc/plugin/frontend-caddy-configuration-promise.py
+TestMasterRequest-1/etc/plugin/monitor-bootstrap-status.py
+TestMasterRequest-1/etc/plugin/monitor-http-frontend.py
+TestMasterRequest-1/etc/plugin/monitor-httpd-listening-on-tcp.py
+TestMasterRequest-1/etc/plugin/nginx-configuration-promise.py
+TestMasterRequest-1/etc/plugin/nginx_frontend_ipv4_http.py
+TestMasterRequest-1/etc/plugin/nginx_frontend_ipv4_https.py
+TestMasterRequest-1/etc/plugin/nginx_frontend_ipv6_http.py
+TestMasterRequest-1/etc/plugin/nginx_frontend_ipv6_https.py
+TestMasterRequest-1/etc/plugin/re6st-connectivity.py
+TestMasterRequest-1/etc/plugin/trafficserver-cache-availability.py
+TestMasterRequest-1/etc/plugin/trafficserver-port-listening.py
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestMasterRequest.test_promise_list-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestMasterRequest.test_promise_list-CADDY.txt
index e371aa7ec00bcc98a0d46cedbfc2ad0dd8a2480b..99c64678d898041d537b5cdd2bbb25279ef82751 100644
--- a/software/caddy-frontend/test/test_data/test.TestMasterRequest.test_promise_list-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestMasterRequest.test_promise_list-CADDY.txt
@@ -1,23 +1,4 @@
-TestMasterRequest-0/etc/promise/monitor-http-frontend
-TestMasterRequest-0/etc/promise/monitor-httpd-listening-on-tcp
 TestMasterRequest-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set
 TestMasterRequest-1/etc/promise/caddy-frontend-is-running-actual-software-release
-TestMasterRequest-1/etc/promise/caddy_cached
-TestMasterRequest-1/etc/promise/caddy_frontend_ipv4_http
-TestMasterRequest-1/etc/promise/caddy_frontend_ipv4_https
-TestMasterRequest-1/etc/promise/caddy_frontend_ipv6_http
-TestMasterRequest-1/etc/promise/caddy_frontend_ipv6_https
-TestMasterRequest-1/etc/promise/caddy_ssl_cached
-TestMasterRequest-1/etc/promise/frontend-caddy-configuration-promise
-TestMasterRequest-1/etc/promise/monitor-http-frontend
-TestMasterRequest-1/etc/promise/monitor-httpd-listening-on-tcp
-TestMasterRequest-1/etc/promise/nginx-configuration-promise
-TestMasterRequest-1/etc/promise/nginx_frontend_ipv4_http
-TestMasterRequest-1/etc/promise/nginx_frontend_ipv4_https
-TestMasterRequest-1/etc/promise/nginx_frontend_ipv6_http
-TestMasterRequest-1/etc/promise/nginx_frontend_ipv6_https
 TestMasterRequest-1/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set
-TestMasterRequest-1/etc/promise/promise-nginx-is-process-older-than-dependency-set
-TestMasterRequest-1/etc/promise/re6st-connectivity
-TestMasterRequest-1/etc/promise/trafficserver-cache-availability
-TestMasterRequest-1/etc/promise/trafficserver-port-listening
\ No newline at end of file
+TestMasterRequest-1/etc/promise/promise-nginx-is-process-older-than-dependency-set
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_plugin_list-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_plugin_list-CADDY.txt
index 816a618cc0a968da8359b00d653c6353f3c59286..f7a4cfe9c867fa3df5ad04d9edc2c8766fd29263 100644
--- a/software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_plugin_list-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_plugin_list-CADDY.txt
@@ -2,7 +2,26 @@ TestMasterRequestDomain-0/etc/plugin/__init__.py
 TestMasterRequestDomain-0/etc/plugin/buildout-TestMasterRequestDomain-0-status.py
 TestMasterRequestDomain-0/etc/plugin/check-free-disk-space.py
 TestMasterRequestDomain-0/etc/plugin/monitor-bootstrap-status.py
+TestMasterRequestDomain-0/etc/plugin/monitor-http-frontend.py
+TestMasterRequestDomain-0/etc/plugin/monitor-httpd-listening-on-tcp.py
 TestMasterRequestDomain-1/etc/plugin/__init__.py
 TestMasterRequestDomain-1/etc/plugin/buildout-TestMasterRequestDomain-1-status.py
+TestMasterRequestDomain-1/etc/plugin/caddy_cached.py
+TestMasterRequestDomain-1/etc/plugin/caddy_frontend_ipv4_http.py
+TestMasterRequestDomain-1/etc/plugin/caddy_frontend_ipv4_https.py
+TestMasterRequestDomain-1/etc/plugin/caddy_frontend_ipv6_http.py
+TestMasterRequestDomain-1/etc/plugin/caddy_frontend_ipv6_https.py
+TestMasterRequestDomain-1/etc/plugin/caddy_ssl_cached.py
 TestMasterRequestDomain-1/etc/plugin/check-free-disk-space.py
-TestMasterRequestDomain-1/etc/plugin/monitor-bootstrap-status.py
\ No newline at end of file
+TestMasterRequestDomain-1/etc/plugin/frontend-caddy-configuration-promise.py
+TestMasterRequestDomain-1/etc/plugin/monitor-bootstrap-status.py
+TestMasterRequestDomain-1/etc/plugin/monitor-http-frontend.py
+TestMasterRequestDomain-1/etc/plugin/monitor-httpd-listening-on-tcp.py
+TestMasterRequestDomain-1/etc/plugin/nginx-configuration-promise.py
+TestMasterRequestDomain-1/etc/plugin/nginx_frontend_ipv4_http.py
+TestMasterRequestDomain-1/etc/plugin/nginx_frontend_ipv4_https.py
+TestMasterRequestDomain-1/etc/plugin/nginx_frontend_ipv6_http.py
+TestMasterRequestDomain-1/etc/plugin/nginx_frontend_ipv6_https.py
+TestMasterRequestDomain-1/etc/plugin/re6st-connectivity.py
+TestMasterRequestDomain-1/etc/plugin/trafficserver-cache-availability.py
+TestMasterRequestDomain-1/etc/plugin/trafficserver-port-listening.py
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_promise_list-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_promise_list-CADDY.txt
index c8298e1deb78954a2f72041987c72d8703cf3820..d62cebc033118265e30dd8116cffcc420a5cd7bd 100644
--- a/software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_promise_list-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_promise_list-CADDY.txt
@@ -1,23 +1,4 @@
-TestMasterRequestDomain-0/etc/promise/monitor-http-frontend
-TestMasterRequestDomain-0/etc/promise/monitor-httpd-listening-on-tcp
 TestMasterRequestDomain-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set
 TestMasterRequestDomain-1/etc/promise/caddy-frontend-is-running-actual-software-release
-TestMasterRequestDomain-1/etc/promise/caddy_cached
-TestMasterRequestDomain-1/etc/promise/caddy_frontend_ipv4_http
-TestMasterRequestDomain-1/etc/promise/caddy_frontend_ipv4_https
-TestMasterRequestDomain-1/etc/promise/caddy_frontend_ipv6_http
-TestMasterRequestDomain-1/etc/promise/caddy_frontend_ipv6_https
-TestMasterRequestDomain-1/etc/promise/caddy_ssl_cached
-TestMasterRequestDomain-1/etc/promise/frontend-caddy-configuration-promise
-TestMasterRequestDomain-1/etc/promise/monitor-http-frontend
-TestMasterRequestDomain-1/etc/promise/monitor-httpd-listening-on-tcp
-TestMasterRequestDomain-1/etc/promise/nginx-configuration-promise
-TestMasterRequestDomain-1/etc/promise/nginx_frontend_ipv4_http
-TestMasterRequestDomain-1/etc/promise/nginx_frontend_ipv4_https
-TestMasterRequestDomain-1/etc/promise/nginx_frontend_ipv6_http
-TestMasterRequestDomain-1/etc/promise/nginx_frontend_ipv6_https
 TestMasterRequestDomain-1/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set
-TestMasterRequestDomain-1/etc/promise/promise-nginx-is-process-older-than-dependency-set
-TestMasterRequestDomain-1/etc/promise/re6st-connectivity
-TestMasterRequestDomain-1/etc/promise/trafficserver-cache-availability
-TestMasterRequestDomain-1/etc/promise/trafficserver-port-listening
\ No newline at end of file
+TestMasterRequestDomain-1/etc/promise/promise-nginx-is-process-older-than-dependency-set
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_plugin_list-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_plugin_list-CADDY.txt
index 8ec7bbea1747b043e47e9af93db04094503cb178..3b9e8ad9556fb801aa8dd80dea99d7740c8cfae9 100644
--- a/software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_plugin_list-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_plugin_list-CADDY.txt
@@ -2,7 +2,28 @@ TestQuicEnabled-0/etc/plugin/__init__.py
 TestQuicEnabled-0/etc/plugin/buildout-TestQuicEnabled-0-status.py
 TestQuicEnabled-0/etc/plugin/check-free-disk-space.py
 TestQuicEnabled-0/etc/plugin/monitor-bootstrap-status.py
+TestQuicEnabled-0/etc/plugin/monitor-http-frontend.py
+TestQuicEnabled-0/etc/plugin/monitor-httpd-listening-on-tcp.py
 TestQuicEnabled-1/etc/plugin/__init__.py
 TestQuicEnabled-1/etc/plugin/buildout-TestQuicEnabled-1-status.py
+TestQuicEnabled-1/etc/plugin/caddy_cached.py
+TestQuicEnabled-1/etc/plugin/caddy_frontend_ipv4_http.py
+TestQuicEnabled-1/etc/plugin/caddy_frontend_ipv4_https.py
+TestQuicEnabled-1/etc/plugin/caddy_frontend_ipv6_http.py
+TestQuicEnabled-1/etc/plugin/caddy_frontend_ipv6_https.py
+TestQuicEnabled-1/etc/plugin/caddy_ssl_cached.py
+TestQuicEnabled-1/etc/plugin/check-_url-error-log-last-day.py
+TestQuicEnabled-1/etc/plugin/check-_url-error-log-last-hour.py
 TestQuicEnabled-1/etc/plugin/check-free-disk-space.py
-TestQuicEnabled-1/etc/plugin/monitor-bootstrap-status.py
\ No newline at end of file
+TestQuicEnabled-1/etc/plugin/frontend-caddy-configuration-promise.py
+TestQuicEnabled-1/etc/plugin/monitor-bootstrap-status.py
+TestQuicEnabled-1/etc/plugin/monitor-http-frontend.py
+TestQuicEnabled-1/etc/plugin/monitor-httpd-listening-on-tcp.py
+TestQuicEnabled-1/etc/plugin/nginx-configuration-promise.py
+TestQuicEnabled-1/etc/plugin/nginx_frontend_ipv4_http.py
+TestQuicEnabled-1/etc/plugin/nginx_frontend_ipv4_https.py
+TestQuicEnabled-1/etc/plugin/nginx_frontend_ipv6_http.py
+TestQuicEnabled-1/etc/plugin/nginx_frontend_ipv6_https.py
+TestQuicEnabled-1/etc/plugin/re6st-connectivity.py
+TestQuicEnabled-1/etc/plugin/trafficserver-cache-availability.py
+TestQuicEnabled-1/etc/plugin/trafficserver-port-listening.py
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_promise_list-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_promise_list-CADDY.txt
index 9c1f7a52dbcc8eff69203b560fb6eee1a48e7481..c5168f46d629b43affba5fcc08b3fda44d718e8a 100644
--- a/software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_promise_list-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_promise_list-CADDY.txt
@@ -1,25 +1,4 @@
-TestQuicEnabled-0/etc/promise/monitor-http-frontend
-TestQuicEnabled-0/etc/promise/monitor-httpd-listening-on-tcp
 TestQuicEnabled-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set
 TestQuicEnabled-1/etc/promise/caddy-frontend-is-running-actual-software-release
-TestQuicEnabled-1/etc/promise/caddy_cached
-TestQuicEnabled-1/etc/promise/caddy_frontend_ipv4_http
-TestQuicEnabled-1/etc/promise/caddy_frontend_ipv4_https
-TestQuicEnabled-1/etc/promise/caddy_frontend_ipv6_http
-TestQuicEnabled-1/etc/promise/caddy_frontend_ipv6_https
-TestQuicEnabled-1/etc/promise/caddy_ssl_cached
-TestQuicEnabled-1/etc/promise/check-_url-error-log-last-day
-TestQuicEnabled-1/etc/promise/check-_url-error-log-last-hour
-TestQuicEnabled-1/etc/promise/frontend-caddy-configuration-promise
-TestQuicEnabled-1/etc/promise/monitor-http-frontend
-TestQuicEnabled-1/etc/promise/monitor-httpd-listening-on-tcp
-TestQuicEnabled-1/etc/promise/nginx-configuration-promise
-TestQuicEnabled-1/etc/promise/nginx_frontend_ipv4_http
-TestQuicEnabled-1/etc/promise/nginx_frontend_ipv4_https
-TestQuicEnabled-1/etc/promise/nginx_frontend_ipv6_http
-TestQuicEnabled-1/etc/promise/nginx_frontend_ipv6_https
 TestQuicEnabled-1/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set
-TestQuicEnabled-1/etc/promise/promise-nginx-is-process-older-than-dependency-set
-TestQuicEnabled-1/etc/promise/re6st-connectivity
-TestQuicEnabled-1/etc/promise/trafficserver-cache-availability
-TestQuicEnabled-1/etc/promise/trafficserver-port-listening
\ No newline at end of file
+TestQuicEnabled-1/etc/promise/promise-nginx-is-process-older-than-dependency-set
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_plugin_list-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_plugin_list-CADDY.txt
index 6783c86d1ec90d7d6d3d21d0507fe53176fb3b5c..9277f83003dab6c520166ce7a734f0ba3783a692 100644
--- a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_plugin_list-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_plugin_list-CADDY.txt
@@ -2,7 +2,28 @@ TestRe6stVerificationUrlDefaultSlave-0/etc/plugin/__init__.py
 TestRe6stVerificationUrlDefaultSlave-0/etc/plugin/buildout-TestRe6stVerificationUrlDefaultSlave-0-status.py
 TestRe6stVerificationUrlDefaultSlave-0/etc/plugin/check-free-disk-space.py
 TestRe6stVerificationUrlDefaultSlave-0/etc/plugin/monitor-bootstrap-status.py
+TestRe6stVerificationUrlDefaultSlave-0/etc/plugin/monitor-http-frontend.py
+TestRe6stVerificationUrlDefaultSlave-0/etc/plugin/monitor-httpd-listening-on-tcp.py
 TestRe6stVerificationUrlDefaultSlave-1/etc/plugin/__init__.py
 TestRe6stVerificationUrlDefaultSlave-1/etc/plugin/buildout-TestRe6stVerificationUrlDefaultSlave-1-status.py
+TestRe6stVerificationUrlDefaultSlave-1/etc/plugin/caddy_cached.py
+TestRe6stVerificationUrlDefaultSlave-1/etc/plugin/caddy_frontend_ipv4_http.py
+TestRe6stVerificationUrlDefaultSlave-1/etc/plugin/caddy_frontend_ipv4_https.py
+TestRe6stVerificationUrlDefaultSlave-1/etc/plugin/caddy_frontend_ipv6_http.py
+TestRe6stVerificationUrlDefaultSlave-1/etc/plugin/caddy_frontend_ipv6_https.py
+TestRe6stVerificationUrlDefaultSlave-1/etc/plugin/caddy_ssl_cached.py
+TestRe6stVerificationUrlDefaultSlave-1/etc/plugin/check-_default-error-log-last-day.py
+TestRe6stVerificationUrlDefaultSlave-1/etc/plugin/check-_default-error-log-last-hour.py
 TestRe6stVerificationUrlDefaultSlave-1/etc/plugin/check-free-disk-space.py
-TestRe6stVerificationUrlDefaultSlave-1/etc/plugin/monitor-bootstrap-status.py
\ No newline at end of file
+TestRe6stVerificationUrlDefaultSlave-1/etc/plugin/frontend-caddy-configuration-promise.py
+TestRe6stVerificationUrlDefaultSlave-1/etc/plugin/monitor-bootstrap-status.py
+TestRe6stVerificationUrlDefaultSlave-1/etc/plugin/monitor-http-frontend.py
+TestRe6stVerificationUrlDefaultSlave-1/etc/plugin/monitor-httpd-listening-on-tcp.py
+TestRe6stVerificationUrlDefaultSlave-1/etc/plugin/nginx-configuration-promise.py
+TestRe6stVerificationUrlDefaultSlave-1/etc/plugin/nginx_frontend_ipv4_http.py
+TestRe6stVerificationUrlDefaultSlave-1/etc/plugin/nginx_frontend_ipv4_https.py
+TestRe6stVerificationUrlDefaultSlave-1/etc/plugin/nginx_frontend_ipv6_http.py
+TestRe6stVerificationUrlDefaultSlave-1/etc/plugin/nginx_frontend_ipv6_https.py
+TestRe6stVerificationUrlDefaultSlave-1/etc/plugin/re6st-connectivity.py
+TestRe6stVerificationUrlDefaultSlave-1/etc/plugin/trafficserver-cache-availability.py
+TestRe6stVerificationUrlDefaultSlave-1/etc/plugin/trafficserver-port-listening.py
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_promise_list-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_promise_list-CADDY.txt
index c7b0f45f35fbe5ba711996d487036226fb55e87e..b0e99e17d001a145fc37a2f29c878eee8f1988b0 100644
--- a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_promise_list-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_promise_list-CADDY.txt
@@ -1,25 +1,4 @@
-TestRe6stVerificationUrlDefaultSlave-0/etc/promise/monitor-http-frontend
-TestRe6stVerificationUrlDefaultSlave-0/etc/promise/monitor-httpd-listening-on-tcp
 TestRe6stVerificationUrlDefaultSlave-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set
 TestRe6stVerificationUrlDefaultSlave-1/etc/promise/caddy-frontend-is-running-actual-software-release
-TestRe6stVerificationUrlDefaultSlave-1/etc/promise/caddy_cached
-TestRe6stVerificationUrlDefaultSlave-1/etc/promise/caddy_frontend_ipv4_http
-TestRe6stVerificationUrlDefaultSlave-1/etc/promise/caddy_frontend_ipv4_https
-TestRe6stVerificationUrlDefaultSlave-1/etc/promise/caddy_frontend_ipv6_http
-TestRe6stVerificationUrlDefaultSlave-1/etc/promise/caddy_frontend_ipv6_https
-TestRe6stVerificationUrlDefaultSlave-1/etc/promise/caddy_ssl_cached
-TestRe6stVerificationUrlDefaultSlave-1/etc/promise/check-_default-error-log-last-day
-TestRe6stVerificationUrlDefaultSlave-1/etc/promise/check-_default-error-log-last-hour
-TestRe6stVerificationUrlDefaultSlave-1/etc/promise/frontend-caddy-configuration-promise
-TestRe6stVerificationUrlDefaultSlave-1/etc/promise/monitor-http-frontend
-TestRe6stVerificationUrlDefaultSlave-1/etc/promise/monitor-httpd-listening-on-tcp
-TestRe6stVerificationUrlDefaultSlave-1/etc/promise/nginx-configuration-promise
-TestRe6stVerificationUrlDefaultSlave-1/etc/promise/nginx_frontend_ipv4_http
-TestRe6stVerificationUrlDefaultSlave-1/etc/promise/nginx_frontend_ipv4_https
-TestRe6stVerificationUrlDefaultSlave-1/etc/promise/nginx_frontend_ipv6_http
-TestRe6stVerificationUrlDefaultSlave-1/etc/promise/nginx_frontend_ipv6_https
 TestRe6stVerificationUrlDefaultSlave-1/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set
-TestRe6stVerificationUrlDefaultSlave-1/etc/promise/promise-nginx-is-process-older-than-dependency-set
-TestRe6stVerificationUrlDefaultSlave-1/etc/promise/re6st-connectivity
-TestRe6stVerificationUrlDefaultSlave-1/etc/promise/trafficserver-cache-availability
-TestRe6stVerificationUrlDefaultSlave-1/etc/promise/trafficserver-port-listening
\ No newline at end of file
+TestRe6stVerificationUrlDefaultSlave-1/etc/promise/promise-nginx-is-process-older-than-dependency-set
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_plugin_list-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_plugin_list-CADDY.txt
index 9ede84cb847903b14b98cfd981535c65097718c9..f982bc0e6addf83a5b89de5d08d3f8ce1dc15d2d 100644
--- a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_plugin_list-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_plugin_list-CADDY.txt
@@ -2,7 +2,28 @@ TestRe6stVerificationUrlSlave-0/etc/plugin/__init__.py
 TestRe6stVerificationUrlSlave-0/etc/plugin/buildout-TestRe6stVerificationUrlSlave-0-status.py
 TestRe6stVerificationUrlSlave-0/etc/plugin/check-free-disk-space.py
 TestRe6stVerificationUrlSlave-0/etc/plugin/monitor-bootstrap-status.py
+TestRe6stVerificationUrlSlave-0/etc/plugin/monitor-http-frontend.py
+TestRe6stVerificationUrlSlave-0/etc/plugin/monitor-httpd-listening-on-tcp.py
 TestRe6stVerificationUrlSlave-1/etc/plugin/__init__.py
 TestRe6stVerificationUrlSlave-1/etc/plugin/buildout-TestRe6stVerificationUrlSlave-1-status.py
+TestRe6stVerificationUrlSlave-1/etc/plugin/caddy_cached.py
+TestRe6stVerificationUrlSlave-1/etc/plugin/caddy_frontend_ipv4_http.py
+TestRe6stVerificationUrlSlave-1/etc/plugin/caddy_frontend_ipv4_https.py
+TestRe6stVerificationUrlSlave-1/etc/plugin/caddy_frontend_ipv6_http.py
+TestRe6stVerificationUrlSlave-1/etc/plugin/caddy_frontend_ipv6_https.py
+TestRe6stVerificationUrlSlave-1/etc/plugin/caddy_ssl_cached.py
+TestRe6stVerificationUrlSlave-1/etc/plugin/check-_default-error-log-last-day.py
+TestRe6stVerificationUrlSlave-1/etc/plugin/check-_default-error-log-last-hour.py
 TestRe6stVerificationUrlSlave-1/etc/plugin/check-free-disk-space.py
-TestRe6stVerificationUrlSlave-1/etc/plugin/monitor-bootstrap-status.py
\ No newline at end of file
+TestRe6stVerificationUrlSlave-1/etc/plugin/frontend-caddy-configuration-promise.py
+TestRe6stVerificationUrlSlave-1/etc/plugin/monitor-bootstrap-status.py
+TestRe6stVerificationUrlSlave-1/etc/plugin/monitor-http-frontend.py
+TestRe6stVerificationUrlSlave-1/etc/plugin/monitor-httpd-listening-on-tcp.py
+TestRe6stVerificationUrlSlave-1/etc/plugin/nginx-configuration-promise.py
+TestRe6stVerificationUrlSlave-1/etc/plugin/nginx_frontend_ipv4_http.py
+TestRe6stVerificationUrlSlave-1/etc/plugin/nginx_frontend_ipv4_https.py
+TestRe6stVerificationUrlSlave-1/etc/plugin/nginx_frontend_ipv6_http.py
+TestRe6stVerificationUrlSlave-1/etc/plugin/nginx_frontend_ipv6_https.py
+TestRe6stVerificationUrlSlave-1/etc/plugin/re6st-connectivity.py
+TestRe6stVerificationUrlSlave-1/etc/plugin/trafficserver-cache-availability.py
+TestRe6stVerificationUrlSlave-1/etc/plugin/trafficserver-port-listening.py
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_promise_list-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_promise_list-CADDY.txt
index e9805bea2b2cd9db2bc89162280baeab368f5403..0e9db8ce9a6ebcd79462b7d5adc53ee1c3de3688 100644
--- a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_promise_list-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_promise_list-CADDY.txt
@@ -1,25 +1,4 @@
-TestRe6stVerificationUrlSlave-0/etc/promise/monitor-http-frontend
-TestRe6stVerificationUrlSlave-0/etc/promise/monitor-httpd-listening-on-tcp
 TestRe6stVerificationUrlSlave-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set
 TestRe6stVerificationUrlSlave-1/etc/promise/caddy-frontend-is-running-actual-software-release
-TestRe6stVerificationUrlSlave-1/etc/promise/caddy_cached
-TestRe6stVerificationUrlSlave-1/etc/promise/caddy_frontend_ipv4_http
-TestRe6stVerificationUrlSlave-1/etc/promise/caddy_frontend_ipv4_https
-TestRe6stVerificationUrlSlave-1/etc/promise/caddy_frontend_ipv6_http
-TestRe6stVerificationUrlSlave-1/etc/promise/caddy_frontend_ipv6_https
-TestRe6stVerificationUrlSlave-1/etc/promise/caddy_ssl_cached
-TestRe6stVerificationUrlSlave-1/etc/promise/check-_default-error-log-last-day
-TestRe6stVerificationUrlSlave-1/etc/promise/check-_default-error-log-last-hour
-TestRe6stVerificationUrlSlave-1/etc/promise/frontend-caddy-configuration-promise
-TestRe6stVerificationUrlSlave-1/etc/promise/monitor-http-frontend
-TestRe6stVerificationUrlSlave-1/etc/promise/monitor-httpd-listening-on-tcp
-TestRe6stVerificationUrlSlave-1/etc/promise/nginx-configuration-promise
-TestRe6stVerificationUrlSlave-1/etc/promise/nginx_frontend_ipv4_http
-TestRe6stVerificationUrlSlave-1/etc/promise/nginx_frontend_ipv4_https
-TestRe6stVerificationUrlSlave-1/etc/promise/nginx_frontend_ipv6_http
-TestRe6stVerificationUrlSlave-1/etc/promise/nginx_frontend_ipv6_https
 TestRe6stVerificationUrlSlave-1/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set
-TestRe6stVerificationUrlSlave-1/etc/promise/promise-nginx-is-process-older-than-dependency-set
-TestRe6stVerificationUrlSlave-1/etc/promise/re6st-connectivity
-TestRe6stVerificationUrlSlave-1/etc/promise/trafficserver-cache-availability
-TestRe6stVerificationUrlSlave-1/etc/promise/trafficserver-port-listening
\ No newline at end of file
+TestRe6stVerificationUrlSlave-1/etc/promise/promise-nginx-is-process-older-than-dependency-set
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_plugin_list-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_plugin_list-CADDY.txt
index ab2c8359fcaeebcdc652d6134aa76eeaeda978dd..092043da3b430bf7ccebd34d7c19ed80121446d3 100644
--- a/software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_plugin_list-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_plugin_list-CADDY.txt
@@ -2,10 +2,50 @@ TestReplicateSlave-0/etc/plugin/__init__.py
 TestReplicateSlave-0/etc/plugin/buildout-TestReplicateSlave-0-status.py
 TestReplicateSlave-0/etc/plugin/check-free-disk-space.py
 TestReplicateSlave-0/etc/plugin/monitor-bootstrap-status.py
+TestReplicateSlave-0/etc/plugin/monitor-http-frontend.py
+TestReplicateSlave-0/etc/plugin/monitor-httpd-listening-on-tcp.py
 TestReplicateSlave-1/etc/plugin/__init__.py
 TestReplicateSlave-1/etc/plugin/buildout-TestReplicateSlave-1-status.py
+TestReplicateSlave-1/etc/plugin/caddy_cached.py
+TestReplicateSlave-1/etc/plugin/caddy_frontend_ipv4_http.py
+TestReplicateSlave-1/etc/plugin/caddy_frontend_ipv4_https.py
+TestReplicateSlave-1/etc/plugin/caddy_frontend_ipv6_http.py
+TestReplicateSlave-1/etc/plugin/caddy_frontend_ipv6_https.py
+TestReplicateSlave-1/etc/plugin/caddy_ssl_cached.py
+TestReplicateSlave-1/etc/plugin/check-_replicate-error-log-last-day.py
+TestReplicateSlave-1/etc/plugin/check-_replicate-error-log-last-hour.py
 TestReplicateSlave-1/etc/plugin/check-free-disk-space.py
+TestReplicateSlave-1/etc/plugin/frontend-caddy-configuration-promise.py
 TestReplicateSlave-1/etc/plugin/monitor-bootstrap-status.py
+TestReplicateSlave-1/etc/plugin/monitor-http-frontend.py
+TestReplicateSlave-1/etc/plugin/monitor-httpd-listening-on-tcp.py
+TestReplicateSlave-1/etc/plugin/nginx-configuration-promise.py
+TestReplicateSlave-1/etc/plugin/nginx_frontend_ipv4_http.py
+TestReplicateSlave-1/etc/plugin/nginx_frontend_ipv4_https.py
+TestReplicateSlave-1/etc/plugin/nginx_frontend_ipv6_http.py
+TestReplicateSlave-1/etc/plugin/nginx_frontend_ipv6_https.py
+TestReplicateSlave-1/etc/plugin/re6st-connectivity.py
+TestReplicateSlave-1/etc/plugin/trafficserver-cache-availability.py
+TestReplicateSlave-1/etc/plugin/trafficserver-port-listening.py
 TestReplicateSlave-2/etc/plugin/buildout-TestReplicateSlave-2-status.py
+TestReplicateSlave-2/etc/plugin/caddy_cached.py
+TestReplicateSlave-2/etc/plugin/caddy_frontend_ipv4_http.py
+TestReplicateSlave-2/etc/plugin/caddy_frontend_ipv4_https.py
+TestReplicateSlave-2/etc/plugin/caddy_frontend_ipv6_http.py
+TestReplicateSlave-2/etc/plugin/caddy_frontend_ipv6_https.py
+TestReplicateSlave-2/etc/plugin/caddy_ssl_cached.py
+TestReplicateSlave-2/etc/plugin/check-_replicate-error-log-last-day.py
+TestReplicateSlave-2/etc/plugin/check-_replicate-error-log-last-hour.py
 TestReplicateSlave-2/etc/plugin/check-free-disk-space.py
-TestReplicateSlave-2/etc/plugin/monitor-bootstrap-status.py
\ No newline at end of file
+TestReplicateSlave-2/etc/plugin/frontend-caddy-configuration-promise.py
+TestReplicateSlave-2/etc/plugin/monitor-bootstrap-status.py
+TestReplicateSlave-2/etc/plugin/monitor-http-frontend.py
+TestReplicateSlave-2/etc/plugin/monitor-httpd-listening-on-tcp.py
+TestReplicateSlave-2/etc/plugin/nginx-configuration-promise.py
+TestReplicateSlave-2/etc/plugin/nginx_frontend_ipv4_http.py
+TestReplicateSlave-2/etc/plugin/nginx_frontend_ipv4_https.py
+TestReplicateSlave-2/etc/plugin/nginx_frontend_ipv6_http.py
+TestReplicateSlave-2/etc/plugin/nginx_frontend_ipv6_https.py
+TestReplicateSlave-2/etc/plugin/re6st-connectivity.py
+TestReplicateSlave-2/etc/plugin/trafficserver-cache-availability.py
+TestReplicateSlave-2/etc/plugin/trafficserver-port-listening.py
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_promise_list-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_promise_list-CADDY.txt
index 96a642e9e39df40fd5f801c7030e39ff1113d7fa..a97163fd60c6e1fe9c8683a20175333050dcb950 100644
--- a/software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_promise_list-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_promise_list-CADDY.txt
@@ -1,47 +1,7 @@
-TestReplicateSlave-0/etc/promise/monitor-http-frontend
-TestReplicateSlave-0/etc/promise/monitor-httpd-listening-on-tcp
 TestReplicateSlave-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set
 TestReplicateSlave-1/etc/promise/caddy-frontend-is-running-actual-software-release
-TestReplicateSlave-1/etc/promise/caddy_cached
-TestReplicateSlave-1/etc/promise/caddy_frontend_ipv4_http
-TestReplicateSlave-1/etc/promise/caddy_frontend_ipv4_https
-TestReplicateSlave-1/etc/promise/caddy_frontend_ipv6_http
-TestReplicateSlave-1/etc/promise/caddy_frontend_ipv6_https
-TestReplicateSlave-1/etc/promise/caddy_ssl_cached
-TestReplicateSlave-1/etc/promise/check-_replicate-error-log-last-day
-TestReplicateSlave-1/etc/promise/check-_replicate-error-log-last-hour
-TestReplicateSlave-1/etc/promise/frontend-caddy-configuration-promise
-TestReplicateSlave-1/etc/promise/monitor-http-frontend
-TestReplicateSlave-1/etc/promise/monitor-httpd-listening-on-tcp
-TestReplicateSlave-1/etc/promise/nginx-configuration-promise
-TestReplicateSlave-1/etc/promise/nginx_frontend_ipv4_http
-TestReplicateSlave-1/etc/promise/nginx_frontend_ipv4_https
-TestReplicateSlave-1/etc/promise/nginx_frontend_ipv6_http
-TestReplicateSlave-1/etc/promise/nginx_frontend_ipv6_https
 TestReplicateSlave-1/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set
 TestReplicateSlave-1/etc/promise/promise-nginx-is-process-older-than-dependency-set
-TestReplicateSlave-1/etc/promise/re6st-connectivity
-TestReplicateSlave-1/etc/promise/trafficserver-cache-availability
-TestReplicateSlave-1/etc/promise/trafficserver-port-listening
 TestReplicateSlave-2/etc/promise/caddy-frontend-is-running-actual-software-release
-TestReplicateSlave-2/etc/promise/caddy_cached
-TestReplicateSlave-2/etc/promise/caddy_frontend_ipv4_http
-TestReplicateSlave-2/etc/promise/caddy_frontend_ipv4_https
-TestReplicateSlave-2/etc/promise/caddy_frontend_ipv6_http
-TestReplicateSlave-2/etc/promise/caddy_frontend_ipv6_https
-TestReplicateSlave-2/etc/promise/caddy_ssl_cached
-TestReplicateSlave-2/etc/promise/check-_replicate-error-log-last-day
-TestReplicateSlave-2/etc/promise/check-_replicate-error-log-last-hour
-TestReplicateSlave-2/etc/promise/frontend-caddy-configuration-promise
-TestReplicateSlave-2/etc/promise/monitor-http-frontend
-TestReplicateSlave-2/etc/promise/monitor-httpd-listening-on-tcp
-TestReplicateSlave-2/etc/promise/nginx-configuration-promise
-TestReplicateSlave-2/etc/promise/nginx_frontend_ipv4_http
-TestReplicateSlave-2/etc/promise/nginx_frontend_ipv4_https
-TestReplicateSlave-2/etc/promise/nginx_frontend_ipv6_http
-TestReplicateSlave-2/etc/promise/nginx_frontend_ipv6_https
 TestReplicateSlave-2/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set
-TestReplicateSlave-2/etc/promise/promise-nginx-is-process-older-than-dependency-set
-TestReplicateSlave-2/etc/promise/re6st-connectivity
-TestReplicateSlave-2/etc/promise/trafficserver-cache-availability
-TestReplicateSlave-2/etc/promise/trafficserver-port-listening
\ No newline at end of file
+TestReplicateSlave-2/etc/promise/promise-nginx-is-process-older-than-dependency-set
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestSlave.test_plugin_list-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlave.test_plugin_list-CADDY.txt
index 5129bb26b1b40c8df9d33fff7de14fe3e05b7fbc..c0a1d49ae995c524bd3eb53722a086e8eebe64c9 100644
--- a/software/caddy-frontend/test/test_data/test.TestSlave.test_plugin_list-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestSlave.test_plugin_list-CADDY.txt
@@ -2,7 +2,117 @@ TestSlave-0/etc/plugin/__init__.py
 TestSlave-0/etc/plugin/buildout-TestSlave-0-status.py
 TestSlave-0/etc/plugin/check-free-disk-space.py
 TestSlave-0/etc/plugin/monitor-bootstrap-status.py
+TestSlave-0/etc/plugin/monitor-http-frontend.py
+TestSlave-0/etc/plugin/monitor-httpd-listening-on-tcp.py
 TestSlave-1/etc/plugin/__init__.py
 TestSlave-1/etc/plugin/buildout-TestSlave-1-status.py
+TestSlave-1/etc/plugin/caddy_cached.py
+TestSlave-1/etc/plugin/caddy_frontend_ipv4_http.py
+TestSlave-1/etc/plugin/caddy_frontend_ipv4_https.py
+TestSlave-1/etc/plugin/caddy_frontend_ipv6_http.py
+TestSlave-1/etc/plugin/caddy_frontend_ipv6_https.py
+TestSlave-1/etc/plugin/caddy_ssl_cached.py
+TestSlave-1/etc/plugin/check-_apache_custom_http_s-accepted-error-log-last-day.py
+TestSlave-1/etc/plugin/check-_apache_custom_http_s-accepted-error-log-last-hour.py
+TestSlave-1/etc/plugin/check-_caddy_custom_http_s-accepted-error-log-last-day.py
+TestSlave-1/etc/plugin/check-_caddy_custom_http_s-accepted-error-log-last-hour.py
+TestSlave-1/etc/plugin/check-_custom_domain-error-log-last-day.py
+TestSlave-1/etc/plugin/check-_custom_domain-error-log-last-hour.py
+TestSlave-1/etc/plugin/check-_custom_domain_ssl_crt_ssl_key-error-log-last-day.py
+TestSlave-1/etc/plugin/check-_custom_domain_ssl_crt_ssl_key-error-log-last-hour.py
+TestSlave-1/etc/plugin/check-_custom_domain_ssl_crt_ssl_key_ssl_ca_crt-error-log-last-day.py
+TestSlave-1/etc/plugin/check-_custom_domain_ssl_crt_ssl_key_ssl_ca_crt-error-log-last-hour.py
+TestSlave-1/etc/plugin/check-_custom_domain_wildcard-error-log-last-day.py
+TestSlave-1/etc/plugin/check-_custom_domain_wildcard-error-log-last-hour.py
+TestSlave-1/etc/plugin/check-_disabled-cookie-list-error-log-last-day.py
+TestSlave-1/etc/plugin/check-_disabled-cookie-list-error-log-last-hour.py
+TestSlave-1/etc/plugin/check-_empty-error-log-last-day.py
+TestSlave-1/etc/plugin/check-_empty-error-log-last-hour.py
+TestSlave-1/etc/plugin/check-_enable-http2-default-error-log-last-day.py
+TestSlave-1/etc/plugin/check-_enable-http2-default-error-log-last-hour.py
+TestSlave-1/etc/plugin/check-_enable-http2-false-error-log-last-day.py
+TestSlave-1/etc/plugin/check-_enable-http2-false-error-log-last-hour.py
+TestSlave-1/etc/plugin/check-_enable_cache-disable-no-cache-request-error-log-last-day.py
+TestSlave-1/etc/plugin/check-_enable_cache-disable-no-cache-request-error-log-last-hour.py
+TestSlave-1/etc/plugin/check-_enable_cache-disable-via-header-error-log-last-day.py
+TestSlave-1/etc/plugin/check-_enable_cache-disable-via-header-error-log-last-hour.py
+TestSlave-1/etc/plugin/check-_enable_cache-error-log-last-day.py
+TestSlave-1/etc/plugin/check-_enable_cache-error-log-last-hour.py
+TestSlave-1/etc/plugin/check-_enable_cache-ssl-proxy-verify-unverified-error-log-last-day.py
+TestSlave-1/etc/plugin/check-_enable_cache-ssl-proxy-verify-unverified-error-log-last-hour.py
+TestSlave-1/etc/plugin/check-_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-day.py
+TestSlave-1/etc/plugin/check-_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-hour.py
+TestSlave-1/etc/plugin/check-_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-day.py
+TestSlave-1/etc/plugin/check-_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-hour.py
+TestSlave-1/etc/plugin/check-_https-only-error-log-last-day.py
+TestSlave-1/etc/plugin/check-_https-only-error-log-last-hour.py
+TestSlave-1/etc/plugin/check-_monitor-ipv4-test-error-log-last-day.py
+TestSlave-1/etc/plugin/check-_monitor-ipv4-test-error-log-last-hour.py
+TestSlave-1/etc/plugin/check-_monitor-ipv4-test-ipv4-packet-list-test.py
+TestSlave-1/etc/plugin/check-_monitor-ipv6-test-error-log-last-day.py
+TestSlave-1/etc/plugin/check-_monitor-ipv6-test-error-log-last-hour.py
+TestSlave-1/etc/plugin/check-_monitor-ipv6-test-ipv6-packet-list-test.py
+TestSlave-1/etc/plugin/check-_prefer-gzip-encoding-to-backend-error-log-last-day.py
+TestSlave-1/etc/plugin/check-_prefer-gzip-encoding-to-backend-error-log-last-hour.py
+TestSlave-1/etc/plugin/check-_re6st-optimal-test-error-log-last-day.py
+TestSlave-1/etc/plugin/check-_re6st-optimal-test-error-log-last-hour.py
+TestSlave-1/etc/plugin/check-_re6st-optimal-test-re6st-optimal-test.py
+TestSlave-1/etc/plugin/check-_server-alias-duplicated-error-log-last-day.py
+TestSlave-1/etc/plugin/check-_server-alias-duplicated-error-log-last-hour.py
+TestSlave-1/etc/plugin/check-_server-alias-error-log-last-day.py
+TestSlave-1/etc/plugin/check-_server-alias-error-log-last-hour.py
+TestSlave-1/etc/plugin/check-_server-alias-wildcard-error-log-last-day.py
+TestSlave-1/etc/plugin/check-_server-alias-wildcard-error-log-last-hour.py
+TestSlave-1/etc/plugin/check-_server-alias_custom_domain-duplicated-error-log-last-day.py
+TestSlave-1/etc/plugin/check-_server-alias_custom_domain-duplicated-error-log-last-hour.py
+TestSlave-1/etc/plugin/check-_ssl-proxy-verify-unverified-error-log-last-day.py
+TestSlave-1/etc/plugin/check-_ssl-proxy-verify-unverified-error-log-last-hour.py
+TestSlave-1/etc/plugin/check-_ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-day.py
+TestSlave-1/etc/plugin/check-_ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-hour.py
+TestSlave-1/etc/plugin/check-_ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-day.py
+TestSlave-1/etc/plugin/check-_ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-hour.py
+TestSlave-1/etc/plugin/check-_ssl_ca_crt_does_not_match-error-log-last-day.py
+TestSlave-1/etc/plugin/check-_ssl_ca_crt_does_not_match-error-log-last-hour.py
+TestSlave-1/etc/plugin/check-_ssl_ca_crt_garbage-error-log-last-day.py
+TestSlave-1/etc/plugin/check-_ssl_ca_crt_garbage-error-log-last-hour.py
+TestSlave-1/etc/plugin/check-_type-eventsource-error-log-last-day.py
+TestSlave-1/etc/plugin/check-_type-eventsource-error-log-last-hour.py
+TestSlave-1/etc/plugin/check-_type-notebook-error-log-last-day.py
+TestSlave-1/etc/plugin/check-_type-notebook-error-log-last-hour.py
+TestSlave-1/etc/plugin/check-_type-redirect-error-log-last-day.py
+TestSlave-1/etc/plugin/check-_type-redirect-error-log-last-hour.py
+TestSlave-1/etc/plugin/check-_type-zope-default-path-error-log-last-day.py
+TestSlave-1/etc/plugin/check-_type-zope-default-path-error-log-last-hour.py
+TestSlave-1/etc/plugin/check-_type-zope-error-log-last-day.py
+TestSlave-1/etc/plugin/check-_type-zope-error-log-last-hour.py
+TestSlave-1/etc/plugin/check-_type-zope-path-error-log-last-day.py
+TestSlave-1/etc/plugin/check-_type-zope-path-error-log-last-hour.py
+TestSlave-1/etc/plugin/check-_type-zope-prefer-gzip-encoding-to-backend-error-log-last-day.py
+TestSlave-1/etc/plugin/check-_type-zope-prefer-gzip-encoding-to-backend-error-log-last-hour.py
+TestSlave-1/etc/plugin/check-_type-zope-ssl-proxy-verify-unverified-error-log-last-day.py
+TestSlave-1/etc/plugin/check-_type-zope-ssl-proxy-verify-unverified-error-log-last-hour.py
+TestSlave-1/etc/plugin/check-_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-day.py
+TestSlave-1/etc/plugin/check-_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-hour.py
+TestSlave-1/etc/plugin/check-_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-day.py
+TestSlave-1/etc/plugin/check-_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-hour.py
+TestSlave-1/etc/plugin/check-_type-zope-virtualhostroot-http-port-error-log-last-day.py
+TestSlave-1/etc/plugin/check-_type-zope-virtualhostroot-http-port-error-log-last-hour.py
+TestSlave-1/etc/plugin/check-_type-zope-virtualhostroot-https-port-error-log-last-day.py
+TestSlave-1/etc/plugin/check-_type-zope-virtualhostroot-https-port-error-log-last-hour.py
+TestSlave-1/etc/plugin/check-_url-error-log-last-day.py
+TestSlave-1/etc/plugin/check-_url-error-log-last-hour.py
+TestSlave-1/etc/plugin/check-_url_https-url-error-log-last-day.py
+TestSlave-1/etc/plugin/check-_url_https-url-error-log-last-hour.py
 TestSlave-1/etc/plugin/check-free-disk-space.py
-TestSlave-1/etc/plugin/monitor-bootstrap-status.py
\ No newline at end of file
+TestSlave-1/etc/plugin/frontend-caddy-configuration-promise.py
+TestSlave-1/etc/plugin/monitor-bootstrap-status.py
+TestSlave-1/etc/plugin/monitor-http-frontend.py
+TestSlave-1/etc/plugin/monitor-httpd-listening-on-tcp.py
+TestSlave-1/etc/plugin/nginx-configuration-promise.py
+TestSlave-1/etc/plugin/nginx_frontend_ipv4_http.py
+TestSlave-1/etc/plugin/nginx_frontend_ipv4_https.py
+TestSlave-1/etc/plugin/nginx_frontend_ipv6_http.py
+TestSlave-1/etc/plugin/nginx_frontend_ipv6_https.py
+TestSlave-1/etc/plugin/re6st-connectivity.py
+TestSlave-1/etc/plugin/trafficserver-cache-availability.py
+TestSlave-1/etc/plugin/trafficserver-port-listening.py
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestSlave.test_promise_list-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlave.test_promise_list-CADDY.txt
index eafa007a2334d6a7f044ed53564b39a536e8c376..a46f263b071ad9812f391588746ae7a7f1b7502b 100644
--- a/software/caddy-frontend/test/test_data/test.TestSlave.test_promise_list-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestSlave.test_promise_list-CADDY.txt
@@ -1,114 +1,4 @@
-TestSlave-0/etc/promise/monitor-http-frontend
-TestSlave-0/etc/promise/monitor-httpd-listening-on-tcp
 TestSlave-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set
 TestSlave-1/etc/promise/caddy-frontend-is-running-actual-software-release
-TestSlave-1/etc/promise/caddy_cached
-TestSlave-1/etc/promise/caddy_frontend_ipv4_http
-TestSlave-1/etc/promise/caddy_frontend_ipv4_https
-TestSlave-1/etc/promise/caddy_frontend_ipv6_http
-TestSlave-1/etc/promise/caddy_frontend_ipv6_https
-TestSlave-1/etc/promise/caddy_ssl_cached
-TestSlave-1/etc/promise/check-_apache_custom_http_s-accepted-error-log-last-day
-TestSlave-1/etc/promise/check-_apache_custom_http_s-accepted-error-log-last-hour
-TestSlave-1/etc/promise/check-_caddy_custom_http_s-accepted-error-log-last-day
-TestSlave-1/etc/promise/check-_caddy_custom_http_s-accepted-error-log-last-hour
-TestSlave-1/etc/promise/check-_custom_domain-error-log-last-day
-TestSlave-1/etc/promise/check-_custom_domain-error-log-last-hour
-TestSlave-1/etc/promise/check-_custom_domain_ssl_crt_ssl_key-error-log-last-day
-TestSlave-1/etc/promise/check-_custom_domain_ssl_crt_ssl_key-error-log-last-hour
-TestSlave-1/etc/promise/check-_custom_domain_ssl_crt_ssl_key_ssl_ca_crt-error-log-last-day
-TestSlave-1/etc/promise/check-_custom_domain_ssl_crt_ssl_key_ssl_ca_crt-error-log-last-hour
-TestSlave-1/etc/promise/check-_custom_domain_wildcard-error-log-last-day
-TestSlave-1/etc/promise/check-_custom_domain_wildcard-error-log-last-hour
-TestSlave-1/etc/promise/check-_disabled-cookie-list-error-log-last-day
-TestSlave-1/etc/promise/check-_disabled-cookie-list-error-log-last-hour
-TestSlave-1/etc/promise/check-_empty-error-log-last-day
-TestSlave-1/etc/promise/check-_empty-error-log-last-hour
-TestSlave-1/etc/promise/check-_enable-http2-default-error-log-last-day
-TestSlave-1/etc/promise/check-_enable-http2-default-error-log-last-hour
-TestSlave-1/etc/promise/check-_enable-http2-false-error-log-last-day
-TestSlave-1/etc/promise/check-_enable-http2-false-error-log-last-hour
-TestSlave-1/etc/promise/check-_enable_cache-disable-no-cache-request-error-log-last-day
-TestSlave-1/etc/promise/check-_enable_cache-disable-no-cache-request-error-log-last-hour
-TestSlave-1/etc/promise/check-_enable_cache-disable-via-header-error-log-last-day
-TestSlave-1/etc/promise/check-_enable_cache-disable-via-header-error-log-last-hour
-TestSlave-1/etc/promise/check-_enable_cache-error-log-last-day
-TestSlave-1/etc/promise/check-_enable_cache-error-log-last-hour
-TestSlave-1/etc/promise/check-_enable_cache-ssl-proxy-verify-unverified-error-log-last-day
-TestSlave-1/etc/promise/check-_enable_cache-ssl-proxy-verify-unverified-error-log-last-hour
-TestSlave-1/etc/promise/check-_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-day
-TestSlave-1/etc/promise/check-_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-hour
-TestSlave-1/etc/promise/check-_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-day
-TestSlave-1/etc/promise/check-_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-hour
-TestSlave-1/etc/promise/check-_https-only-error-log-last-day
-TestSlave-1/etc/promise/check-_https-only-error-log-last-hour
-TestSlave-1/etc/promise/check-_monitor-ipv4-test-error-log-last-day
-TestSlave-1/etc/promise/check-_monitor-ipv4-test-error-log-last-hour
-TestSlave-1/etc/promise/check-_monitor-ipv4-test-ipv4-packet-list-test
-TestSlave-1/etc/promise/check-_monitor-ipv6-test-error-log-last-day
-TestSlave-1/etc/promise/check-_monitor-ipv6-test-error-log-last-hour
-TestSlave-1/etc/promise/check-_monitor-ipv6-test-ipv6-packet-list-test
-TestSlave-1/etc/promise/check-_prefer-gzip-encoding-to-backend-error-log-last-day
-TestSlave-1/etc/promise/check-_prefer-gzip-encoding-to-backend-error-log-last-hour
-TestSlave-1/etc/promise/check-_re6st-optimal-test-error-log-last-day
-TestSlave-1/etc/promise/check-_re6st-optimal-test-error-log-last-hour
-TestSlave-1/etc/promise/check-_re6st-optimal-test-re6st-optimal-test
-TestSlave-1/etc/promise/check-_server-alias-duplicated-error-log-last-day
-TestSlave-1/etc/promise/check-_server-alias-duplicated-error-log-last-hour
-TestSlave-1/etc/promise/check-_server-alias-error-log-last-day
-TestSlave-1/etc/promise/check-_server-alias-error-log-last-hour
-TestSlave-1/etc/promise/check-_server-alias-wildcard-error-log-last-day
-TestSlave-1/etc/promise/check-_server-alias-wildcard-error-log-last-hour
-TestSlave-1/etc/promise/check-_server-alias_custom_domain-duplicated-error-log-last-day
-TestSlave-1/etc/promise/check-_server-alias_custom_domain-duplicated-error-log-last-hour
-TestSlave-1/etc/promise/check-_ssl-proxy-verify-unverified-error-log-last-day
-TestSlave-1/etc/promise/check-_ssl-proxy-verify-unverified-error-log-last-hour
-TestSlave-1/etc/promise/check-_ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-day
-TestSlave-1/etc/promise/check-_ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-hour
-TestSlave-1/etc/promise/check-_ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-day
-TestSlave-1/etc/promise/check-_ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-hour
-TestSlave-1/etc/promise/check-_ssl_ca_crt_does_not_match-error-log-last-day
-TestSlave-1/etc/promise/check-_ssl_ca_crt_does_not_match-error-log-last-hour
-TestSlave-1/etc/promise/check-_ssl_ca_crt_garbage-error-log-last-day
-TestSlave-1/etc/promise/check-_ssl_ca_crt_garbage-error-log-last-hour
-TestSlave-1/etc/promise/check-_type-eventsource-error-log-last-day
-TestSlave-1/etc/promise/check-_type-eventsource-error-log-last-hour
-TestSlave-1/etc/promise/check-_type-notebook-error-log-last-day
-TestSlave-1/etc/promise/check-_type-notebook-error-log-last-hour
-TestSlave-1/etc/promise/check-_type-redirect-error-log-last-day
-TestSlave-1/etc/promise/check-_type-redirect-error-log-last-hour
-TestSlave-1/etc/promise/check-_type-zope-default-path-error-log-last-day
-TestSlave-1/etc/promise/check-_type-zope-default-path-error-log-last-hour
-TestSlave-1/etc/promise/check-_type-zope-error-log-last-day
-TestSlave-1/etc/promise/check-_type-zope-error-log-last-hour
-TestSlave-1/etc/promise/check-_type-zope-path-error-log-last-day
-TestSlave-1/etc/promise/check-_type-zope-path-error-log-last-hour
-TestSlave-1/etc/promise/check-_type-zope-prefer-gzip-encoding-to-backend-error-log-last-day
-TestSlave-1/etc/promise/check-_type-zope-prefer-gzip-encoding-to-backend-error-log-last-hour
-TestSlave-1/etc/promise/check-_type-zope-ssl-proxy-verify-unverified-error-log-last-day
-TestSlave-1/etc/promise/check-_type-zope-ssl-proxy-verify-unverified-error-log-last-hour
-TestSlave-1/etc/promise/check-_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-day
-TestSlave-1/etc/promise/check-_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-hour
-TestSlave-1/etc/promise/check-_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-day
-TestSlave-1/etc/promise/check-_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-hour
-TestSlave-1/etc/promise/check-_type-zope-virtualhostroot-http-port-error-log-last-day
-TestSlave-1/etc/promise/check-_type-zope-virtualhostroot-http-port-error-log-last-hour
-TestSlave-1/etc/promise/check-_type-zope-virtualhostroot-https-port-error-log-last-day
-TestSlave-1/etc/promise/check-_type-zope-virtualhostroot-https-port-error-log-last-hour
-TestSlave-1/etc/promise/check-_url-error-log-last-day
-TestSlave-1/etc/promise/check-_url-error-log-last-hour
-TestSlave-1/etc/promise/check-_url_https-url-error-log-last-day
-TestSlave-1/etc/promise/check-_url_https-url-error-log-last-hour
-TestSlave-1/etc/promise/frontend-caddy-configuration-promise
-TestSlave-1/etc/promise/monitor-http-frontend
-TestSlave-1/etc/promise/monitor-httpd-listening-on-tcp
-TestSlave-1/etc/promise/nginx-configuration-promise
-TestSlave-1/etc/promise/nginx_frontend_ipv4_http
-TestSlave-1/etc/promise/nginx_frontend_ipv4_https
-TestSlave-1/etc/promise/nginx_frontend_ipv6_http
-TestSlave-1/etc/promise/nginx_frontend_ipv6_https
 TestSlave-1/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set
-TestSlave-1/etc/promise/promise-nginx-is-process-older-than-dependency-set
-TestSlave-1/etc/promise/re6st-connectivity
-TestSlave-1/etc/promise/trafficserver-cache-availability
-TestSlave-1/etc/promise/trafficserver-port-listening
\ No newline at end of file
+TestSlave-1/etc/promise/promise-nginx-is-process-older-than-dependency-set
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveBadParameters.test_plugin_list-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlaveBadParameters.test_plugin_list-CADDY.txt
index c76bc269141a852d5d4f964133207e52551c6f44..2a3bcc9c867a331009020decde92ca8309a6ce83 100644
--- a/software/caddy-frontend/test/test_data/test.TestSlaveBadParameters.test_plugin_list-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestSlaveBadParameters.test_plugin_list-CADDY.txt
@@ -2,7 +2,17 @@ TestSlaveBadParameters-0/etc/plugin/__init__.py
 TestSlaveBadParameters-0/etc/plugin/buildout-TestSlaveBadParameters-0-status.py
 TestSlaveBadParameters-0/etc/plugin/check-free-disk-space.py
 TestSlaveBadParameters-0/etc/plugin/monitor-bootstrap-status.py
+TestSlaveBadParameters-0/etc/plugin/monitor-http-frontend.py
+TestSlaveBadParameters-0/etc/plugin/monitor-httpd-listening-on-tcp.py
 TestSlaveBadParameters-1/etc/plugin/__init__.py
 TestSlaveBadParameters-1/etc/plugin/buildout-TestSlaveBadParameters-1-status.py
+TestSlaveBadParameters-1/etc/plugin/caddy_cached.py
+TestSlaveBadParameters-1/etc/plugin/caddy_ssl_cached.py
 TestSlaveBadParameters-1/etc/plugin/check-free-disk-space.py
-TestSlaveBadParameters-1/etc/plugin/monitor-bootstrap-status.py
\ No newline at end of file
+TestSlaveBadParameters-1/etc/plugin/frontend-caddy-configuration-promise.py
+TestSlaveBadParameters-1/etc/plugin/monitor-bootstrap-status.py
+TestSlaveBadParameters-1/etc/plugin/monitor-http-frontend.py
+TestSlaveBadParameters-1/etc/plugin/monitor-httpd-listening-on-tcp.py
+TestSlaveBadParameters-1/etc/plugin/nginx-configuration-promise.py
+TestSlaveBadParameters-1/etc/plugin/trafficserver-cache-availability.py
+TestSlaveBadParameters-1/etc/plugin/trafficserver-port-listening.py
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveBadParameters.test_promise_list-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlaveBadParameters.test_promise_list-CADDY.txt
index 65756f5c3b13fc88c815abb24650f16e54ae8a0e..f5d658ed8c18fdb54e15d0324dd2d7b2ee9bfb19 100644
--- a/software/caddy-frontend/test/test_data/test.TestSlaveBadParameters.test_promise_list-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestSlaveBadParameters.test_promise_list-CADDY.txt
@@ -1,42 +1,4 @@
-TestSlaveBadParameters-0/etc/promise/monitor-http-frontend
-TestSlaveBadParameters-0/etc/promise/monitor-httpd-listening-on-tcp
 TestSlaveBadParameters-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set
 TestSlaveBadParameters-1/etc/promise/caddy-frontend-is-running-actual-software-release
-TestSlaveBadParameters-1/etc/promise/caddy_cached
-TestSlaveBadParameters-1/etc/promise/caddy_frontend_ipv4_http
-TestSlaveBadParameters-1/etc/promise/caddy_frontend_ipv4_https
-TestSlaveBadParameters-1/etc/promise/caddy_frontend_ipv6_http
-TestSlaveBadParameters-1/etc/promise/caddy_frontend_ipv6_https
-TestSlaveBadParameters-1/etc/promise/caddy_ssl_cached
-TestSlaveBadParameters-1/etc/promise/check-_default-path-unsafe-error-log-last-day
-TestSlaveBadParameters-1/etc/promise/check-_default-path-unsafe-error-log-last-hour
-TestSlaveBadParameters-1/etc/promise/check-_monitor-ipv4-test-unsafe-error-log-last-day
-TestSlaveBadParameters-1/etc/promise/check-_monitor-ipv4-test-unsafe-error-log-last-hour
-TestSlaveBadParameters-1/etc/promise/check-_monitor-ipv4-test-unsafe-ipv4-packet-list-test
-TestSlaveBadParameters-1/etc/promise/check-_monitor-ipv6-test-unsafe-error-log-last-day
-TestSlaveBadParameters-1/etc/promise/check-_monitor-ipv6-test-unsafe-error-log-last-hour
-TestSlaveBadParameters-1/etc/promise/check-_monitor-ipv6-test-unsafe-ipv6-packet-list-test
-TestSlaveBadParameters-1/etc/promise/check-_re6st-optimal-test-nocomma-error-log-last-day
-TestSlaveBadParameters-1/etc/promise/check-_re6st-optimal-test-nocomma-error-log-last-hour
-TestSlaveBadParameters-1/etc/promise/check-_re6st-optimal-test-unsafe-error-log-last-day
-TestSlaveBadParameters-1/etc/promise/check-_re6st-optimal-test-unsafe-error-log-last-hour
-TestSlaveBadParameters-1/etc/promise/check-_re6st-optimal-test-unsafe-re6st-optimal-test
-TestSlaveBadParameters-1/etc/promise/check-_server-alias-same-error-log-last-day
-TestSlaveBadParameters-1/etc/promise/check-_server-alias-same-error-log-last-hour
-TestSlaveBadParameters-1/etc/promise/check-_virtualhostroot-http-port-unsafe-error-log-last-day
-TestSlaveBadParameters-1/etc/promise/check-_virtualhostroot-http-port-unsafe-error-log-last-hour
-TestSlaveBadParameters-1/etc/promise/check-_virtualhostroot-https-port-unsafe-error-log-last-day
-TestSlaveBadParameters-1/etc/promise/check-_virtualhostroot-https-port-unsafe-error-log-last-hour
-TestSlaveBadParameters-1/etc/promise/frontend-caddy-configuration-promise
-TestSlaveBadParameters-1/etc/promise/monitor-http-frontend
-TestSlaveBadParameters-1/etc/promise/monitor-httpd-listening-on-tcp
-TestSlaveBadParameters-1/etc/promise/nginx-configuration-promise
-TestSlaveBadParameters-1/etc/promise/nginx_frontend_ipv4_http
-TestSlaveBadParameters-1/etc/promise/nginx_frontend_ipv4_https
-TestSlaveBadParameters-1/etc/promise/nginx_frontend_ipv6_http
-TestSlaveBadParameters-1/etc/promise/nginx_frontend_ipv6_https
 TestSlaveBadParameters-1/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set
-TestSlaveBadParameters-1/etc/promise/promise-nginx-is-process-older-than-dependency-set
-TestSlaveBadParameters-1/etc/promise/re6st-connectivity
-TestSlaveBadParameters-1/etc/promise/trafficserver-cache-availability
-TestSlaveBadParameters-1/etc/promise/trafficserver-port-listening
\ No newline at end of file
+TestSlaveBadParameters-1/etc/promise/promise-nginx-is-process-older-than-dependency-set
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_plugin_list-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_plugin_list-CADDY.txt
index fcf466595e307c9295fc378a3b767c4ecb665ea5..51c45f8c7d4950636818d0446d58244e2754b49b 100644
--- a/software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_plugin_list-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_plugin_list-CADDY.txt
@@ -2,7 +2,117 @@ TestSlaveGlobalDisableHttp2-0/etc/plugin/__init__.py
 TestSlaveGlobalDisableHttp2-0/etc/plugin/buildout-TestSlaveGlobalDisableHttp2-0-status.py
 TestSlaveGlobalDisableHttp2-0/etc/plugin/check-free-disk-space.py
 TestSlaveGlobalDisableHttp2-0/etc/plugin/monitor-bootstrap-status.py
+TestSlaveGlobalDisableHttp2-0/etc/plugin/monitor-http-frontend.py
+TestSlaveGlobalDisableHttp2-0/etc/plugin/monitor-httpd-listening-on-tcp.py
 TestSlaveGlobalDisableHttp2-1/etc/plugin/__init__.py
 TestSlaveGlobalDisableHttp2-1/etc/plugin/buildout-TestSlaveGlobalDisableHttp2-1-status.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/caddy_cached.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/caddy_frontend_ipv4_http.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/caddy_frontend_ipv4_https.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/caddy_frontend_ipv6_http.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/caddy_frontend_ipv6_https.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/caddy_ssl_cached.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_apache_custom_http_s-accepted-error-log-last-day.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_apache_custom_http_s-accepted-error-log-last-hour.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_caddy_custom_http_s-accepted-error-log-last-day.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_caddy_custom_http_s-accepted-error-log-last-hour.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_custom_domain-error-log-last-day.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_custom_domain-error-log-last-hour.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_custom_domain_ssl_crt_ssl_key-error-log-last-day.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_custom_domain_ssl_crt_ssl_key-error-log-last-hour.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_custom_domain_ssl_crt_ssl_key_ssl_ca_crt-error-log-last-day.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_custom_domain_ssl_crt_ssl_key_ssl_ca_crt-error-log-last-hour.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_custom_domain_wildcard-error-log-last-day.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_custom_domain_wildcard-error-log-last-hour.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_disabled-cookie-list-error-log-last-day.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_disabled-cookie-list-error-log-last-hour.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_empty-error-log-last-day.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_empty-error-log-last-hour.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_enable-http2-default-error-log-last-day.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_enable-http2-default-error-log-last-hour.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_enable-http2-false-error-log-last-day.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_enable-http2-false-error-log-last-hour.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_enable_cache-disable-no-cache-request-error-log-last-day.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_enable_cache-disable-no-cache-request-error-log-last-hour.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_enable_cache-disable-via-header-error-log-last-day.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_enable_cache-disable-via-header-error-log-last-hour.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_enable_cache-error-log-last-day.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_enable_cache-error-log-last-hour.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_enable_cache-ssl-proxy-verify-unverified-error-log-last-day.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_enable_cache-ssl-proxy-verify-unverified-error-log-last-hour.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-day.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-hour.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-day.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-hour.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_https-only-error-log-last-day.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_https-only-error-log-last-hour.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_monitor-ipv4-test-error-log-last-day.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_monitor-ipv4-test-error-log-last-hour.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_monitor-ipv4-test-ipv4-packet-list-test.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_monitor-ipv6-test-error-log-last-day.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_monitor-ipv6-test-error-log-last-hour.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_monitor-ipv6-test-ipv6-packet-list-test.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_prefer-gzip-encoding-to-backend-error-log-last-day.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_prefer-gzip-encoding-to-backend-error-log-last-hour.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_re6st-optimal-test-error-log-last-day.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_re6st-optimal-test-error-log-last-hour.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_re6st-optimal-test-re6st-optimal-test.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_server-alias-duplicated-error-log-last-day.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_server-alias-duplicated-error-log-last-hour.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_server-alias-error-log-last-day.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_server-alias-error-log-last-hour.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_server-alias-wildcard-error-log-last-day.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_server-alias-wildcard-error-log-last-hour.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_server-alias_custom_domain-duplicated-error-log-last-day.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_server-alias_custom_domain-duplicated-error-log-last-hour.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_ssl-proxy-verify-unverified-error-log-last-day.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_ssl-proxy-verify-unverified-error-log-last-hour.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-day.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-hour.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-day.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-hour.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_ssl_ca_crt_does_not_match-error-log-last-day.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_ssl_ca_crt_does_not_match-error-log-last-hour.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_ssl_ca_crt_garbage-error-log-last-day.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_ssl_ca_crt_garbage-error-log-last-hour.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_type-eventsource-error-log-last-day.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_type-eventsource-error-log-last-hour.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_type-notebook-error-log-last-day.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_type-notebook-error-log-last-hour.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_type-redirect-error-log-last-day.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_type-redirect-error-log-last-hour.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_type-zope-default-path-error-log-last-day.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_type-zope-default-path-error-log-last-hour.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_type-zope-error-log-last-day.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_type-zope-error-log-last-hour.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_type-zope-path-error-log-last-day.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_type-zope-path-error-log-last-hour.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_type-zope-prefer-gzip-encoding-to-backend-error-log-last-day.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_type-zope-prefer-gzip-encoding-to-backend-error-log-last-hour.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_type-zope-ssl-proxy-verify-unverified-error-log-last-day.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_type-zope-ssl-proxy-verify-unverified-error-log-last-hour.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-day.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-hour.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-day.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-hour.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_type-zope-virtualhostroot-http-port-error-log-last-day.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_type-zope-virtualhostroot-http-port-error-log-last-hour.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_type-zope-virtualhostroot-https-port-error-log-last-day.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_type-zope-virtualhostroot-https-port-error-log-last-hour.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_url-error-log-last-day.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_url-error-log-last-hour.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_url_https-url-error-log-last-day.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/check-_url_https-url-error-log-last-hour.py
 TestSlaveGlobalDisableHttp2-1/etc/plugin/check-free-disk-space.py
-TestSlaveGlobalDisableHttp2-1/etc/plugin/monitor-bootstrap-status.py
\ No newline at end of file
+TestSlaveGlobalDisableHttp2-1/etc/plugin/frontend-caddy-configuration-promise.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/monitor-bootstrap-status.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/monitor-http-frontend.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/monitor-httpd-listening-on-tcp.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/nginx-configuration-promise.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/nginx_frontend_ipv4_http.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/nginx_frontend_ipv4_https.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/nginx_frontend_ipv6_http.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/nginx_frontend_ipv6_https.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/re6st-connectivity.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/trafficserver-cache-availability.py
+TestSlaveGlobalDisableHttp2-1/etc/plugin/trafficserver-port-listening.py
\ No newline at end of file
diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_promise_list-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_promise_list-CADDY.txt
index b104468ef1c502112803c76dc602e3ec3872da28..b12aa53393ec15bda2541482a628728c263878c6 100644
--- a/software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_promise_list-CADDY.txt
+++ b/software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_promise_list-CADDY.txt
@@ -1,114 +1,4 @@
-TestSlaveGlobalDisableHttp2-0/etc/promise/monitor-http-frontend
-TestSlaveGlobalDisableHttp2-0/etc/promise/monitor-httpd-listening-on-tcp
 TestSlaveGlobalDisableHttp2-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set
 TestSlaveGlobalDisableHttp2-1/etc/promise/caddy-frontend-is-running-actual-software-release
-TestSlaveGlobalDisableHttp2-1/etc/promise/caddy_cached
-TestSlaveGlobalDisableHttp2-1/etc/promise/caddy_frontend_ipv4_http
-TestSlaveGlobalDisableHttp2-1/etc/promise/caddy_frontend_ipv4_https
-TestSlaveGlobalDisableHttp2-1/etc/promise/caddy_frontend_ipv6_http
-TestSlaveGlobalDisableHttp2-1/etc/promise/caddy_frontend_ipv6_https
-TestSlaveGlobalDisableHttp2-1/etc/promise/caddy_ssl_cached
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_apache_custom_http_s-accepted-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_apache_custom_http_s-accepted-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_caddy_custom_http_s-accepted-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_caddy_custom_http_s-accepted-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_custom_domain-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_custom_domain-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_custom_domain_ssl_crt_ssl_key-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_custom_domain_ssl_crt_ssl_key-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_custom_domain_ssl_crt_ssl_key_ssl_ca_crt-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_custom_domain_ssl_crt_ssl_key_ssl_ca_crt-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_custom_domain_wildcard-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_custom_domain_wildcard-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_disabled-cookie-list-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_disabled-cookie-list-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_empty-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_empty-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_enable-http2-default-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_enable-http2-default-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_enable-http2-false-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_enable-http2-false-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_enable_cache-disable-no-cache-request-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_enable_cache-disable-no-cache-request-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_enable_cache-disable-via-header-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_enable_cache-disable-via-header-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_enable_cache-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_enable_cache-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_enable_cache-ssl-proxy-verify-unverified-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_enable_cache-ssl-proxy-verify-unverified-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_https-only-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_https-only-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_monitor-ipv4-test-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_monitor-ipv4-test-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_monitor-ipv4-test-ipv4-packet-list-test
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_monitor-ipv6-test-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_monitor-ipv6-test-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_monitor-ipv6-test-ipv6-packet-list-test
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_prefer-gzip-encoding-to-backend-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_prefer-gzip-encoding-to-backend-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_re6st-optimal-test-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_re6st-optimal-test-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_re6st-optimal-test-re6st-optimal-test
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_server-alias-duplicated-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_server-alias-duplicated-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_server-alias-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_server-alias-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_server-alias-wildcard-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_server-alias-wildcard-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_server-alias_custom_domain-duplicated-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_server-alias_custom_domain-duplicated-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_ssl-proxy-verify-unverified-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_ssl-proxy-verify-unverified-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_ssl_ca_crt_does_not_match-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_ssl_ca_crt_does_not_match-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_ssl_ca_crt_garbage-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_ssl_ca_crt_garbage-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_type-eventsource-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_type-eventsource-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_type-notebook-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_type-notebook-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_type-redirect-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_type-redirect-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_type-zope-default-path-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_type-zope-default-path-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_type-zope-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_type-zope-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_type-zope-path-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_type-zope-path-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_type-zope-prefer-gzip-encoding-to-backend-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_type-zope-prefer-gzip-encoding-to-backend-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_type-zope-ssl-proxy-verify-unverified-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_type-zope-ssl-proxy-verify-unverified-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_type-zope-virtualhostroot-http-port-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_type-zope-virtualhostroot-http-port-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_type-zope-virtualhostroot-https-port-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_type-zope-virtualhostroot-https-port-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_url-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_url-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_url_https-url-error-log-last-day
-TestSlaveGlobalDisableHttp2-1/etc/promise/check-_url_https-url-error-log-last-hour
-TestSlaveGlobalDisableHttp2-1/etc/promise/frontend-caddy-configuration-promise
-TestSlaveGlobalDisableHttp2-1/etc/promise/monitor-http-frontend
-TestSlaveGlobalDisableHttp2-1/etc/promise/monitor-httpd-listening-on-tcp
-TestSlaveGlobalDisableHttp2-1/etc/promise/nginx-configuration-promise
-TestSlaveGlobalDisableHttp2-1/etc/promise/nginx_frontend_ipv4_http
-TestSlaveGlobalDisableHttp2-1/etc/promise/nginx_frontend_ipv4_https
-TestSlaveGlobalDisableHttp2-1/etc/promise/nginx_frontend_ipv6_http
-TestSlaveGlobalDisableHttp2-1/etc/promise/nginx_frontend_ipv6_https
 TestSlaveGlobalDisableHttp2-1/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set
-TestSlaveGlobalDisableHttp2-1/etc/promise/promise-nginx-is-process-older-than-dependency-set
-TestSlaveGlobalDisableHttp2-1/etc/promise/re6st-connectivity
-TestSlaveGlobalDisableHttp2-1/etc/promise/trafficserver-cache-availability
-TestSlaveGlobalDisableHttp2-1/etc/promise/trafficserver-port-listening
\ No newline at end of file
+TestSlaveGlobalDisableHttp2-1/etc/promise/promise-nginx-is-process-older-than-dependency-set
\ No newline at end of file