diff --git a/testsuite/tests/Write.out b/testsuite/tests/Write.out
index ab513e5..8b124fe 100644
--- a/testsuite/tests/Write.out
+++ b/testsuite/tests/Write.out
@@ -3,16 +3,6 @@ Write	.sysconfig.dhcpd.DHCPD_RUN_CHROOTED "no" true
 Write	.sysconfig.dhcpd.DHCPD_INTERFACE "" true
 Write	.sysconfig.dhcpd.DHCPD_OTHER_ARGS "" true
 Write	.sysconfig.dhcpd nil true
-Execute	.target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password show dhcpd.service  --property=Id  --property=MainPID  --property=Description  --property=LoadState  --property=ActiveState  --property=SubState  --property=UnitFileState  --property=FragmentPath  --property=CanReload " $["exit":0, "stderr":"", "stdout":""]
-Execute	.target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password is-enabled dhcpd.service " $["exit":0, "stderr":"", "stdout":""]
-Execute	.target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password stop dhcpd.service " $["exit":0, "stderr":"", "stdout":""]
-Execute	.target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password show dhcpd.service  --property=Id  --property=MainPID  --property=Description  --property=LoadState  --property=ActiveState  --property=SubState  --property=UnitFileState  --property=FragmentPath  --property=CanReload " $["exit":0, "stderr":"", "stdout":""]
-Execute	.target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password is-enabled dhcpd.service " $["exit":0, "stderr":"", "stdout":""]
-Execute	.target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password show dhcpd.service  --property=Id  --property=MainPID  --property=Description  --property=LoadState  --property=ActiveState  --property=SubState  --property=UnitFileState  --property=FragmentPath  --property=CanReload " $["exit":0, "stderr":"", "stdout":""]
-Execute	.target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password is-enabled dhcpd.service " $["exit":0, "stderr":"", "stdout":""]
-Execute	.target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password disable dhcpd.service " $["exit":0, "stderr":"", "stdout":""]
-Execute	.target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password show dhcpd.service  --property=Id  --property=MainPID  --property=Description  --property=LoadState  --property=ActiveState  --property=SubState  --property=UnitFileState  --property=FragmentPath  --property=CanReload " $["exit":0, "stderr":"", "stdout":""]
-Execute	.target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password is-enabled dhcpd.service " $["exit":0, "stderr":"", "stdout":""]
 Return	true
 Dump	===============================
 Return	nil
@@ -22,14 +12,4 @@ Write	.sysconfig.dhcpd.DHCPD_RUN_CHROOTED "yes" true
 Write	.sysconfig.dhcpd.DHCPD_INTERFACE "eth0 eth2" true
 Write	.sysconfig.dhcpd.DHCPD_OTHER_ARGS "-p 111" true
 Write	.sysconfig.dhcpd nil true
-Execute	.target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password show dhcpd.service  --property=Id  --property=MainPID  --property=Description  --property=LoadState  --property=ActiveState  --property=SubState  --property=UnitFileState  --property=FragmentPath  --property=CanReload " $["exit":0, "stderr":"", "stdout":""]
-Execute	.target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password is-enabled dhcpd.service " $["exit":0, "stderr":"", "stdout":""]
-Execute	.target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password stop dhcpd.service " $["exit":0, "stderr":"", "stdout":""]
-Execute	.target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password show dhcpd.service  --property=Id  --property=MainPID  --property=Description  --property=LoadState  --property=ActiveState  --property=SubState  --property=UnitFileState  --property=FragmentPath  --property=CanReload " $["exit":0, "stderr":"", "stdout":""]
-Execute	.target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password is-enabled dhcpd.service " $["exit":0, "stderr":"", "stdout":""]
-Execute	.target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password show dhcpd.service  --property=Id  --property=MainPID  --property=Description  --property=LoadState  --property=ActiveState  --property=SubState  --property=UnitFileState  --property=FragmentPath  --property=CanReload " $["exit":0, "stderr":"", "stdout":""]
-Execute	.target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password is-enabled dhcpd.service " $["exit":0, "stderr":"", "stdout":""]
-Execute	.target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password disable dhcpd.service " $["exit":0, "stderr":"", "stdout":""]
-Execute	.target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password show dhcpd.service  --property=Id  --property=MainPID  --property=Description  --property=LoadState  --property=ActiveState  --property=SubState  --property=UnitFileState  --property=FragmentPath  --property=CanReload " $["exit":0, "stderr":"", "stdout":""]
-Execute	.target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password is-enabled dhcpd.service " $["exit":0, "stderr":"", "stdout":""]
 Return	true
