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/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();