diff --git a/arch/Dockerfile b/arch/Dockerfile
index 290bcff..9484f6c 100644
--- a/arch/Dockerfile
+++ b/arch/Dockerfile
@@ -16,7 +16,7 @@ RUN echo test >/etc/salt/minion_id
 RUN for cmd in salt salt-api salt-call salt-cloud salt-cp salt-extend \
                salt-key salt-master salt-minion salt-proxy salt-run salt-ssh \
                salt-syndic salt-unity spm; do \
-        echo "#!/bin/bash\n\npython3 /testing/scripts/$cmd \"\$@\"" >/usr/bin/$cmd; \
+        echo -e "#!/bin/bash\n\npython3 /testing/scripts/$cmd \"\$@\"" >/usr/bin/$cmd; \
         chmod 0755 /usr/bin/$cmd; \
     done
 
@@ -24,7 +24,7 @@ RUN for cmd in salt salt-api salt-call salt-cloud salt-cp salt-extend \
 RUN for cmd in salt salt-api salt-call salt-cloud salt-cp salt-extend \
                salt-key salt-master salt-minion salt-proxy salt-run salt-ssh \
                salt-syndic salt-unity spm; do \
-        echo "#!/bin/bash\n\npython2 /testing/scripts/$cmd \"\$@\"" >/usr/bin/${cmd}2; \
+        echo -e "#!/bin/bash\n\npython2 /testing/scripts/$cmd \"\$@\"" >/usr/bin/${cmd}2; \
         chmod 0755 /usr/bin/${cmd}2; \
     done
 
diff --git a/arch/requirements.txt b/arch/requirements.txt
index d47fe04..6a51c63 100644
--- a/arch/requirements.txt
+++ b/arch/requirements.txt
@@ -86,6 +86,7 @@ pyserial==3.4             # via junos-eznc
 pytest-helpers-namespace==2019.1.8
 pytest-salt-runtests-bridge==2019.7.10
 pytest-salt==2019.12.27
+pytest-salt-factories==0.10.4
 pytest-tempdir==2019.10.12
 pytest==4.6.6
 python-dateutil==2.8.0    # via botocore, croniter, kubernetes, moto, vcert
diff --git a/cent6/Dockerfile b/cent6/Dockerfile
index c68df44..f5837e4 100644
--- a/cent6/Dockerfile
+++ b/cent6/Dockerfile
@@ -16,7 +16,7 @@ RUN echo test >/etc/salt/minion_id
 RUN for cmd in salt salt-api salt-call salt-cloud salt-cp salt-extend \
                salt-key salt-master salt-minion salt-proxy salt-run salt-ssh \
                salt-syndic salt-unity spm; do \
-        echo "#!/bin/bash\n\npython3 /testing/scripts/$cmd \"\$@\"" >/usr/bin/$cmd; \
+        echo -e "#!/bin/bash\n\npython3 /testing/scripts/$cmd \"\$@\"" >/usr/bin/$cmd; \
         chmod 0755 /usr/bin/$cmd; \
     done
 
@@ -24,7 +24,7 @@ RUN for cmd in salt salt-api salt-call salt-cloud salt-cp salt-extend \
 RUN for cmd in salt salt-api salt-call salt-cloud salt-cp salt-extend \
                salt-key salt-master salt-minion salt-proxy salt-run salt-ssh \
                salt-syndic salt-unity spm; do \
-        echo "#!/bin/bash\n\npython2 /testing/scripts/$cmd \"\$@\"" >/usr/bin/${cmd}2; \
+        echo -e "#!/bin/bash\n\npython2 /testing/scripts/$cmd \"\$@\"" >/usr/bin/${cmd}2; \
         chmod 0755 /usr/bin/${cmd}2; \
     done
 
diff --git a/cent6/requirements.txt b/cent6/requirements.txt
index cf18031..e052591 100644
--- a/cent6/requirements.txt
+++ b/cent6/requirements.txt
@@ -86,6 +86,7 @@ pyserial==3.4             # via junos-eznc
 pytest-helpers-namespace==2019.1.8
 pytest-salt-runtests-bridge==2019.7.10
 pytest-salt==2019.12.27
