Index: trunk/test/tmcsim/simulationmanager/SimulationManagerSmokeTest.java
===================================================================
--- trunk/test/tmcsim/simulationmanager/SimulationManagerSmokeTest.java	(revision 123)
+++ trunk/test/tmcsim/simulationmanager/SimulationManagerSmokeTest.java	(revision 228)
@@ -67,5 +67,5 @@
 
         // Check CAD Simulator appears with no script and nothing connected
-        assertTrue("Window title incorrect", cadwindow.getTitle().startsWith("CAD Simulator"));
+        assertTrue("Window title incorrect", cadwindow.getTitle().startsWith("CAD Server"));
         Panel mainPanel = cadwindow.getPanel("contentPane");
         TextBox txtStatus = mainPanel.getTextBox("simulationStatus");
Index: trunk/test/tmcsim/cadsimulator/CADSimulatorGUITest.java
===================================================================
--- trunk/test/tmcsim/cadsimulator/CADSimulatorGUITest.java	(revision 123)
+++ trunk/test/tmcsim/cadsimulator/CADSimulatorGUITest.java	(revision 228)
@@ -94,5 +94,5 @@
         // Create a UISpec window from the CADSimulator's Viewer (gui)
 //        cadwindow = new Window((CADSimulatorViewer) app.theViewer);
-        assertTrue("Title bar incorrect", cadwindow.getTitle().startsWith("CAD Simulator revision:"));
+        assertTrue("Title bar incorrect", cadwindow.getTitle().startsWith("CAD Server revision:"));
         Panel mainPanel = cadwindow.getPanel("contentPane");
         TextBox txtStatus = mainPanel.getTextBox("simulationStatus");
