Index: trunk/test/tmcsim/cadsimulator/viewer/CADSimulatorViewModelTest.java
===================================================================
--- trunk/test/tmcsim/cadsimulator/viewer/CADSimulatorViewModelTest.java	(revision 228)
+++ trunk/test/tmcsim/cadsimulator/viewer/CADSimulatorViewModelTest.java	(revision 455)
@@ -30,5 +30,5 @@
     {
         super.setUp();
-        viewer = new CADServerViewer();
+        viewer = new CADServerViewer("config/cad_simulator_config.properties");
         cadwindow = new Window(viewer);
         model = new CADSimulatorState();
Index: trunk/test/tmcsim/cadsimulator/viewer/CADConsoleViewerTest.java
===================================================================
--- trunk/test/tmcsim/cadsimulator/viewer/CADConsoleViewerTest.java	(revision 123)
+++ trunk/test/tmcsim/cadsimulator/viewer/CADConsoleViewerTest.java	(revision 455)
@@ -28,5 +28,5 @@
     {
         super.setUp();
-        console = new CADConsoleViewer();
+        console = new CADConsoleViewer("config/cad_simulator_config.properties");
         cadmodel = new CADSimulatorState();
         cadmodel.addObserver(console);
@@ -175,7 +175,7 @@
                 + "-- Info Messages --\n\n"
                 + "-- Error Messages --\n"
-                + "Someclass.Somemethod = Something bad happened.\n";
+                + "Someclass.Somemethod = Sample error message.\n";
         Logger cadSimLogger = Logger.getLogger("tmcsim.cadsimulator");
-        cadSimLogger.logp(Level.SEVERE, "Someclass", "Somemethod", "Something bad happened.");
+        cadSimLogger.logp(Level.SEVERE, "Someclass", "Somemethod", "Sample error message.");
         verify("Error message output incorrect: ", expected7);
     }
Index: trunk/test/tmcsim/cadsimulator/CADSimulatorConsoleDriver.java
===================================================================
--- trunk/test/tmcsim/cadsimulator/CADSimulatorConsoleDriver.java	(revision 123)
+++ trunk/test/tmcsim/cadsimulator/CADSimulatorConsoleDriver.java	(revision 455)
@@ -83,5 +83,5 @@
         CADSimulatorFixture.pause(500);
 
-        cadSimLogger.logp(Level.SEVERE, "Someclass", "Somemethod", "Something bad happened.");
+        cadSimLogger.logp(Level.SEVERE, "Someclass", "Somemethod", "Sample error message.");
 
         // Load a script file
Index: trunk/test/tmcsim/cadsimulator/CADSimulatorConsoleTest.java
===================================================================
--- trunk/test/tmcsim/cadsimulator/CADSimulatorConsoleTest.java	(revision 449)
+++ trunk/test/tmcsim/cadsimulator/CADSimulatorConsoleTest.java	(revision 455)
@@ -189,8 +189,8 @@
                 + ". = Console Info Message.\n"
                 + "-- Error Messages --\n"
-                + "Someclass.Somemethod = Something bad happened.\n";
+                + "Someclass.Somemethod = Sample error message.\n";
         System.out.println("Error msg");
         cadSimLogger = Logger.getLogger("tmcsim.cadsimulator");
-        cadSimLogger.logp(Level.SEVERE, "Someclass", "Somemethod", "Something bad happened.");
+        cadSimLogger.logp(Level.SEVERE, "Someclass", "Somemethod", "Sample error message.");
         verify("Error message output incorrect: ", expected7);
         String expected6 =
@@ -205,5 +205,5 @@
                 + ". = Console Info Message.\n"
                 + "-- Error Messages --\n"
-                + "Someclass.Somemethod = Something bad happened.\n";
+                + "Someclass.Somemethod = Sample error message.\n";
         System.out.println("Paramics connect");
         app.theCoordinator.setParamicsStatus(CADEnums.PARAMICS_STATUS.CONNECTED);
@@ -222,5 +222,5 @@
                 + ". = Console Info Message.\n"
                 + "-- Error Messages --\n"
-                + "Someclass.Somemethod = Something bad happened.\n";
+                + "Someclass.Somemethod = Sample error message.\n";
         String expected9 =
                 "--- CAD Simulator ---\n"
@@ -234,5 +234,5 @@
                 + ". = Console Info Message.\n"
                 + "-- Error Messages --\n"
-                + "Someclass.Somemethod = Something bad happened.\n";
+                + "Someclass.Somemethod = Sample error message.\n";
         System.out.println("Sim status");
         // Load a script file - to put status at Ready