+pytest-salt-factories==0.10.4
 pytest-tempdir==2019.10.12
 pytest==4.6.6
 python-dateutil==2.8.0    # via botocore, croniter, kubernetes, moto, vcert
diff --git a/cent7/Dockerfile b/cent7/Dockerfile
index 36b12ff..994cb6e 100644
--- a/cent7/Dockerfile
+++ b/cent7/Dockerfile
@@ -16,7 +16,7 @@ RUN echo test >/etc/salt/minion_id
 RUN for cmd in salt salt-api salt-call salt-cloud salt-cp salt-extend \
                salt-key salt-master salt-minion salt-proxy salt-run salt-ssh \
                salt-syndic salt-unity spm; do \
-        echo "#!/bin/bash\n\npython3 /testing/scripts/$cmd \"\$@\"" >/usr/bin/$cmd; \
+        echo -e "#!/bin/bash\n\npython3 /testing/scripts/$cmd \"\$@\"" >/usr/bin/$cmd; \
         chmod 0755 /usr/bin/$cmd; \
     done
 
@@ -24,7 +24,7 @@ RUN for cmd in salt salt-api salt-call salt-cloud salt-cp salt-extend \
 RUN for cmd in salt salt-api salt-call salt-cloud salt-cp salt-extend \
                salt-key salt-master salt-minion salt-proxy salt-run salt-ssh \
                salt-syndic salt-unity spm; do \
-        echo "#!/bin/bash\n\npython2 /testing/scripts/$cmd \"\$@\"" >/usr/bin/${cmd}2; \
+        echo -e "#!/bin/bash\n\npython2 /testing/scripts/$cmd \"\$@\"" >/usr/bin/${cmd}2; \
         chmod 0755 /usr/bin/${cmd}2; \
     done
 
diff --git a/cent7/requirements.txt b/cent7/requirements.txt
index 882b4dd..72083c7 100644
--- a/cent7/requirements.txt
+++ b/cent7/requirements.txt
@@ -85,6 +85,7 @@ pyserial==3.4             # via junos-eznc
 pytest-helpers-namespace==2019.1.8
 pytest-salt-runtests-bridge==2019.7.10
 pytest-salt==2019.12.27
+pytest-salt-factories==0.10.4
 pytest-tempdir==2019.10.12
 pytest==4.6.6
 python-dateutil==2.8.0    # via botocore, croniter, kubernetes, moto, vcert
diff --git a/cent8/Dockerfile b/cent8/Dockerfile
index 21d8467..0287204 100644
--- a/cent8/Dockerfile
+++ b/cent8/Dockerfile
@@ -16,7 +16,7 @@ RUN echo test >/etc/salt/minion_id
 RUN for cmd in salt salt-api salt-call salt-cloud salt-cp salt-extend \
                salt-key salt-master salt-minion salt-proxy salt-run salt-ssh \
                salt-syndic salt-unity spm; do \
-        echo "#!/bin/bash\n\npython3 /testing/scripts/$cmd \"\$@\"" >/usr/bin/$cmd; \
+        echo -e "#!/bin/bash\n\npython3 /testing/scripts/$cmd \"\$@\"" >/usr/bin/$cmd; \
         chmod 0755 /usr/bin/$cmd; \
     done
 
@@ -24,7 +24,7 @@ RUN for cmd in salt salt-api salt-call salt-cloud salt-cp salt-extend \
 RUN for cmd in salt salt-api salt-call salt-cloud salt-cp salt-extend \
                salt-key salt-master salt-minion salt-proxy salt-run salt-ssh \
                salt-syndic salt-unity spm; do \