diff --git a/testsuite/tests/YaPIAddDeclaration.out b/testsuite/tests/YaPIAddDeclaration.out
index 9d8d650..45ae911 100644
--- a/testsuite/tests/YaPIAddDeclaration.out
+++ b/testsuite/tests/YaPIAddDeclaration.out
@@ -14,7 +14,5 @@ Write	.sysconfig.dhcpd.DHCPD_RUN_CHROOTED "no" true
 Write	.sysconfig.dhcpd.DHCPD_INTERFACE "eth0 eth2" true
 Write	.sysconfig.dhcpd.DHCPD_OTHER_ARGS "-p 111" true
 Write	.sysconfig.dhcpd nil true
-Execute	.target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password show dhcpd.service  --property=Id  --property=MainPID  --property=Description  --property=LoadState  --property=ActiveState  --property=SubState  --property=UnitFileState  --property=FragmentPath  --property=CanReload " $["exit":0, "stderr":"localhost", "stdout":"localhost"]
-Execute	.target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password show dhcpd.service  --property=Id  --property=MainPID  --property=Description  --property=LoadState  --property=ActiveState  --property=SubState  --property=UnitFileState  --property=FragmentPath  --property=CanReload " $["exit":0, "stderr":"localhost", "stdout":"localhost"]
 Return	true
 Dump	==========================================================
diff --git a/testsuite/tests/YaPIDeleteDeclartion.out b/testsuite/tests/YaPIDeleteDeclartion.out
index 7522ce7..575ff98 100644
--- a/testsuite/tests/YaPIDeleteDeclartion.out
+++ b/testsuite/tests/YaPIDeleteDeclartion.out
@@ -14,8 +14,6 @@ Write	.sysconfig.dhcpd.DHCPD_RUN_CHROOTED "no" true
 Write	.sysconfig.dhcpd.DHCPD_INTERFACE "eth0 eth2" true
 Write	.sysconfig.dhcpd.DHCPD_OTHER_ARGS "-p 111" true
 Write	.sysconfig.dhcpd nil true
-Execute	.target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password show dhcpd.service  --property=Id  --property=MainPID  --property=Description  --property=LoadState  --property=ActiveState  --property=SubState  --property=UnitFileState  --property=FragmentPath  --property=CanReload " $["exit":0, "stderr":"localhost", "stdout":"localhost"]
-Execute	.target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password show dhcpd.service  --property=Id  --property=MainPID  --property=Description  --property=LoadState  --property=ActiveState  --property=SubState  --property=UnitFileState  --property=FragmentPath  --property=CanReload " $["exit":0, "stderr":"localhost", "stdout":"localhost"]
 Return	true
 Dump	==========================================================
 Execute	.target.bash_output "/bin/hostname --short" $["exit":0, "stderr":"localhost", "stdout":"localhost"]
@@ -33,7 +31,5 @@ Write	.sysconfig.dhcpd.DHCPD_RUN_CHROOTED "no" true
 Write	.sysconfig.dhcpd.DHCPD_INTERFACE "eth0 eth2" true
 Write	.sysconfig.dhcpd.DHCPD_OTHER_ARGS "-p 111" true
 Write	.sysconfig.dhcpd nil true
-Execute	.target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password show dhcpd.service  --property=Id  --property=MainPID  --property=Description  --property=LoadState  --property=ActiveState  --property=SubState  --property=UnitFileState  --property=FragmentPath  --property=CanReload " $["exit":0, "stderr":"localhost", "stdout":"localhost"]
-Execute	.target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password show dhcpd.service  --property=Id  --property=MainPID  --property=Description  --property=LoadState  --property=ActiveState  --property=SubState  --property=UnitFileState  --property=FragmentPath  --property=CanReload " $["exit":0, "stderr":"localhost", "stdout":"localhost"]
 Return	true
 Dump	==========================================================
