Index: trunk/test/tmcsim/cadsimulator/CADSimulatorTest.java
===================================================================
--- trunk/test/tmcsim/cadsimulator/CADSimulatorTest.java	(revision 5)
+++ trunk/test/tmcsim/cadsimulator/CADSimulatorTest.java	(revision 34)
@@ -59,7 +59,7 @@
     {
         System.out.println("CADSimulator constructor");
-        System.setProperty("CAD_SIM_PROPERTIES", "config/cad_simulator_config.properties");
+        System.setProperty("CONFIG_DIR", "config/testConfig");
         Window cadwindow = null;
-        if (System.getProperty("CAD_SIM_PROPERTIES") != null)
+        if (System.getProperty("CONFIG_DIR") != null)
         {
             cadwindow = WindowInterceptor.run(new Trigger()
@@ -69,5 +69,5 @@
                     try
                     {
-                        app = new CADSimulator(System.getProperty("CAD_SIM_PROPERTIES"));
+                        app = new CADSimulator(System.getProperty("CONFIG_DIR") + System.getProperty("file.separator") + "cad_simulator_config.properties");
                     }
                     catch (Exception e)
@@ -80,5 +80,5 @@
         else
         {
-            fail("CAD_SIM_PROPERTIES system property not defined.");
+            fail("CONFIG_DIR system property not defined.");
         }
         assertEquals("CAD Simulator", cadwindow.getTitle());
Index: trunk/test/tmcsim/cadsimulator/CADSimulatorGUITest.java
===================================================================
--- trunk/test/tmcsim/cadsimulator/CADSimulatorGUITest.java	(revision 19)
+++ trunk/test/tmcsim/cadsimulator/CADSimulatorGUITest.java	(revision 34)
@@ -5,4 +5,5 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
+
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.fail;
@@ -81,7 +82,7 @@
         CADSimulatorFixture.writedata("config.txt", configData);
         System.out.println("CADSimulator constructor");
-        System.setProperty("CAD_SIM_PROPERTIES", "config.txt");
+        System.setProperty("CONFIG_DIR", "config/testConfig");
         Window cadwindow = null;
-        if (System.getProperty("CAD_SIM_PROPERTIES") != null)
+        if (System.getProperty("CONFIG_DIR") != null)
         {
             cadwindow = WindowInterceptor.run(new Trigger()
@@ -91,5 +92,6 @@
                     try
                     {
-                        app = new CADSimulator(System.getProperty("CAD_SIM_PROPERTIES"));
+                        app = new CADSimulator(System.getProperty("CONFIG_DIR") + System.getProperty("file.separator") + "cad_simulator_config.properties");
+
                     } catch (Exception e)
                     {
@@ -100,5 +102,5 @@
         } else
         {
-            fail("CAD_SIM_PROPERTIES system property not defined.");
+            fail("CONFIG_DIR system property not defined.");
         }
         assertEquals("CAD Simulator", cadwindow.getTitle());
Index: trunk/test/tmcsim/simulationmanager/SimulationManagerSmokeTest.java
===================================================================
--- trunk/test/tmcsim/simulationmanager/SimulationManagerSmokeTest.java	(revision 13)
+++ trunk/test/tmcsim/simulationmanager/SimulationManagerSmokeTest.java	(revision 34)
@@ -35,6 +35,6 @@
 
         Window cadwindow = null;
-        System.setProperty("CAD_SIM_PROPERTIES", "config/cad_simulator_smoketest_config.properties");
-        if (System.getProperty("CAD_SIM_PROPERTIES") != null)
+        System.setProperty("CONFIG_DIR", "config/testConfig");
+        if (System.getProperty("CONFIG_DIR") != null)
         {
             cadwindow = WindowInterceptor.run(new Trigger()
@@ -44,5 +44,6 @@
                     try
                     {
-                        engine = new CADSimulator(System.getProperty("CAD_SIM_PROPERTIES"));
+                        engine = new CADSimulator(System.getProperty("CONFIG_DIR") + System.getProperty("file.separator") + "cad_simulator_config.properties");
+
                     } catch (Exception e)
                     {
@@ -53,5 +54,5 @@
         } else
         {
-            fail("CAD_SIM_PROPERTIES system property not defined.");
+            fail("CONFIG_DIR system property not defined.");
         }
 
@@ -66,6 +67,6 @@
 
         Window simMgrWindow = null;
-        System.setProperty("SIM_MGR_PROPERTIES", "config/sim_manager_smoketest_config.properties");
-        if (System.getProperty("SIM_MGR_PROPERTIES") != null)
+        System.setProperty("CONFIG_DIR", "config/testConfig");
+        if (System.getProperty("CONFIG_DIR") != null)
         {
             simMgrWindow = WindowInterceptor.run(new Trigger()
@@ -75,5 +76,6 @@
                     try
                     {
-                        simMgrApp = new SimulationManager(System.getProperty("SIM_MGR_PROPERTIES"));
+                        //simMgrApp = new SimulationManager(System.getProperty("SIM_MGR_PROPERTIES"));
+                        simMgrApp = new SimulationManager(System.getProperty("CONFIG_DIR") + System.getProperty("file.separator") + "sim_manager_config.properties");
                     } catch (Exception ex)
                     {
@@ -84,5 +86,5 @@
         } else
         {
-            fail("SIM_MGR_PROPERTIES system property not defined.");
+            fail("CONFIG_DIR system property not defined.");
         }