diff --git a/RunTest.cmd b/RunTest.cmd
new file mode 100644
index 0000000..73d73d6
--- /dev/null
+++ b/RunTest.cmd
@@ -0,0 +1,14 @@
+echo off
+
+echo ####### RunTest.cmd #######
+
+mkdir %WINDIR%\Setup 1>nul 2>nul
+mkdir %WINDIR%\Setup\Scripts 1>nul 2>nul
+
+copy SetupComplete.cmd %WINDIR%\Setup\Scripts
+copy SetupComplete.ftp %WINDIR%\Setup\Scripts
+
+echo ####### RunTest.cmd #######
+
+call %WINDIR%\Setup\Scripts\SetupComplete.cmd
+
diff --git a/autounattend.cmd b/SetupComplete.cmd
similarity index 74%
rename from autounattend.cmd
rename to SetupComplete.cmd
index 029179c..e80a209 100644
--- a/autounattend.cmd
+++ b/SetupComplete.cmd
@@ -3,7 +3,7 @@ set T="c:\TEMP"
 set TOOLS="c:\tools"
 set SCRIPTS="c:\scripts"
 
-echo ####### autounattend.cmd #######
+echo ####### SetupComplete.cmd #######
 
 echo killing some processes...
 taskkill /F /IM ssh-agent.exe
@@ -25,9 +25,10 @@ mkdir %SCRIPTS%\desktop 1>nul 2>nul
 mkdir %SCRIPTS%\tweaks 1>nul 2>nul
 
 echo getting TOOLS from webserver ...
-ftp -i -s:autounattend.ftp
+ftp -i -s:%WINDIR%\Setup\Scripts\SetupComplete.ftp
+del %WINDIR%\Setup\Scripts\SetupComplete.ftp
 
-echo ####### autounattend.cmd #######
+echo ####### SetupComplete.cmd #######
 
 echo STARTING setup script...
 call %SCRIPTS%\1st-setup.cmd
diff --git a/autounattend.ftp b/SetupComplete.ftp
similarity index 100%
rename from autounattend.ftp
rename to SetupComplete.ftp
diff --git a/autounattend.xml b/autounattend.xml
index 16691b8..0d04679 100644
--- a/autounattend.xml
+++ b/autounattend.xml
@@ -133,11 +133,6 @@
                 <LogonCount>1</LogonCount>
                 <Username>support</Username>
             </AutoLogon>
-            <FirstLogonCommands>
-                <SynchronousCommand wcm:action="add">
-                    <Order>1</Order>
-                </SynchronousCommand>
-            </FirstLogonCommands>
         </component>
     </settings>
     <cpi:offlineImage cpi:source="wim:c:/temp/win10/sources/install.wim#Windows 10 Pro N" xmlns:cpi="urn:schemas-microsoft-com:cpi" />