-        echo "#!/bin/bash\n\npython2 /testing/scripts/$cmd \"\$@\"" >/usr/bin/${cmd}2; \
+        echo -e "#!/bin/bash\n\npython2 /testing/scripts/$cmd \"\$@\"" >/usr/bin/${cmd}2; \
         chmod 0755 /usr/bin/${cmd}2; \
     done
 
diff --git a/cent8/requirements.txt b/cent8/requirements.txt
index 882b4dd..72083c7 100644
--- a/cent8/requirements.txt
+++ b/cent8/requirements.txt
@@ -85,6 +85,7 @@ pyserial==3.4             # via junos-eznc
 pytest-helpers-namespace==2019.1.8
 pytest-salt-runtests-bridge==2019.7.10
 pytest-salt==2019.12.27
+pytest-salt-factories==0.10.4
 pytest-tempdir==2019.10.12
 pytest==4.6.6
 python-dateutil==2.8.0    # via botocore, croniter, kubernetes, moto, vcert
diff --git a/debian10/requirements.txt b/debian10/requirements.txt
index 882b4dd..72083c7 100644
--- a/debian10/requirements.txt
+++ b/debian10/requirements.txt
@@ -85,6 +85,7 @@ pyserial==3.4             # via junos-eznc
 pytest-helpers-namespace==2019.1.8
 pytest-salt-runtests-bridge==2019.7.10
 pytest-salt==2019.12.27
+pytest-salt-factories==0.10.4
 pytest-tempdir==2019.10.12
 pytest==4.6.6
 python-dateutil==2.8.0    # via botocore, croniter, kubernetes, moto, vcert
diff --git a/debian8/requirements.txt b/debian8/requirements.txt
index c68517a..cda0756 100644
--- a/debian8/requirements.txt
+++ b/debian8/requirements.txt
@@ -85,6 +85,7 @@ pyserial==3.4             # via junos-eznc
 pytest-helpers-namespace==2019.1.8
 pytest-salt-runtests-bridge==2019.7.10
 pytest-salt==2019.12.27
+pytest-salt-factories==0.10.4
 pytest-tempdir==2019.10.12
 pytest==4.6.6
 python-dateutil==2.8.0    # via botocore, croniter, kubernetes, moto, vcert
diff --git a/debian9/requirements.txt b/debian9/requirements.txt
index 882b4dd..72083c7 100644
--- a/debian9/requirements.txt
+++ b/debian9/requirements.txt
@@ -85,6 +85,7 @@ pyserial==3.4             # via junos-eznc
 pytest-helpers-namespace==2019.1.8
 pytest-salt-runtests-bridge==2019.7.10
 pytest-salt==2019.12.27
+pytest-salt-factories==0.10.4
 pytest-tempdir==2019.10.12
 pytest==4.6.6
 python-dateutil==2.8.0    # via botocore, croniter, kubernetes, moto, vcert
diff --git a/fedora30/Dockerfile b/fedora30/Dockerfile
index 39f3428..6aef5a1 100644
--- a/fedora30/Dockerfile
+++ b/fedora30/Dockerfile
@@ -16,7 +16,7 @@ RUN echo test >/etc/salt/minion_id
 RUN for cmd in salt salt-api salt-call salt-cloud salt-cp salt-extend \
                salt-key salt-master salt-minion salt-proxy salt-run salt-ssh \
                salt-syndic salt-unity spm; do \
-        echo "#!/bin/bash\n\npython3 /testing/scripts/$cmd \"\$@\"" >/usr/bin/$cmd; \
+        echo -e "#!/bin/bash\n\npython3 /testing/scripts/$cmd \"\$@\"" >/usr/bin/$cmd; \
         chmod 0755 /usr/bin/$cmd; \
     done
 
@@ -24,7 +24,7 @@ RUN for cmd in salt salt-api salt-call salt-cloud salt-cp salt-extend \
 RUN for cmd in salt salt-api salt-call salt-cloud salt-cp salt-extend \
                salt-key salt-master salt-minion salt-proxy salt-run salt-ssh \
                salt-syndic salt-unity spm; do \
