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.");
         }