Index: trunk/test/tmcsim/cadsimulator/viewer/CADSimulatorViewModelTest.java
===================================================================
--- trunk/test/tmcsim/cadsimulator/viewer/CADSimulatorViewModelTest.java	(revision 124)
+++ trunk/test/tmcsim/cadsimulator/viewer/CADSimulatorViewModelTest.java	(revision 228)
@@ -40,5 +40,5 @@
     {
         String actual;
-        assertTrue("Title bar incorrect", cadwindow.getTitle().trim().startsWith("CAD Simulator"));
+        assertTrue("Title bar incorrect", cadwindow.getTitle().trim().startsWith("CAD Server"));
         TextBox txtStatus = mainPanel.getTextBox("simulationStatus");
         actual = txtStatus.getText().trim();
Index: trunk/test/tmcsim/cadsimulator/CADSimulatorConsoleTest.java
===================================================================
--- trunk/test/tmcsim/cadsimulator/CADSimulatorConsoleTest.java	(revision 123)
+++ trunk/test/tmcsim/cadsimulator/CADSimulatorConsoleTest.java	(revision 228)
@@ -271,5 +271,10 @@
             + "ParamicsProperties     = pconfig.txt\n"
             + "ATMSProperties         = empty.txt\n"
+            + "TrafficMgrProperties   = tconfig.txt\n"
             + "MediaProperties        = empty.txt\n";
+    static final String trafficMgrData = "Highways_Map_File = config/vds_data/highways_fullmap.txt\n"
+            +"Events_File = config/vds_data/atmsBatchEvents.txt\n"
+            +"FEPSim_IP_addr = localhost\n"
+            +"Output_Destination = Console\n";
     static final String paramicsData = "ParamicsCommHost = 127.0.0.1\n"
             + "ParamicsCommPort       = 4450\n"
@@ -295,5 +300,8 @@
         // Redirect the standard output
 //        System.setOut(ps);
+        File cf = new File ("config.txt");
+        cf.delete();
         writedata("config.txt", configData);
+        writedata("tconfig.txt", trafficMgrData);
         writedata("pconfig.txt", paramicsData);
         writedata("empty.txt", "");
Index: trunk/test/atmsdriver/model/HighwaysTest.java
===================================================================
--- trunk/test/atmsdriver/model/HighwaysTest.java	(revision 213)
+++ trunk/test/atmsdriver/model/HighwaysTest.java	(revision 228)
@@ -86,18 +86,13 @@
         String result = highways.toString();
         System.out.println(result);
-        assertEquals(expToString, result);
-    }
-    String expToString = 
-        "241 ------------------------------------------------------------\n"
-       +"  5 @-------------------------------------------------------------------------------------------------------------------------------------------\n"
-       +"405 --------------------------------------------------------------------------------\n"
-       +"133 ----------------\n"
-       +"261 -----------------\n"
-       +" 22 ----------------------------------\n"
-       +" 55 ------------------------------------------\n"
-       +" 73 -----------------------------------------------------\n"
-       +" 57 ------------------------------------------\n"
-       +" 91 --------------------------------------------------------------\n"
-       +"605 ---\n";
+        assertTrue(result.startsWith(expToString1));
+    }
+    String expToString1 = 
+    "241 N -- ------ -- ------- -------------------------------------  \n" +
+"241 S   - --- --  --------- ------------------------------------  \n" +
+"  5 N  - - ------ ---  --- -- --- ----  - -- - -  -- - - -    -- -- - ---- -- -- --- - - -- -  ----- ----- --- -  - -- --  - - ---- - - - ------- \n" +
+"  5 S @--";
+
+   
 
     
Index: trunk/test/atmsdriver/model/LoadSadDotsTest.java
===================================================================
--- trunk/test/atmsdriver/model/LoadSadDotsTest.java	(revision 212)
+++ 	(revision )
@@ -1,75 +1,0 @@
-package atmsdriver.model;
-
-import java.io.FileWriter;
-import java.io.PrintWriter;
-import java.nio.file.FileSystems;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.List;
-import junit.framework.TestCase;
-
-/**
- *
- * @author jdalbey
- */
-public class LoadSadDotsTest extends TestCase {
-
-    public LoadSadDotsTest(String testName) {
-        super(testName);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        PrintWriter writer = null;
-        try {
-            writer = new PrintWriter(new FileWriter("test/atmsdriver/model/lds_loadhighways_sample.txt"));
-            
-            writer.println("lds_id	line 	drop sch lineinfo	system_key	sch_seq glo_seq		count	freeway	Dir	ca_pm	lds_name");
-            writer.println("1205146	50	3	13	13	1123005873	24148	1357650		19	5	N	29.79	NEWPORT");
-            writer.println("1201190	46	6	36	36	1123006209	26472	1357644		20	405	S	4.03	JEFFREY 2");
-            writer.close();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
-        Path path = FileSystems.getDefault().getPath("test/atmsdriver/model", "lds_loadhighways_sample.txt");
-        Files.delete(path);
-    }
-
-    /**
-     * Test of toXML method, of class Network.
-     */
-    public void testLoadHighways() {
-        System.out.println("toXML");
-        Highways highways = new Highways(
-                "test/atmsdriver/model/lds_loadhighways_sample.txt",
-                "localhost", 8080);
-        
-         // Test for correct number of highways
-        List<Highway> result = (ArrayList) highways.highways;
-        assertEquals(2, result.size());
-        
-        // Test 5 N was loaded
-        Highway fiftyfiveN = result.get(0);
-        assertEquals(new Integer(5), fiftyfiveN.routeNumber);
-        
-        List<Station> stations = (ArrayList) fiftyfiveN.stations;
-        Station sad = stations.get(0);
-        System.out.println(""+sad.toCondensedFormat(true));
-        assertEquals(22, sad.loops.size());
-
-        // Test 405 S was loaded
-        Highway fourohfiveS = result.get(1);
-        assertEquals(new Integer(405), fourohfiveS.routeNumber);
-        stations = fourohfiveS.stations;
-        Station happy = stations.get(0);
-        System.out.println(""+happy.toCondensedFormat(true));
-        assertEquals(9, happy.loops.size());
-    }
-}