-        echo "#!/bin/bash\n\npython2 /testing/scripts/$cmd \"\$@\"" >/usr/bin/${cmd}2; \
+        echo -e "#!/bin/bash\n\npython2 /testing/scripts/$cmd \"\$@\"" >/usr/bin/${cmd}2; \
         chmod 0755 /usr/bin/${cmd}2; \
     done
 
diff --git a/fedora30/requirements.txt b/fedora30/requirements.txt
index 882b4dd..72083c7 100644
--- a/fedora30/requirements.txt
+++ b/fedora30/requirements.txt
@@ -85,6 +85,7 @@ pyserial==3.4             # via junos-eznc
 pytest-helpers-namespace==2019.1.8
 pytest-salt-runtests-bridge==2019.7.10
 pytest-salt==2019.12.27
+pytest-salt-factories==0.10.4
 pytest-tempdir==2019.10.12
 pytest==4.6.6
 python-dateutil==2.8.0    # via botocore, croniter, kubernetes, moto, vcert
diff --git a/fedora31/Dockerfile b/fedora31/Dockerfile
index 50d0d47..ed53cb3 100644
--- a/fedora31/Dockerfile
+++ b/fedora31/Dockerfile
@@ -16,7 +16,7 @@ RUN echo test >/etc/salt/minion_id
 RUN for cmd in salt salt-api salt-call salt-cloud salt-cp salt-extend \
                salt-key salt-master salt-minion salt-proxy salt-run salt-ssh \
                salt-syndic salt-unity spm; do \
-        echo "#!/bin/bash\n\npython3 /testing/scripts/$cmd \"\$@\"" >/usr/bin/$cmd; \
+        echo -e "#!/bin/bash\n\npython3 /testing/scripts/$cmd \"\$@\"" >/usr/bin/$cmd; \
         chmod 0755 /usr/bin/$cmd; \
     done
 
@@ -24,7 +24,7 @@ RUN for cmd in salt salt-api salt-call salt-cloud salt-cp salt-extend \
 RUN for cmd in salt salt-api salt-call salt-cloud salt-cp salt-extend \
                salt-key salt-master salt-minion salt-proxy salt-run salt-ssh \
                salt-syndic salt-unity spm; do \
-        echo "#!/bin/bash\n\npython2 /testing/scripts/$cmd \"\$@\"" >/usr/bin/${cmd}2; \
+        echo -e "#!/bin/bash\n\npython2 /testing/scripts/$cmd \"\$@\"" >/usr/bin/${cmd}2; \
         chmod 0755 /usr/bin/${cmd}2; \
     done
 
diff --git a/fedora31/requirements.txt b/fedora31/requirements.txt
index 882b4dd..72083c7 100644
--- a/fedora31/requirements.txt
+++ b/fedora31/requirements.txt
@@ -85,6 +85,7 @@ pyserial==3.4             # via junos-eznc
 pytest-helpers-namespace==2019.1.8
 pytest-salt-runtests-bridge==2019.7.10
 pytest-salt==2019.12.27
+pytest-salt-factories==0.10.4
 pytest-tempdir==2019.10.12
 pytest==4.6.6
 python-dateutil==2.8.0    # via botocore, croniter, kubernetes, moto, vcert
diff --git a/leap151/Dockerfile b/leap151/Dockerfile
index ace3783..943eb3d 100644
--- a/leap151/Dockerfile
+++ b/leap151/Dockerfile
@@ -16,7 +16,7 @@ RUN echo test >/etc/salt/minion_id
 RUN for cmd in salt salt-api salt-call salt-cloud salt-cp salt-extend \
                salt-key salt-master salt-minion salt-proxy salt-run salt-ssh \
                salt-syndic salt-unity spm; do \
-        echo "#!/bin/bash\n\npython3 /testing/scripts/$cmd \"\$@\"" >/usr/bin/$cmd; \
+        echo -e "#!/bin/bash\n\npython3 /testing/scripts/$cmd \"\$@\"" >/usr/bin/$cmd; \
         chmod 0755 /usr/bin/$cmd; \
     done
 
