diff --git a/test/integration/dns/in.thelinuxpro.net/1.ntp/a.bat b/test/integration/dns/in.thelinuxpro.net/1.ntp.in.thelinuxpro.net/a.bat
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/1.ntp/a.bat
rename to test/integration/dns/in.thelinuxpro.net/1.ntp.in.thelinuxpro.net/a.bat
diff --git a/test/integration/dns/in.thelinuxpro.net/1.ntp/helper.bash b/test/integration/dns/in.thelinuxpro.net/1.ntp.in.thelinuxpro.net/helper.bash
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/1.ntp/helper.bash
rename to test/integration/dns/in.thelinuxpro.net/1.ntp.in.thelinuxpro.net/helper.bash
diff --git a/test/integration/dns/in.thelinuxpro.net/1.ntp/local-setup.bash b/test/integration/dns/in.thelinuxpro.net/1.ntp.in.thelinuxpro.net/local-setup.bash
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/1.ntp/local-setup.bash
rename to test/integration/dns/in.thelinuxpro.net/1.ntp.in.thelinuxpro.net/local-setup.bash
diff --git a/test/integration/dns/in.thelinuxpro.net/2.ntp/a.bat b/test/integration/dns/in.thelinuxpro.net/2.ntp.in.thelinuxpro.net/a.bat
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/2.ntp/a.bat
rename to test/integration/dns/in.thelinuxpro.net/2.ntp.in.thelinuxpro.net/a.bat
diff --git a/test/integration/dns/in.thelinuxpro.net/2.ntp/helper.bash b/test/integration/dns/in.thelinuxpro.net/2.ntp.in.thelinuxpro.net/helper.bash
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/2.ntp/helper.bash
rename to test/integration/dns/in.thelinuxpro.net/2.ntp.in.thelinuxpro.net/helper.bash
diff --git a/test/integration/dns/in.thelinuxpro.net/2.ntp/local-setup.bash b/test/integration/dns/in.thelinuxpro.net/2.ntp.in.thelinuxpro.net/local-setup.bash
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/2.ntp/local-setup.bash
rename to test/integration/dns/in.thelinuxpro.net/2.ntp.in.thelinuxpro.net/local-setup.bash
diff --git a/test/integration/dns/in.thelinuxpro.net/blackbox-exporter/a.bat b/test/integration/dns/in.thelinuxpro.net/blackbox-exporter.in.thelinuxpro.net/a.bat
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/blackbox-exporter/a.bat
rename to test/integration/dns/in.thelinuxpro.net/blackbox-exporter.in.thelinuxpro.net/a.bat
diff --git a/test/integration/dns/in.thelinuxpro.net/blackbox-exporter/helper.bash b/test/integration/dns/in.thelinuxpro.net/blackbox-exporter.in.thelinuxpro.net/helper.bash
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/blackbox-exporter/helper.bash
rename to test/integration/dns/in.thelinuxpro.net/blackbox-exporter.in.thelinuxpro.net/helper.bash
diff --git a/test/integration/dns/in.thelinuxpro.net/blackbox-exporter/local-setup.bash b/test/integration/dns/in.thelinuxpro.net/blackbox-exporter.in.thelinuxpro.net/local-setup.bash
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/blackbox-exporter/local-setup.bash
rename to test/integration/dns/in.thelinuxpro.net/blackbox-exporter.in.thelinuxpro.net/local-setup.bash
diff --git a/test/integration/dns/in.thelinuxpro.net/dns01/a.bat b/test/integration/dns/in.thelinuxpro.net/dns01.in.thelinuxpro.net/a.bat
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/dns01/a.bat
rename to test/integration/dns/in.thelinuxpro.net/dns01.in.thelinuxpro.net/a.bat
diff --git a/test/integration/dns/in.thelinuxpro.net/dns01/helper.bash b/test/integration/dns/in.thelinuxpro.net/dns01.in.thelinuxpro.net/helper.bash
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/dns01/helper.bash
rename to test/integration/dns/in.thelinuxpro.net/dns01.in.thelinuxpro.net/helper.bash
diff --git a/test/integration/dns/in.thelinuxpro.net/dns01/local-setup.bash b/test/integration/dns/in.thelinuxpro.net/dns01.in.thelinuxpro.net/local-setup.bash
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/dns01/local-setup.bash
rename to test/integration/dns/in.thelinuxpro.net/dns01.in.thelinuxpro.net/local-setup.bash
diff --git a/test/integration/dns/in.thelinuxpro.net/dns02/a.bat b/test/integration/dns/in.thelinuxpro.net/dns02.in.thelinuxpro.net/a.bat
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/dns02/a.bat
rename to test/integration/dns/in.thelinuxpro.net/dns02.in.thelinuxpro.net/a.bat
diff --git a/test/integration/dns/in.thelinuxpro.net/dns02/helper.bash b/test/integration/dns/in.thelinuxpro.net/dns02.in.thelinuxpro.net/helper.bash
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/dns02/helper.bash
rename to test/integration/dns/in.thelinuxpro.net/dns02.in.thelinuxpro.net/helper.bash
diff --git a/test/integration/dns/in.thelinuxpro.net/dns02/local-setup.bash b/test/integration/dns/in.thelinuxpro.net/dns02.in.thelinuxpro.net/local-setup.bash
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/dns02/local-setup.bash
rename to test/integration/dns/in.thelinuxpro.net/dns02.in.thelinuxpro.net/local-setup.bash
diff --git a/test/integration/dns/in.thelinuxpro.net/dns03/a.bat b/test/integration/dns/in.thelinuxpro.net/dns03.in.thelinuxpro.net/a.bat
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/dns03/a.bat
rename to test/integration/dns/in.thelinuxpro.net/dns03.in.thelinuxpro.net/a.bat
diff --git a/test/integration/dns/in.thelinuxpro.net/dns03/helper.bash b/test/integration/dns/in.thelinuxpro.net/dns03.in.thelinuxpro.net/helper.bash
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/dns03/helper.bash
rename to test/integration/dns/in.thelinuxpro.net/dns03.in.thelinuxpro.net/helper.bash
diff --git a/test/integration/dns/in.thelinuxpro.net/dns03/local-setup.bash b/test/integration/dns/in.thelinuxpro.net/dns03.in.thelinuxpro.net/local-setup.bash
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/dns03/local-setup.bash
rename to test/integration/dns/in.thelinuxpro.net/dns03.in.thelinuxpro.net/local-setup.bash
diff --git a/test/integration/dns/in.thelinuxpro.net/docker-registry1/a.bat b/test/integration/dns/in.thelinuxpro.net/docker-registry1.in.thelinuxpro.net/a.bat
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/docker-registry1/a.bat
rename to test/integration/dns/in.thelinuxpro.net/docker-registry1.in.thelinuxpro.net/a.bat
diff --git a/test/integration/dns/in.thelinuxpro.net/docker-registry1/helper.bash b/test/integration/dns/in.thelinuxpro.net/docker-registry1.in.thelinuxpro.net/helper.bash
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/docker-registry1/helper.bash
rename to test/integration/dns/in.thelinuxpro.net/docker-registry1.in.thelinuxpro.net/helper.bash
diff --git a/test/integration/dns/in.thelinuxpro.net/docker-registry1/local-setup.bash b/test/integration/dns/in.thelinuxpro.net/docker-registry1.in.thelinuxpro.net/local-setup.bash
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/docker-registry1/local-setup.bash
rename to test/integration/dns/in.thelinuxpro.net/docker-registry1.in.thelinuxpro.net/local-setup.bash
diff --git a/test/integration/dns/in.thelinuxpro.net/git-mysql/a.bat b/test/integration/dns/in.thelinuxpro.net/git-mysql.in.thelinuxpro.net/a.bat
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/git-mysql/a.bat
rename to test/integration/dns/in.thelinuxpro.net/git-mysql.in.thelinuxpro.net/a.bat
diff --git a/test/integration/dns/in.thelinuxpro.net/git-mysql/helper.bash b/test/integration/dns/in.thelinuxpro.net/git-mysql.in.thelinuxpro.net/helper.bash
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/git-mysql/helper.bash
rename to test/integration/dns/in.thelinuxpro.net/git-mysql.in.thelinuxpro.net/helper.bash
diff --git a/test/integration/dns/in.thelinuxpro.net/git-mysql/local-setup.bash b/test/integration/dns/in.thelinuxpro.net/git-mysql.in.thelinuxpro.net/local-setup.bash
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/git-mysql/local-setup.bash
rename to test/integration/dns/in.thelinuxpro.net/git-mysql.in.thelinuxpro.net/local-setup.bash
diff --git a/test/integration/dns/in.thelinuxpro.net/git/a.bat b/test/integration/dns/in.thelinuxpro.net/git.in.thelinuxpro.net/a.bat
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/git/a.bat
rename to test/integration/dns/in.thelinuxpro.net/git.in.thelinuxpro.net/a.bat
diff --git a/test/integration/dns/in.thelinuxpro.net/git/helper.bash b/test/integration/dns/in.thelinuxpro.net/git.in.thelinuxpro.net/helper.bash
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/git/helper.bash
rename to test/integration/dns/in.thelinuxpro.net/git.in.thelinuxpro.net/helper.bash
diff --git a/test/integration/dns/in.thelinuxpro.net/git/local-setup.bash b/test/integration/dns/in.thelinuxpro.net/git.in.thelinuxpro.net/local-setup.bash
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/git/local-setup.bash
rename to test/integration/dns/in.thelinuxpro.net/git.in.thelinuxpro.net/local-setup.bash
diff --git a/test/integration/dns/in.thelinuxpro.net/grafana/a.bat b/test/integration/dns/in.thelinuxpro.net/grafana.in.thelinuxpro.net/a.bat
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/grafana/a.bat
rename to test/integration/dns/in.thelinuxpro.net/grafana.in.thelinuxpro.net/a.bat
diff --git a/test/integration/dns/in.thelinuxpro.net/grafana/helper.bash b/test/integration/dns/in.thelinuxpro.net/grafana.in.thelinuxpro.net/helper.bash
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/grafana/helper.bash
rename to test/integration/dns/in.thelinuxpro.net/grafana.in.thelinuxpro.net/helper.bash
diff --git a/test/integration/dns/in.thelinuxpro.net/grafana/local-setup.bash b/test/integration/dns/in.thelinuxpro.net/grafana.in.thelinuxpro.net/local-setup.bash
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/grafana/local-setup.bash
rename to test/integration/dns/in.thelinuxpro.net/grafana.in.thelinuxpro.net/local-setup.bash
diff --git a/test/integration/dns/in.thelinuxpro.net/influxdb/a.bat b/test/integration/dns/in.thelinuxpro.net/influxdb.in.thelinuxpro.net/a.bat
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/influxdb/a.bat
rename to test/integration/dns/in.thelinuxpro.net/influxdb.in.thelinuxpro.net/a.bat
diff --git a/test/integration/dns/in.thelinuxpro.net/influxdb/helper.bash b/test/integration/dns/in.thelinuxpro.net/influxdb.in.thelinuxpro.net/helper.bash
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/influxdb/helper.bash
rename to test/integration/dns/in.thelinuxpro.net/influxdb.in.thelinuxpro.net/helper.bash
diff --git a/test/integration/dns/in.thelinuxpro.net/influxdb/local-setup.bash b/test/integration/dns/in.thelinuxpro.net/influxdb.in.thelinuxpro.net/local-setup.bash
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/influxdb/local-setup.bash
rename to test/integration/dns/in.thelinuxpro.net/influxdb.in.thelinuxpro.net/local-setup.bash
diff --git a/test/integration/dns/in.thelinuxpro.net/jenkins/a.bat b/test/integration/dns/in.thelinuxpro.net/jenkins.in.thelinuxpro.net/a.bat
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/jenkins/a.bat
rename to test/integration/dns/in.thelinuxpro.net/jenkins.in.thelinuxpro.net/a.bat
diff --git a/test/integration/dns/in.thelinuxpro.net/jenkins/helper.bash b/test/integration/dns/in.thelinuxpro.net/jenkins.in.thelinuxpro.net/helper.bash
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/jenkins/helper.bash
rename to test/integration/dns/in.thelinuxpro.net/jenkins.in.thelinuxpro.net/helper.bash
diff --git a/test/integration/dns/in.thelinuxpro.net/jenkins/local-setup.bash b/test/integration/dns/in.thelinuxpro.net/jenkins.in.thelinuxpro.net/local-setup.bash
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/jenkins/local-setup.bash
rename to test/integration/dns/in.thelinuxpro.net/jenkins.in.thelinuxpro.net/local-setup.bash
diff --git a/test/integration/dns/in.thelinuxpro.net/nagios/a.bat b/test/integration/dns/in.thelinuxpro.net/nagios.in.thelinuxpro.net/a.bat
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/nagios/a.bat
rename to test/integration/dns/in.thelinuxpro.net/nagios.in.thelinuxpro.net/a.bat
diff --git a/test/integration/dns/in.thelinuxpro.net/nagios/helper.bash b/test/integration/dns/in.thelinuxpro.net/nagios.in.thelinuxpro.net/helper.bash
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/nagios/helper.bash
rename to test/integration/dns/in.thelinuxpro.net/nagios.in.thelinuxpro.net/helper.bash
diff --git a/test/integration/dns/in.thelinuxpro.net/nagios/local-setup.bash b/test/integration/dns/in.thelinuxpro.net/nagios.in.thelinuxpro.net/local-setup.bash
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/nagios/local-setup.bash
rename to test/integration/dns/in.thelinuxpro.net/nagios.in.thelinuxpro.net/local-setup.bash
diff --git a/test/integration/dns/in.thelinuxpro.net/ns1/a.bat b/test/integration/dns/in.thelinuxpro.net/ns1.in.thelinuxpro.net/a.bat
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/ns1/a.bat
rename to test/integration/dns/in.thelinuxpro.net/ns1.in.thelinuxpro.net/a.bat
diff --git a/test/integration/dns/in.thelinuxpro.net/ns1/helper.bash b/test/integration/dns/in.thelinuxpro.net/ns1.in.thelinuxpro.net/helper.bash
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/ns1/helper.bash
rename to test/integration/dns/in.thelinuxpro.net/ns1.in.thelinuxpro.net/helper.bash
diff --git a/test/integration/dns/in.thelinuxpro.net/ns1/local-setup.bash b/test/integration/dns/in.thelinuxpro.net/ns1.in.thelinuxpro.net/local-setup.bash
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/ns1/local-setup.bash
rename to test/integration/dns/in.thelinuxpro.net/ns1.in.thelinuxpro.net/local-setup.bash
diff --git a/test/integration/dns/in.thelinuxpro.net/ns2/a.bat b/test/integration/dns/in.thelinuxpro.net/ns2.in.thelinuxpro.net/a.bat
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/ns2/a.bat
rename to test/integration/dns/in.thelinuxpro.net/ns2.in.thelinuxpro.net/a.bat
diff --git a/test/integration/dns/in.thelinuxpro.net/ns2/helper.bash b/test/integration/dns/in.thelinuxpro.net/ns2.in.thelinuxpro.net/helper.bash
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/ns2/helper.bash
rename to test/integration/dns/in.thelinuxpro.net/ns2.in.thelinuxpro.net/helper.bash
diff --git a/test/integration/dns/in.thelinuxpro.net/ns2/local-setup.bash b/test/integration/dns/in.thelinuxpro.net/ns2.in.thelinuxpro.net/local-setup.bash
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/ns2/local-setup.bash
rename to test/integration/dns/in.thelinuxpro.net/ns2.in.thelinuxpro.net/local-setup.bash
diff --git a/test/integration/dns/in.thelinuxpro.net/pi401/a.bat b/test/integration/dns/in.thelinuxpro.net/pi401.in.thelinuxpro.net/a.bat
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/pi401/a.bat
rename to test/integration/dns/in.thelinuxpro.net/pi401.in.thelinuxpro.net/a.bat
diff --git a/test/integration/dns/in.thelinuxpro.net/pi401/helper.bash b/test/integration/dns/in.thelinuxpro.net/pi401.in.thelinuxpro.net/helper.bash
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/pi401/helper.bash
rename to test/integration/dns/in.thelinuxpro.net/pi401.in.thelinuxpro.net/helper.bash
diff --git a/test/integration/dns/in.thelinuxpro.net/pi401/local-setup.bash b/test/integration/dns/in.thelinuxpro.net/pi401.in.thelinuxpro.net/local-setup.bash
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/pi401/local-setup.bash
rename to test/integration/dns/in.thelinuxpro.net/pi401.in.thelinuxpro.net/local-setup.bash
diff --git a/test/integration/dns/in.thelinuxpro.net/pi501/a.bat b/test/integration/dns/in.thelinuxpro.net/pi501.in.thelinuxpro.net/a.bat
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/pi501/a.bat
rename to test/integration/dns/in.thelinuxpro.net/pi501.in.thelinuxpro.net/a.bat
diff --git a/test/integration/dns/in.thelinuxpro.net/pi501/helper.bash b/test/integration/dns/in.thelinuxpro.net/pi501.in.thelinuxpro.net/helper.bash
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/pi501/helper.bash
rename to test/integration/dns/in.thelinuxpro.net/pi501.in.thelinuxpro.net/helper.bash
diff --git a/test/integration/dns/in.thelinuxpro.net/pi501/local-setup.bash b/test/integration/dns/in.thelinuxpro.net/pi501.in.thelinuxpro.net/local-setup.bash
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/pi501/local-setup.bash
rename to test/integration/dns/in.thelinuxpro.net/pi501.in.thelinuxpro.net/local-setup.bash
diff --git a/test/integration/dns/in.thelinuxpro.net/pi502/a.bat b/test/integration/dns/in.thelinuxpro.net/pi502.in.thelinuxpro.net/a.bat
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/pi502/a.bat
rename to test/integration/dns/in.thelinuxpro.net/pi502.in.thelinuxpro.net/a.bat
diff --git a/test/integration/dns/in.thelinuxpro.net/pi502/helper.bash b/test/integration/dns/in.thelinuxpro.net/pi502.in.thelinuxpro.net/helper.bash
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/pi502/helper.bash
rename to test/integration/dns/in.thelinuxpro.net/pi502.in.thelinuxpro.net/helper.bash
diff --git a/test/integration/dns/in.thelinuxpro.net/pi502/local-setup.bash b/test/integration/dns/in.thelinuxpro.net/pi502.in.thelinuxpro.net/local-setup.bash
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/pi502/local-setup.bash
rename to test/integration/dns/in.thelinuxpro.net/pi502.in.thelinuxpro.net/local-setup.bash
diff --git a/test/integration/dns/in.thelinuxpro.net/pi503/a.bat b/test/integration/dns/in.thelinuxpro.net/pi503.in.thelinuxpro.net/a.bat
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/pi503/a.bat
rename to test/integration/dns/in.thelinuxpro.net/pi503.in.thelinuxpro.net/a.bat
diff --git a/test/integration/dns/in.thelinuxpro.net/pi503/helper.bash b/test/integration/dns/in.thelinuxpro.net/pi503.in.thelinuxpro.net/helper.bash
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/pi503/helper.bash
rename to test/integration/dns/in.thelinuxpro.net/pi503.in.thelinuxpro.net/helper.bash
diff --git a/test/integration/dns/in.thelinuxpro.net/pi503/local-setup.bash b/test/integration/dns/in.thelinuxpro.net/pi503.in.thelinuxpro.net/local-setup.bash
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/pi503/local-setup.bash
rename to test/integration/dns/in.thelinuxpro.net/pi503.in.thelinuxpro.net/local-setup.bash
diff --git a/test/integration/dns/in.thelinuxpro.net/pi504/a.bat b/test/integration/dns/in.thelinuxpro.net/pi504.in.thelinuxpro.net/a.bat
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/pi504/a.bat
rename to test/integration/dns/in.thelinuxpro.net/pi504.in.thelinuxpro.net/a.bat
diff --git a/test/integration/dns/in.thelinuxpro.net/pi504/helper.bash b/test/integration/dns/in.thelinuxpro.net/pi504.in.thelinuxpro.net/helper.bash
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/pi504/helper.bash
rename to test/integration/dns/in.thelinuxpro.net/pi504.in.thelinuxpro.net/helper.bash
diff --git a/test/integration/dns/in.thelinuxpro.net/pi504/local-setup.bash b/test/integration/dns/in.thelinuxpro.net/pi504.in.thelinuxpro.net/local-setup.bash
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/pi504/local-setup.bash
rename to test/integration/dns/in.thelinuxpro.net/pi504.in.thelinuxpro.net/local-setup.bash
diff --git a/test/integration/dns/in.thelinuxpro.net/pihole-exporter/a.bat b/test/integration/dns/in.thelinuxpro.net/pihole-exporter.in.thelinuxpro.net/a.bat
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/pihole-exporter/a.bat
rename to test/integration/dns/in.thelinuxpro.net/pihole-exporter.in.thelinuxpro.net/a.bat
diff --git a/test/integration/dns/in.thelinuxpro.net/pihole-exporter/helper.bash b/test/integration/dns/in.thelinuxpro.net/pihole-exporter.in.thelinuxpro.net/helper.bash
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/pihole-exporter/helper.bash
rename to test/integration/dns/in.thelinuxpro.net/pihole-exporter.in.thelinuxpro.net/helper.bash
diff --git a/test/integration/dns/in.thelinuxpro.net/pihole-exporter/local-setup.bash b/test/integration/dns/in.thelinuxpro.net/pihole-exporter.in.thelinuxpro.net/local-setup.bash
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/pihole-exporter/local-setup.bash
rename to test/integration/dns/in.thelinuxpro.net/pihole-exporter.in.thelinuxpro.net/local-setup.bash
diff --git a/test/integration/dns/in.thelinuxpro.net/pihole/a.bat b/test/integration/dns/in.thelinuxpro.net/pihole.in.thelinuxpro.net/a.bat
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/pihole/a.bat
rename to test/integration/dns/in.thelinuxpro.net/pihole.in.thelinuxpro.net/a.bat
diff --git a/test/integration/dns/in.thelinuxpro.net/pihole/helper.bash b/test/integration/dns/in.thelinuxpro.net/pihole.in.thelinuxpro.net/helper.bash
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/pihole/helper.bash
rename to test/integration/dns/in.thelinuxpro.net/pihole.in.thelinuxpro.net/helper.bash
diff --git a/test/integration/dns/in.thelinuxpro.net/pihole/local-setup.bash b/test/integration/dns/in.thelinuxpro.net/pihole.in.thelinuxpro.net/local-setup.bash
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/pihole/local-setup.bash
rename to test/integration/dns/in.thelinuxpro.net/pihole.in.thelinuxpro.net/local-setup.bash
diff --git a/test/integration/dns/in.thelinuxpro.net/prometheus/a.bat b/test/integration/dns/in.thelinuxpro.net/prometheus.in.thelinuxpro.net/a.bat
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/prometheus/a.bat
rename to test/integration/dns/in.thelinuxpro.net/prometheus.in.thelinuxpro.net/a.bat
diff --git a/test/integration/dns/in.thelinuxpro.net/prometheus/helper.bash b/test/integration/dns/in.thelinuxpro.net/prometheus.in.thelinuxpro.net/helper.bash
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/prometheus/helper.bash
rename to test/integration/dns/in.thelinuxpro.net/prometheus.in.thelinuxpro.net/helper.bash
diff --git a/test/integration/dns/in.thelinuxpro.net/prometheus/local-setup.bash b/test/integration/dns/in.thelinuxpro.net/prometheus.in.thelinuxpro.net/local-setup.bash
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/prometheus/local-setup.bash
rename to test/integration/dns/in.thelinuxpro.net/prometheus.in.thelinuxpro.net/local-setup.bash
diff --git a/test/integration/dns/in.thelinuxpro.net/syslog/a.bat b/test/integration/dns/in.thelinuxpro.net/syslog.in.thelinuxpro.net/a.bat
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/syslog/a.bat
rename to test/integration/dns/in.thelinuxpro.net/syslog.in.thelinuxpro.net/a.bat
diff --git a/test/integration/dns/in.thelinuxpro.net/syslog/helper.bash b/test/integration/dns/in.thelinuxpro.net/syslog.in.thelinuxpro.net/helper.bash
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/syslog/helper.bash
rename to test/integration/dns/in.thelinuxpro.net/syslog.in.thelinuxpro.net/helper.bash
diff --git a/test/integration/dns/in.thelinuxpro.net/syslog/local-setup.bash b/test/integration/dns/in.thelinuxpro.net/syslog.in.thelinuxpro.net/local-setup.bash
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/syslog/local-setup.bash
rename to test/integration/dns/in.thelinuxpro.net/syslog.in.thelinuxpro.net/local-setup.bash
diff --git a/test/integration/dns/in.thelinuxpro.net/telegraf/a.bat b/test/integration/dns/in.thelinuxpro.net/telegraf.in.thelinuxpro.net/a.bat
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/telegraf/a.bat
rename to test/integration/dns/in.thelinuxpro.net/telegraf.in.thelinuxpro.net/a.bat
diff --git a/test/integration/dns/in.thelinuxpro.net/telegraf/helper.bash b/test/integration/dns/in.thelinuxpro.net/telegraf.in.thelinuxpro.net/helper.bash
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/telegraf/helper.bash
rename to test/integration/dns/in.thelinuxpro.net/telegraf.in.thelinuxpro.net/helper.bash
diff --git a/test/integration/dns/in.thelinuxpro.net/telegraf/local-setup.bash b/test/integration/dns/in.thelinuxpro.net/telegraf.in.thelinuxpro.net/local-setup.bash
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/telegraf/local-setup.bash
rename to test/integration/dns/in.thelinuxpro.net/telegraf.in.thelinuxpro.net/local-setup.bash
diff --git a/test/integration/dns/in.thelinuxpro.net/unpoller/a.bat b/test/integration/dns/in.thelinuxpro.net/unpoller.in.thelinuxpro.net/a.bat
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/unpoller/a.bat
rename to test/integration/dns/in.thelinuxpro.net/unpoller.in.thelinuxpro.net/a.bat
diff --git a/test/integration/dns/in.thelinuxpro.net/unpoller/helper.bash b/test/integration/dns/in.thelinuxpro.net/unpoller.in.thelinuxpro.net/helper.bash
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/unpoller/helper.bash
rename to test/integration/dns/in.thelinuxpro.net/unpoller.in.thelinuxpro.net/helper.bash
diff --git a/test/integration/dns/in.thelinuxpro.net/unpoller/local-setup.bash b/test/integration/dns/in.thelinuxpro.net/unpoller.in.thelinuxpro.net/local-setup.bash
similarity index 100%
rename from test/integration/dns/in.thelinuxpro.net/unpoller/local-setup.bash
rename to test/integration/dns/in.thelinuxpro.net/unpoller.in.thelinuxpro.net/local-setup.bash
diff --git a/test/integration/dns/kameronkenny.com/blog/helper.bash b/test/integration/dns/kameronkenny.com/blog.kameronkenny.com/helper.bash
similarity index 100%
rename from test/integration/dns/kameronkenny.com/blog/helper.bash
rename to test/integration/dns/kameronkenny.com/blog.kameronkenny.com/helper.bash
diff --git a/test/integration/dns/kameronkenny.com/blog/local-setup.bash b/test/integration/dns/kameronkenny.com/blog.kameronkenny.com/local-setup.bash
similarity index 100%
rename from test/integration/dns/kameronkenny.com/blog/local-setup.bash
rename to test/integration/dns/kameronkenny.com/blog.kameronkenny.com/local-setup.bash
diff --git a/test/integration/dns/kameronkenny.com/blog/tests.bat b/test/integration/dns/kameronkenny.com/blog.kameronkenny.com/tests.bat
similarity index 100%
rename from test/integration/dns/kameronkenny.com/blog/tests.bat
rename to test/integration/dns/kameronkenny.com/blog.kameronkenny.com/tests.bat
diff --git a/test/integration/dns/kameronkenny.com/ns1/helper.bash b/test/integration/dns/kameronkenny.com/ns1.kameronkenny.com/helper.bash
similarity index 100%
rename from test/integration/dns/kameronkenny.com/ns1/helper.bash
rename to test/integration/dns/kameronkenny.com/ns1.kameronkenny.com/helper.bash
diff --git a/test/integration/dns/kameronkenny.com/ns1/local-setup.bash b/test/integration/dns/kameronkenny.com/ns1.kameronkenny.com/local-setup.bash
similarity index 100%
rename from test/integration/dns/kameronkenny.com/ns1/local-setup.bash
rename to test/integration/dns/kameronkenny.com/ns1.kameronkenny.com/local-setup.bash
diff --git a/test/integration/dns/kameronkenny.com/ns1/tests.bat b/test/integration/dns/kameronkenny.com/ns1.kameronkenny.com/tests.bat
similarity index 100%
rename from test/integration/dns/kameronkenny.com/ns1/tests.bat
rename to test/integration/dns/kameronkenny.com/ns1.kameronkenny.com/tests.bat
diff --git a/test/integration/dns/kameronkenny.com/ns2/helper.bash b/test/integration/dns/kameronkenny.com/ns2.kameronkenny.com/helper.bash
similarity index 100%
rename from test/integration/dns/kameronkenny.com/ns2/helper.bash
rename to test/integration/dns/kameronkenny.com/ns2.kameronkenny.com/helper.bash
diff --git a/test/integration/dns/kameronkenny.com/ns2/local-setup.bash b/test/integration/dns/kameronkenny.com/ns2.kameronkenny.com/local-setup.bash
similarity index 100%
rename from test/integration/dns/kameronkenny.com/ns2/local-setup.bash
rename to test/integration/dns/kameronkenny.com/ns2.kameronkenny.com/local-setup.bash
diff --git a/test/integration/dns/kameronkenny.com/ns2/tests.bat b/test/integration/dns/kameronkenny.com/ns2.kameronkenny.com/tests.bat
similarity index 100%
rename from test/integration/dns/kameronkenny.com/ns2/tests.bat
rename to test/integration/dns/kameronkenny.com/ns2.kameronkenny.com/tests.bat
diff --git a/test/integration/dns/kameronkenny.com/photos/helper.bash b/test/integration/dns/kameronkenny.com/photos.kameronkenny.com/helper.bash
similarity index 100%
rename from test/integration/dns/kameronkenny.com/photos/helper.bash
rename to test/integration/dns/kameronkenny.com/photos.kameronkenny.com/helper.bash
diff --git a/test/integration/dns/kameronkenny.com/photos/local-setup.bash b/test/integration/dns/kameronkenny.com/photos.kameronkenny.com/local-setup.bash
similarity index 100%
rename from test/integration/dns/kameronkenny.com/photos/local-setup.bash
rename to test/integration/dns/kameronkenny.com/photos.kameronkenny.com/local-setup.bash
diff --git a/test/integration/dns/kameronkenny.com/photos/tests.bat b/test/integration/dns/kameronkenny.com/photos.kameronkenny.com/tests.bat
similarity index 100%
rename from test/integration/dns/kameronkenny.com/photos/tests.bat
rename to test/integration/dns/kameronkenny.com/photos.kameronkenny.com/tests.bat
diff --git a/test/integration/dns/kameronkenny.com/www/helper.bash b/test/integration/dns/kameronkenny.com/www.kameronkenny.com/helper.bash
similarity index 100%
rename from test/integration/dns/kameronkenny.com/www/helper.bash
rename to test/integration/dns/kameronkenny.com/www.kameronkenny.com/helper.bash
diff --git a/test/integration/dns/kameronkenny.com/www/local-setup.bash b/test/integration/dns/kameronkenny.com/www.kameronkenny.com/local-setup.bash
similarity index 100%
rename from test/integration/dns/kameronkenny.com/www/local-setup.bash
rename to test/integration/dns/kameronkenny.com/www.kameronkenny.com/local-setup.bash
diff --git a/test/integration/dns/kameronkenny.com/www/tests.bat b/test/integration/dns/kameronkenny.com/www.kameronkenny.com/tests.bat
similarity index 100%
rename from test/integration/dns/kameronkenny.com/www/tests.bat
rename to test/integration/dns/kameronkenny.com/www.kameronkenny.com/tests.bat
diff --git a/test/integration/dns/thelinux.pro/ns1/dns.ns1.thelinux.pro.bat b/test/integration/dns/thelinux.pro/ns1.thelinux.pro/dns.ns1.thelinux.pro.bat
similarity index 100%
rename from test/integration/dns/thelinux.pro/ns1/dns.ns1.thelinux.pro.bat
rename to test/integration/dns/thelinux.pro/ns1.thelinux.pro/dns.ns1.thelinux.pro.bat
diff --git a/test/integration/dns/thelinux.pro/ns1/helper.bash b/test/integration/dns/thelinux.pro/ns1.thelinux.pro/helper.bash
similarity index 100%
rename from test/integration/dns/thelinux.pro/ns1/helper.bash
rename to test/integration/dns/thelinux.pro/ns1.thelinux.pro/helper.bash
diff --git a/test/integration/dns/thelinux.pro/ns1/local-setup.bash b/test/integration/dns/thelinux.pro/ns1.thelinux.pro/local-setup.bash
similarity index 100%
rename from test/integration/dns/thelinux.pro/ns1/local-setup.bash
rename to test/integration/dns/thelinux.pro/ns1.thelinux.pro/local-setup.bash
diff --git a/test/integration/dns/thelinux.pro/ns2/dns.ns2.thelinux.pro.bat b/test/integration/dns/thelinux.pro/ns2.thelinux.pro/dns.ns2.thelinux.pro.bat
similarity index 100%
rename from test/integration/dns/thelinux.pro/ns2/dns.ns2.thelinux.pro.bat
rename to test/integration/dns/thelinux.pro/ns2.thelinux.pro/dns.ns2.thelinux.pro.bat
diff --git a/test/integration/dns/thelinux.pro/ns2/helper.bash b/test/integration/dns/thelinux.pro/ns2.thelinux.pro/helper.bash
similarity index 100%
rename from test/integration/dns/thelinux.pro/ns2/helper.bash
rename to test/integration/dns/thelinux.pro/ns2.thelinux.pro/helper.bash
diff --git a/test/integration/dns/thelinux.pro/ns2/local-setup.bash b/test/integration/dns/thelinux.pro/ns2.thelinux.pro/local-setup.bash
similarity index 100%
rename from test/integration/dns/thelinux.pro/ns2/local-setup.bash
rename to test/integration/dns/thelinux.pro/ns2.thelinux.pro/local-setup.bash
diff --git a/test/integration/dns/thelinux.pro/www/dns.www.thelinux.pro.bat b/test/integration/dns/thelinux.pro/www.thelinux.pro/dns.www.thelinux.pro.bat
similarity index 100%
rename from test/integration/dns/thelinux.pro/www/dns.www.thelinux.pro.bat
rename to test/integration/dns/thelinux.pro/www.thelinux.pro/dns.www.thelinux.pro.bat
diff --git a/test/integration/dns/thelinux.pro/www/helper.bash b/test/integration/dns/thelinux.pro/www.thelinux.pro/helper.bash
similarity index 100%
rename from test/integration/dns/thelinux.pro/www/helper.bash
rename to test/integration/dns/thelinux.pro/www.thelinux.pro/helper.bash
diff --git a/test/integration/dns/thelinux.pro/www/local-setup.bash b/test/integration/dns/thelinux.pro/www.thelinux.pro/local-setup.bash
similarity index 100%
rename from test/integration/dns/thelinux.pro/www/local-setup.bash
rename to test/integration/dns/thelinux.pro/www.thelinux.pro/local-setup.bash