diff --git a/testsuite/tests/YaPISetDeclarationDirectives.out b/testsuite/tests/YaPISetDeclarationDirectives.out
index 2b8744c..a4c34ef 100644
--- a/testsuite/tests/YaPISetDeclarationDirectives.out
+++ b/testsuite/tests/YaPISetDeclarationDirectives.out
@@ -14,7 +14,5 @@ Write	.sysconfig.dhcpd.DHCPD_RUN_CHROOTED "no" true
 Write	.sysconfig.dhcpd.DHCPD_INTERFACE "eth0 eth2" true
 Write	.sysconfig.dhcpd.DHCPD_OTHER_ARGS "-p 111" true
 Write	.sysconfig.dhcpd nil true
-Execute	.target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password show dhcpd.service  --property=Id  --property=MainPID  --property=Description  --property=LoadState  --property=ActiveState  --property=SubState  --property=UnitFileState  --property=FragmentPath  --property=CanReload " $["exit":0, "stderr":"localhost", "stdout":"localhost"]
-Execute	.target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password show dhcpd.service  --property=Id  --property=MainPID  --property=Description  --property=LoadState  --property=ActiveState  --property=SubState  --property=UnitFileState  --property=FragmentPath  --property=CanReload " $["exit":0, "stderr":"localhost", "stdout":"localhost"]
 Return	true
 Dump	==========================================================
diff --git a/testsuite/tests/YaPISetDeclarationOptions.out b/testsuite/tests/YaPISetDeclarationOptions.out
index 09cf401..dfd23c6 100644
--- a/testsuite/tests/YaPISetDeclarationOptions.out
+++ b/testsuite/tests/YaPISetDeclarationOptions.out
@@ -14,7 +14,5 @@ Write	.sysconfig.dhcpd.DHCPD_RUN_CHROOTED "no" true
 Write	.sysconfig.dhcpd.DHCPD_INTERFACE "eth0 eth2" true
 Write	.sysconfig.dhcpd.DHCPD_OTHER_ARGS "-p 111" true
 Write	.sysconfig.dhcpd nil true
-Execute	.target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password show dhcpd.service  --property=Id  --property=MainPID  --property=Description  --property=LoadState  --property=ActiveState  --property=SubState  --property=UnitFileState  --property=FragmentPath  --property=CanReload " $["exit":0, "stderr":"localhost", "stdout":"localhost"]
-Execute	.target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password show dhcpd.service  --property=Id  --property=MainPID  --property=Description  --property=LoadState  --property=ActiveState  --property=SubState  --property=UnitFileState  --property=FragmentPath  --property=CanReload " $["exit":0, "stderr":"localhost", "stdout":"localhost"]
 Return	true
 Dump	==========================================================
diff --git a/testsuite/tests/YaPISetDeclarationParent.out b/testsuite/tests/YaPISetDeclarationParent.out
index 6af1fb9..c6068ac 100644
--- a/testsuite/tests/YaPISetDeclarationParent.out
+++ b/testsuite/tests/YaPISetDeclarationParent.out
@@ -14,7 +14,5 @@ Write	.sysconfig.dhcpd.DHCPD_RUN_CHROOTED "no" true
 Write	.sysconfig.dhcpd.DHCPD_INTERFACE "eth0 eth2" true
 Write	.sysconfig.dhcpd.DHCPD_OTHER_ARGS "-p 111" true
 Write	.sysconfig.dhcpd nil true
-Execute	.target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password show dhcpd.service  --property=Id  --property=MainPID  --property=Description  --property=LoadState  --property=ActiveState  --property=SubState  --property=UnitFileState  --property=FragmentPath  --property=CanReload " $["exit":0, "stderr":"localhost", "stdout":"localhost"]
-Execute	.target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password show dhcpd.service  --property=Id  --property=MainPID  --property=Description  --property=LoadState  --property=ActiveState  --property=SubState  --property=UnitFileState  --property=FragmentPath  --property=CanReload " $["exit":0, "stderr":"localhost", "stdout":"localhost"]
 Return	true
 Dump	==========================================================