Index: trunk/test/tmcsim/cadsimulator/SystemTest.java
===================================================================
--- trunk/test/tmcsim/cadsimulator/SystemTest.java	(revision 653)
+++ trunk/test/tmcsim/cadsimulator/SystemTest.java	(revision 657)
@@ -62,5 +62,5 @@
         });
 
-        // Check CAD Simulator appears with no script and nothing connected
+        // Check CAD Server appears with no script and nothing connected
         assertTrue("Title bar incorrect", cadwindow.getTitle().trim().startsWith("CAD Server"));
         Panel mainPanel = cadwindow.getPanel("contentPane");
@@ -72,11 +72,6 @@
         assertEquals("network id should be None", "None", mainPanel.getTextBox("networkLoadedTF").getText().trim());
 
-        ParamicsCommunicator pc = null;
-        pc = new ParamicsCommunicator("config/paramics_communicator_config.properties");
-        ParamicsCommunicatorGUI theGUI = new ParamicsCommunicatorGUI();
-        pc.setGUI(theGUI);
+
         // Note: Can't set visible ANY windows during UISpec test
-
-        // expect pcomm to say "sleeping"
 
         Window simMgrWindow = null;
@@ -100,65 +95,4 @@
         TextBox txtSimStatus = contentPanel.getTextBox("simulationStatusText");
         assertEquals("No Script", txtSimStatus.getText());
-        TextBox txtParamStatus = contentPanel.getTextBox("paramicsStatusInfoLabel");
-        assertEquals("Unknown", txtParamStatus.getText());
-        Button loadNetworkBtn = simMgrWindow.getButton("Load Network");
-        assertFalse(loadNetworkBtn.isEnabled());
-
-        Button paramicsBtn = simMgrWindow.getButton("Connect to Paramics");
-        paramicsBtn.click();
-        try
-        {
-            Thread.sleep(200);
-        } catch (Exception ex)
-        {
-        }
-        assertEquals("Disconnect from Paramics", paramicsBtn.getLabel());
-
-        assertEquals("Connected", txtParamStatus.getText());
-        pc.startReading();
-
-        loadNetworkBtn.click();
-        try
-        {
-            Thread.sleep(200);
-        } catch (Exception ex)
-        {
-        }
-        assertEquals("Sending Network ID", txtParamStatus.getText());
-        System.out.println("Sending Network ID");
-        assertFalse(loadNetworkBtn.isEnabled());
-        String warmingXML = "<Paramics>\n"
-                + "<Network_Status>WARMING</Network_Status>\n"
-                + "<Network_ID>1</Network_ID>\n"
-                + "</Paramics>";
-        writedata("paramics_status.xml", warmingXML);
-        try
-        {
-            Thread.sleep(2100);
-        } catch (Exception ex)
-        {
-        }
-        assertEquals("Warming Up", txtParamStatus.getText());
-        System.out.println("Warming Up Passed");
-
-        try
-        {
-            Thread.sleep(2100);
-        } catch (Exception ex)
-        {
-        }
-        String loadedXML = "<Paramics>\n"
-                + "<Network_Status>LOADED</Network_Status>"
-                + "<Network_ID>1</Network_ID>"
-                + "</Paramics>";
-        writedata("paramics_status.xml", loadedXML);
-        try
-        {
-            Thread.sleep(2100);
-        } catch (Exception ex)
-        {
-        }
-        //assertEquals("Network 1 Loaded", txtParamStatus.getText());
-        //assertEquals("network id should be 1", "1", mainPanel.getTextBox("networkLoadedTF").getText().trim());