Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Calculation/CalculateValueParameterN.cs
===================================================================
diff -u -rb21347510f5ee7ec9b04973b8fa4b4bffaf4b731 -rdbfd6d5a71d7d491940d4ec5bf766f125da12229
--- System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Calculation/CalculateValueParameterN.cs	(.../CalculateValueParameterN.cs)	(revision b21347510f5ee7ec9b04973b8fa4b4bffaf4b731)
+++ System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Calculation/CalculateValueParameterN.cs	(.../CalculateValueParameterN.cs)	(revision dbfd6d5a71d7d491940d4ec5bf766f125da12229)
@@ -69,6 +69,16 @@
         }
 
         /// <summary>
+        /// Gets or sets the value of variable nameOfParameterInPropertiesPanel.
+        /// </summary>
+        [TestVariable("afe1ce8e-ff00-4307-a9d8-1f91fa796fad")]
+        public string nameOfParameterInPropertiesPanel
+        {
+            get { return repo.nameOfParameterInPropertiesPanel; }
+            set { repo.nameOfParameterInPropertiesPanel = value; }
+        }
+
+        /// <summary>
         /// Gets or sets the value of variable substringTrajectName.
         /// </summary>
         [TestVariable("77ae6c27-603e-4704-add9-e1249169f0e5")]
@@ -98,16 +108,6 @@
             set { repo.fmLabel = value; }
         }
 
-        /// <summary>
-        /// Gets or sets the value of variable nameOfParameterInPropertiesPanel.
-        /// </summary>
-        [TestVariable("afe1ce8e-ff00-4307-a9d8-1f91fa796fad")]
-        public string nameOfParameterInPropertiesPanel
-        {
-            get { return repo.nameOfParameterInPropertiesPanel; }
-            set { repo.nameOfParameterInPropertiesPanel = value; }
-        }
-
 #endregion
 
         /// <summary>
Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/IO/MigrateAllFilesInFolderUsingCommandLineTool.cs
===================================================================
diff -u -r8163726cf2097702f79a5e21a7ed4a4283f98a66 -rdbfd6d5a71d7d491940d4ec5bf766f125da12229
--- System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/IO/MigrateAllFilesInFolderUsingCommandLineTool.cs	(.../MigrateAllFilesInFolderUsingCommandLineTool.cs)	(revision 8163726cf2097702f79a5e21a7ed4a4283f98a66)
+++ System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/IO/MigrateAllFilesInFolderUsingCommandLineTool.cs	(.../MigrateAllFilesInFolderUsingCommandLineTool.cs)	(revision dbfd6d5a71d7d491940d4ec5bf766f125da12229)
@@ -77,17 +77,31 @@
                 string fileName = Path.GetFileName(sourceFilePath);
                 string destinationFilePath = Path.Combine(targetFolder, fileName);
                 
-                //string commandToRun = "..\\..\\..\\..\\..\\bin\\Debug\\Application\\Built-in\\Managed\\Core\\Migratiehulpprogramma.exe " + @sourceFilePath + " " + @destinationFilePath;
-                string commandToRun = "dir *.*";
+                //string commandToRun = "/C ..\\..\\..\\..\\..\\bin\\Debug\\Application\\Built-in\\Managed\\Core\\Migratiehulpprogramma.exe " + @sourceFilePath + " " + @destinationFilePath + " >borrame.log";
+                string commandToRun = "/C ..\\..\\..\\..\\..\\bin\\Debug\\Migratiehulpprogramma.exe " + @sourceFilePath + " " + @destinationFilePath + " >borrame.log";
+                //string commandToRun = "/C dir *.* >borrame.log";
                 
-                var psi = new ProcessStartInfo(commandToRun) {
-                    UseShellExecute = true,
-                    CreateNoWindow = false
-                        };
+                RunCommand(commandToRun);
+               //var psi = new ProcessStartInfo(commandToRun) {
+               //     UseShellExecute = true,
+               //     CreateNoWindow = false
+               //         };
                 //Process.Start(psi);
                 
-                System.Diagnostics.Process.Start("dir *.*");
+                //System.Diagnostics.Process.Start("dir *.*");
                 }
         }
+        
+        private void RunCommand(string arguments)
+        {
+            System.Diagnostics.Process process = new System.Diagnostics.Process();
+            System.Diagnostics.ProcessStartInfo startInfo = new System.Diagnostics.ProcessStartInfo();
+            //startInfo.WindowStyle = System.Diagnostics.ProcessWindowStyle.Normal; //.Hidden;
+            startInfo.FileName = "cmd.exe";
+            startInfo.Arguments = arguments;
+            process.StartInfo = startInfo;
+            process.Start();
+            process.WaitForExit();
+        }
     }
 }
Index: System tests/AutomatedSystemTests/AutomatedSystemTests/TestScript19.rxtst
===================================================================
diff -u -rb21347510f5ee7ec9b04973b8fa4b4bffaf4b731 -rdbfd6d5a71d7d491940d4ec5bf766f125da12229
--- System tests/AutomatedSystemTests/AutomatedSystemTests/TestScript19.rxtst	(.../TestScript19.rxtst)	(revision b21347510f5ee7ec9b04973b8fa4b4bffaf4b731)
+++ System tests/AutomatedSystemTests/AutomatedSystemTests/TestScript19.rxtst	(.../TestScript19.rxtst)	(revision dbfd6d5a71d7d491940d4ec5bf766f125da12229)
@@ -5397,5 +5397,11 @@
 		</testconfiguration>
 	</testconfigurations>
 	<references>
