Index: /trunk/test/tmcsim/cadsimulator/CADSimulatorConsoleDriver.java
===================================================================
--- /trunk/test/tmcsim/cadsimulator/CADSimulatorConsoleDriver.java	(revision 455)
+++ /trunk/test/tmcsim/cadsimulator/CADSimulatorConsoleDriver.java	(revision 558)
@@ -13,4 +13,5 @@
 import tmcsim.interfaces.CADClientInterface;
 import tmcsim.interfaces.SimulationManagerInterface;
+import static tmcsim.simulationmanager.SimulationManager.kScenarioFolder;
 
 /**
@@ -86,5 +87,5 @@
 
         // Load a script file
-        String autoloadScriptname = "scripts/one-incident.xml";
+        String autoloadScriptname = kScenarioFolder+"/one-incident.xml";
         app.theCoordinator.loadScriptFile(new File(autoloadScriptname));
         // The status should now say Ready
Index: /trunk/test/tmcsim/cadsimulator/SystemConsoleTest.java
===================================================================
--- /trunk/test/tmcsim/cadsimulator/SystemConsoleTest.java	(revision 422)
+++ /trunk/test/tmcsim/cadsimulator/SystemConsoleTest.java	(revision 558)
@@ -19,4 +19,5 @@
 import tmcsim.paramicscommunicator.gui.ParamicsCommunicatorGUI;
 import tmcsim.simulationmanager.SimulationManager;
+import static tmcsim.simulationmanager.SimulationManager.kScenarioFolder;
 
 /**
@@ -149,5 +150,5 @@
 
         // Load a script file
-        String autoloadScriptname = "scripts/audio_systest.xml";
+        String autoloadScriptname = kScenarioFolder+"/audio_systest.xml";
         simMgrApp.loadScript(new File(autoloadScriptname));
         try
Index: /trunk/test/tmcsim/cadsimulator/CADSimulatorConsoleTest.java
===================================================================
--- /trunk/test/tmcsim/cadsimulator/CADSimulatorConsoleTest.java	(revision 455)
+++ /trunk/test/tmcsim/cadsimulator/CADSimulatorConsoleTest.java	(revision 558)
@@ -16,4 +16,5 @@
 import tmcsim.interfaces.CADClientInterface;
 import tmcsim.interfaces.SimulationManagerInterface;
+import static tmcsim.simulationmanager.SimulationManager.kScenarioFolder;
 
 /**
@@ -237,5 +238,5 @@
         System.out.println("Sim status");
         // Load a script file - to put status at Ready
-        String autoloadScriptname = "scripts/one-incident.xml";
+        String autoloadScriptname = kScenarioFolder+"/one-incident.xml";
         app.theCoordinator.loadScriptFile(new File(autoloadScriptname));
         pause(500);
@@ -319,6 +320,6 @@
     {
         new File("scripts").mkdir();
-        writedata("scripts/Cardfile.xml", cardfileData);
-        writedata("scripts/one-incident.xml", oneincidentXML);
+        writedata(kScenarioFolder+"/Cardfile.xml", cardfileData);
+        writedata(kScenarioFolder+"/one-incident.xml", oneincidentXML);
     }
 
Index: /trunk/test/tmcsim/cadsimulator/CADSimulatorGUITest.java
===================================================================
--- /trunk/test/tmcsim/cadsimulator/CADSimulatorGUITest.java	(revision 422)
+++ /trunk/test/tmcsim/cadsimulator/CADSimulatorGUITest.java	(revision 558)
@@ -16,4 +16,5 @@
 import tmcsim.interfaces.CADClientInterface;
 import tmcsim.interfaces.SimulationManagerInterface;
+import static tmcsim.simulationmanager.SimulationManager.kScenarioFolder;
 
 /**
@@ -139,5 +140,5 @@
 
         // Load a script file
-        String autoloadScriptname = "scripts/one-incident.xml";
+        String autoloadScriptname = kScenarioFolder+"/one-incident.xml";
         app.theCoordinator.loadScriptFile(new File(autoloadScriptname));
         // The status should now say Ready
Index: /trunk/test/tmcsim/cadsimulator/CADSimulatorFixture.java
===================================================================
--- /trunk/test/tmcsim/cadsimulator/CADSimulatorFixture.java	(revision 123)
+++ /trunk/test/tmcsim/cadsimulator/CADSimulatorFixture.java	(revision 558)
@@ -13,4 +13,5 @@
 import java.util.logging.Logger;
 import static tmcsim.cadsimulator.CADSimulatorFixture.bos;
+import static tmcsim.simulationmanager.SimulationManager.kScenarioFolder;
 
 /**
@@ -67,6 +68,6 @@
     public static void writeScriptfiles()
     {
-        writeFileFromURL("scripts/Cardfile.xml", cardfileURL);
-        writeFileFromURL("scripts/one-incident.xml", smallXMLURL);
+        writeFileFromURL(kScenarioFolder+"/Cardfile.xml", cardfileURL);
+        writeFileFromURL(kScenarioFolder+"/one-incident.xml", smallXMLURL);
     }
 
Index: /trunk/test/tmcsim/cadsimulator/VisibleSystemDemoDriver.java
===================================================================
--- /trunk/test/tmcsim/cadsimulator/VisibleSystemDemoDriver.java	(revision 422)
+++ /trunk/test/tmcsim/cadsimulator/VisibleSystemDemoDriver.java	(revision 558)
@@ -14,4 +14,5 @@
 import tmcsim.paramicscommunicator.gui.ParamicsCommunicatorGUI;
 import tmcsim.simulationmanager.SimulationManager;
+import static tmcsim.simulationmanager.SimulationManager.kScenarioFolder;
 
 /**
@@ -137,5 +138,5 @@
 
         // Load a script file
-        String autoloadScriptname = "scripts/audio_systest.xml";
+        String autoloadScriptname = kScenarioFolder+"/audio_systest.xml";
         simMgrApp.loadScript(new File(autoloadScriptname));
         try
Index: /trunk/test/tmcsim/cadsimulator/SystemTest.java
===================================================================
--- /trunk/test/tmcsim/cadsimulator/SystemTest.java	(revision 422)
+++ /trunk/test/tmcsim/cadsimulator/SystemTest.java	(revision 558)
@@ -15,4 +15,5 @@
 import tmcsim.paramicscommunicator.gui.ParamicsCommunicatorGUI;
 import tmcsim.simulationmanager.SimulationManager;
+import static tmcsim.simulationmanager.SimulationManager.kScenarioFolder;
 
 /**
@@ -163,5 +164,5 @@
 
         // Load a script file
-        String autoloadScriptname = "scripts/system_test_script.xml";
+        String autoloadScriptname = kScenarioFolder+"/system_test_script.xml";
         simMgrApp.loadScript(new File(autoloadScriptname));
         try
Index: /trunk/test/tmcsim/simulationmanager/SimulationManagerSmokeTest.java
===================================================================
--- /trunk/test/tmcsim/simulationmanager/SimulationManagerSmokeTest.java	(revision 228)
+++ /trunk/test/tmcsim/simulationmanager/SimulationManagerSmokeTest.java	(revision 558)
@@ -17,4 +17,5 @@
 import tmcsim.common.ScriptException;
 import tmcsim.common.SimulationException;
+import static tmcsim.simulationmanager.SimulationManager.kScenarioFolder;
 
 /**
@@ -109,5 +110,5 @@
 
         // Load a script file
-        String autoloadScriptname = "scripts/practice_script_2016.xml";
+        String autoloadScriptname = kScenarioFolder+"/practice_script_2016.xml";
         SimulationManagerModel simMgrModel = simMgrApp.theSimManagerModel;
         simMgrModel.loadScript(new File(autoloadScriptname));