@@ -24,7 +24,7 @@ RUN for cmd in salt salt-api salt-call salt-cloud salt-cp salt-extend \
 RUN for cmd in salt salt-api salt-call salt-cloud salt-cp salt-extend \
                salt-key salt-master salt-minion salt-proxy salt-run salt-ssh \
                salt-syndic salt-unity spm; do \
-        echo "#!/bin/bash\n\npython2 /testing/scripts/$cmd \"\$@\"" >/usr/bin/${cmd}2; \
+        echo -e "#!/bin/bash\n\npython2 /testing/scripts/$cmd \"\$@\"" >/usr/bin/${cmd}2; \
         chmod 0755 /usr/bin/${cmd}2; \
     done
 
diff --git a/leap151/requirements.txt b/leap151/requirements.txt
index 882b4dd..72083c7 100644
--- a/leap151/requirements.txt
+++ b/leap151/requirements.txt
@@ -85,6 +85,7 @@ pyserial==3.4             # via junos-eznc
 pytest-helpers-namespace==2019.1.8
 pytest-salt-runtests-bridge==2019.7.10
 pytest-salt==2019.12.27
+pytest-salt-factories==0.10.4
 pytest-tempdir==2019.10.12
 pytest==4.6.6
 python-dateutil==2.8.0    # via botocore, croniter, kubernetes, moto, vcert
diff --git a/leap152/Dockerfile b/leap152/Dockerfile
index 1277fa7..fd61fff 100644
--- a/leap152/Dockerfile
+++ b/leap152/Dockerfile
@@ -16,7 +16,7 @@ RUN echo test >/etc/salt/minion_id
 RUN for cmd in salt salt-api salt-call salt-cloud salt-cp salt-extend \
                salt-key salt-master salt-minion salt-proxy salt-run salt-ssh \
                salt-syndic salt-unity spm; do \
-        echo "#!/bin/bash\n\npython3 /testing/scripts/$cmd \"\$@\"" >/usr/bin/$cmd; \
+        echo -e "#!/bin/bash\n\npython3 /testing/scripts/$cmd \"\$@\"" >/usr/bin/$cmd; \
         chmod 0755 /usr/bin/$cmd; \
     done
 
@@ -24,7 +24,7 @@ RUN for cmd in salt salt-api salt-call salt-cloud salt-cp salt-extend \
 RUN for cmd in salt salt-api salt-call salt-cloud salt-cp salt-extend \
                salt-key salt-master salt-minion salt-proxy salt-run salt-ssh \
                salt-syndic salt-unity spm; do \
-        echo "#!/bin/bash\n\npython2 /testing/scripts/$cmd \"\$@\"" >/usr/bin/${cmd}2; \
+        echo -e "#!/bin/bash\n\npython2 /testing/scripts/$cmd \"\$@\"" >/usr/bin/${cmd}2; \
         chmod 0755 /usr/bin/${cmd}2; \
     done
 
diff --git a/leap152/requirements.txt b/leap152/requirements.txt
index 882b4dd..72083c7 100644
--- a/leap152/requirements.txt
+++ b/leap152/requirements.txt
@@ -85,6 +85,7 @@ pyserial==3.4             # via junos-eznc
 pytest-helpers-namespace==2019.1.8
 pytest-salt-runtests-bridge==2019.7.10
 pytest-salt==2019.12.27
+pytest-salt-factories==0.10.4
 pytest-tempdir==2019.10.12
 pytest==4.6.6
 python-dateutil==2.8.0    # via botocore, croniter, kubernetes, moto, vcert
diff --git a/tumbleweed/Dockerfile b/tumbleweed/Dockerfile
index 3410a1c..16de551 100644
--- a/tumbleweed/Dockerfile
+++ b/tumbleweed/Dockerfile
@@ -16,7 +16,7 @@ RUN echo test >/etc/salt/minion_id
 RUN for cmd in salt salt-api salt-call salt-cloud salt-cp salt-extend \
                salt-key salt-master salt-minion salt-proxy salt-run salt-ssh \
                salt-syndic salt-unity spm; do \
