Index: trunk/test/tmcsim/simulationmanager/SimulationManagerSmokeTest.java
===================================================================
--- trunk/test/tmcsim/simulationmanager/SimulationManagerSmokeTest.java	(revision 34)
+++ trunk/test/tmcsim/simulationmanager/SimulationManagerSmokeTest.java	(revision 43)
@@ -1,8 +1,16 @@
 package tmcsim.simulationmanager;
 
+import java.awt.Component;
 import java.io.File;
+import javax.swing.JButton;
 import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertTrue;
 import static junit.framework.Assert.fail;
-import org.uispec4j.*;
+import org.uispec4j.Panel;
+import org.uispec4j.TextBox;
+import org.uispec4j.Trigger;
+import org.uispec4j.UISpecTestCase;
+import org.uispec4j.Window;
 import org.uispec4j.interception.WindowInterceptor;
 import tmcsim.cadsimulator.CADSimulator;
@@ -35,6 +43,6 @@
 
         Window cadwindow = null;
-        System.setProperty("CONFIG_DIR", "config/testConfig");
-        if (System.getProperty("CONFIG_DIR") != null)
+        System.setProperty("CAD_SIM_PROPERTIES", "config/cad_simulator_smoketest_config.properties");
+        if (System.getProperty("CAD_SIM_PROPERTIES") != null)
         {
             cadwindow = WindowInterceptor.run(new Trigger()
@@ -44,6 +52,5 @@
                     try
                     {
-                        engine = new CADSimulator(System.getProperty("CONFIG_DIR") + System.getProperty("file.separator") + "cad_simulator_config.properties");
-
+                        engine = new CADSimulator(System.getProperty("CAD_SIM_PROPERTIES"));
                     } catch (Exception e)
                     {
@@ -52,11 +59,12 @@
                 }
             });
-        } else
+        }
+        else
         {
-            fail("CONFIG_DIR system property not defined.");
+            fail("CAD_SIM_PROPERTIES system property not defined.");
         }
 
         // Check CAD Simulator appears with no script and nothing connected
-        assertEquals("CAD Simulator", cadwindow.getTitle());
+        assertTrue("Window title incorrect", cadwindow.getTitle().startsWith("CAD Simulator"));
         Panel mainPanel = cadwindow.getPanel("contentPane");
         TextBox txtStatus = mainPanel.getTextBox("simulationStatus");
@@ -67,6 +75,6 @@
 
         Window simMgrWindow = null;
-        System.setProperty("CONFIG_DIR", "config/testConfig");
-        if (System.getProperty("CONFIG_DIR") != null)
+        System.setProperty("SIM_MGR_PROPERTIES", "config/sim_manager_smoketest_config.properties");
+        if (System.getProperty("SIM_MGR_PROPERTIES") != null)
         {
             simMgrWindow = WindowInterceptor.run(new Trigger()
@@ -76,6 +84,5 @@
                     try
                     {
-                        //simMgrApp = new SimulationManager(System.getProperty("SIM_MGR_PROPERTIES"));
-                        simMgrApp = new SimulationManager(System.getProperty("CONFIG_DIR") + System.getProperty("file.separator") + "sim_manager_config.properties");
+                        simMgrApp = new SimulationManager(System.getProperty("SIM_MGR_PROPERTIES"));
                     } catch (Exception ex)
                     {
@@ -84,7 +91,8 @@
                 }
             });
-        } else
+        }
+        else
         {
-            fail("CONFIG_DIR system property not defined.");
+            fail("SIM_MGR_PROPERTIES system property not defined.");
         }
 
@@ -117,7 +125,19 @@
         assertEquals("Running", txtSimStatus.getText());
 
+        //List all available buttons
+        Component[] buttons = win.getSwingComponents(JButton.class);
+        for (Component comp : buttons)
+        {
+            System.out.println(comp);
+        }
+        win.getButton("Load Script");
+        win.getButton("Pause");
+        win.getButton("Disconnect from Paramics");
+        win.getButton("Reset");
+        win.getButton("Load Network");
         // Quit
         engine = null;
-        simMgrApp = null;
+        win.getMenuBar().getMenu("File").getSubMenu("Exit").click();
+        //simMgrApp = null;
     }
 }