+		<reference>
+			Newtonsoft.Json.dll
+		</reference>
+		<reference>
+			Ranorex Automation Helpers.dll
+		</reference>
 	</references>
 </testsuitedoc>
Index: System tests/AutomatedSystemTests/AutomatedSystemTests/TestScript22.rxtst
===================================================================
diff -u -rb21347510f5ee7ec9b04973b8fa4b4bffaf4b731 -rdbfd6d5a71d7d491940d4ec5bf766f125da12229
--- System tests/AutomatedSystemTests/AutomatedSystemTests/TestScript22.rxtst	(.../TestScript22.rxtst)	(revision b21347510f5ee7ec9b04973b8fa4b4bffaf4b731)
+++ System tests/AutomatedSystemTests/AutomatedSystemTests/TestScript22.rxtst	(.../TestScript22.rxtst)	(revision dbfd6d5a71d7d491940d4ec5bf766f125da12229)
@@ -2360,5 +2360,11 @@
 		</testconfiguration>
 	</testconfigurations>
 	<references>
+		<reference>
+			Newtonsoft.Json.dll
+		</reference>
+		<reference>
+			Ranorex Automation Helpers.dll
+		</reference>
 	</references>
 </testsuitedoc>
Index: System tests/AutomatedSystemTests/AutomatedSystemTests/VerySlowTestCases.rxtst
===================================================================
diff -u -r97b5481c7f6c5fdc36574584ee825404adf46876 -rdbfd6d5a71d7d491940d4ec5bf766f125da12229
--- System tests/AutomatedSystemTests/AutomatedSystemTests/VerySlowTestCases.rxtst	(.../VerySlowTestCases.rxtst)	(revision 97b5481c7f6c5fdc36574584ee825404adf46876)
+++ System tests/AutomatedSystemTests/AutomatedSystemTests/VerySlowTestCases.rxtst	(.../VerySlowTestCases.rxtst)	(revision dbfd6d5a71d7d491940d4ec5bf766f125da12229)
@@ -3058,6 +3058,26 @@
 			id="7afa684a-e56c-40bf-a558-205a01981f48"
 			name="ValidateResultsArePresentPresentInDocumentView">
 			</smartfoldernode>
+			<testmodule
+			id="7b46487b-8340-4162-8283-7cb9b6adc135"
+			name="MigrateAllFilesInFolderUsingCommandLineTool"
+			ref="d8e46690-d19a-45ce-9514-4e8329f75c83"
+			type="UserCode">
+				<databinding>
+					<var
+					dataname="migrationSourceFolder"
+					datasourceid="e143dc8f-d1a1-49d8-b681-d0c99b13d652"
+					variableid="37a1147a-04d5-40e7-aea9-e65cdff17e35"
+					variablename="sourceFolder">
+					</var>
+					<var
+					dataname="migrationTargetFolder"
+					datasourceid="e143dc8f-d1a1-49d8-b681-d0c99b13d652"
+					variableid="f3b3e712-db1c-4e56-8986-c0607c00391a"
+					variablename="targetFolder">
+					</var>
+				</databinding>
+			</testmodule>
 			<smartfoldernode
 			id="7cae3723-56cc-46ba-9370-bcd530937e5e"
 			name="CloseView">
@@ -3982,7 +4002,7 @@
 				<parameters>
 					<param
 					name="fielNameToOpen"
-					value="X:\script15\External\Project_15a_15b_15c_zonder_resultaten.risk">
+					value="X:\script15\input\Project_15a_15b_15c_zonder_resultaten.risk">
 					</param>
 				</parameters>
 			</smartfoldernode>
@@ -5378,6 +5398,14 @@
 					name="scriptOutputFolder"
 					value="">
 					</param>
+					<param
+					name="migrationSourceFolder"
+					value="X:\script15\previous">
+					</param>
+					<param
+					name="migrationTargetFolder"
+					value="X:\script15\input">
+					</param>
 				</parameters>
 			</testcase>
 			<testmodule
@@ -6133,6 +6161,10 @@
 							id="f9fa10a4-99b8-4076-b4f8-2c0e0940be6d"
 							name="CreateOutputFolder">
 							</testmodule>
+							<testmodule
+							id="7b46487b-8340-4162-8283-7cb9b6adc135"
+							name="MigrateAllFilesInFolderUsingCommandLineTool">
+							</testmodule>
 						</setup>
 						<smartfoldernode
 						id="a5961606-7985-4233-b8a3-cc10e3329eef"
@@ -15479,9 +15511,6 @@
 			id="32a9abb3-6d3e-48db-bead-8095281ea75c">
 			</testcontainer>
 			<testcontainer
-			id="37d99e11-0635-4c04-bec0-191fa870e60d">
-			</testcontainer>
-			<testcontainer
 			id="384a4933-2908-4423-9d4a-912d2fac3951">
 			</testcontainer>
 			<testcontainer
@@ -15767,9 +15796,6 @@
 			id="bfd4a3f7-8b3f-48c9-b761-bcbcc2fb23fe">
 			</testcontainer>
 			<testcontainer
-			id="c25bc42c-e8a4-4af0-bccd-5621c9fffb0f">
-			</testcontainer>
-			<testcontainer
 			id="c50ee907-ba85-4bed-9a8f-8b71cb88fb74">
 			</testcontainer>
 			<testcontainer