-        echo "#!/bin/bash\n\npython3 /testing/scripts/$cmd \"\$@\"" >/usr/bin/$cmd; \
+        echo -e "#!/bin/bash\n\npython3 /testing/scripts/$cmd \"\$@\"" >/usr/bin/$cmd; \
         chmod 0755 /usr/bin/$cmd; \
     done
 
@@ -24,7 +24,7 @@ RUN for cmd in salt salt-api salt-call salt-cloud salt-cp salt-extend \
 RUN for cmd in salt salt-api salt-call salt-cloud salt-cp salt-extend \
                salt-key salt-master salt-minion salt-proxy salt-run salt-ssh \
                salt-syndic salt-unity spm; do \
-        echo "#!/bin/bash\n\npython2 /testing/scripts/$cmd \"\$@\"" >/usr/bin/${cmd}2; \
+        echo -e "#!/bin/bash\n\npython2 /testing/scripts/$cmd \"\$@\"" >/usr/bin/${cmd}2; \
         chmod 0755 /usr/bin/${cmd}2; \
     done
 
diff --git a/tumbleweed/requirements.txt b/tumbleweed/requirements.txt
index 300ea22..1dcc458 100644
--- a/tumbleweed/requirements.txt
+++ b/tumbleweed/requirements.txt
@@ -85,6 +85,7 @@ pyserial==3.4             # via junos-eznc
 pytest-helpers-namespace==2019.1.8
 pytest-salt-runtests-bridge==2019.7.10
 pytest-salt==2019.12.27
+pytest-salt-factories==0.10.4
 pytest-tempdir==2019.10.12
 pytest==4.6.6
 python-dateutil==2.8.0    # via botocore, croniter, kubernetes, moto, vcert
diff --git a/ubuntu16/requirements.txt b/ubuntu16/requirements.txt
index 882b4dd..72083c7 100644
--- a/ubuntu16/requirements.txt
+++ b/ubuntu16/requirements.txt
@@ -85,6 +85,7 @@ pyserial==3.4             # via junos-eznc
 pytest-helpers-namespace==2019.1.8
 pytest-salt-runtests-bridge==2019.7.10
 pytest-salt==2019.12.27
+pytest-salt-factories==0.10.4
 pytest-tempdir==2019.10.12
 pytest==4.6.6
 python-dateutil==2.8.0    # via botocore, croniter, kubernetes, moto, vcert
diff --git a/ubuntu18/requirements.txt b/ubuntu18/requirements.txt
index 882b4dd..72083c7 100644
--- a/ubuntu18/requirements.txt
+++ b/ubuntu18/requirements.txt
@@ -85,6 +85,7 @@ pyserial==3.4             # via junos-eznc
 pytest-helpers-namespace==2019.1.8
 pytest-salt-runtests-bridge==2019.7.10
 pytest-salt==2019.12.27
+pytest-salt-factories==0.10.4
 pytest-tempdir==2019.10.12
 pytest==4.6.6
 python-dateutil==2.8.0    # via botocore, croniter, kubernetes, moto, vcert
diff --git a/ubuntu20/requirements.txt b/ubuntu20/requirements.txt
index 882b4dd..72083c7 100644
--- a/ubuntu20/requirements.txt
+++ b/ubuntu20/requirements.txt
@@ -85,6 +85,7 @@ pyserial==3.4             # via junos-eznc
 pytest-helpers-namespace==2019.1.8
 pytest-salt-runtests-bridge==2019.7.10
 pytest-salt==2019.12.27
+pytest-salt-factories==0.10.4
 pytest-tempdir==2019.10.12
 pytest==4.6.6
 python-dateutil==2.8.0    # via botocore, croniter, kubernetes, moto, vcert