Index: /trunk/psLib/test/sysUtils/tst_psTrace00.c
===================================================================
--- /trunk/psLib/test/sysUtils/tst_psTrace00.c	(revision 554)
+++ /trunk/psLib/test/sysUtils/tst_psTrace00.c	(revision 555)
@@ -10,6 +10,5 @@
     int i = 0;
     int lev = 0;
-    int errorFlag = 0;
-
+    int errorFlag = true;
 
     printPositiveTestHeader(stderr,
@@ -22,5 +21,5 @@
             printf("ERROR: (.) expected trace level was %d, actual was %d\n",
                    i, lev);
-            errorFlag = 1;
+            errorFlag = false;
         }
     }
@@ -33,5 +32,5 @@
             printf("ERROR: (.NODE00) expected trace level was %d, actual was %d\n",
                    i, lev);
-            errorFlag = 1;
+            errorFlag = false;
         }
     }
@@ -44,16 +43,12 @@
             printf("ERROR: (.NODE00.NODE01) expected trace level was %d, actual was %d\n",
                    i, lev);
-            errorFlag = 1;
+            errorFlag = false;
         }
     }
 
-    if (errorFlag == 0) {
-        printf("All tests in %s ran successfully\n", __FILE__);
-    }
     printFooter(stderr,
                 "psTrace functions",
                 "Testing psSetTraceLevel and psGetTraceLevel",
-                true);
-
+                errorFlag);
     exit(0);
 }
Index: /trunk/psLib/test/sysUtils/tst_psTrace01.c
===================================================================
--- /trunk/psLib/test/sysUtils/tst_psTrace01.c	(revision 554)
+++ /trunk/psLib/test/sysUtils/tst_psTrace01.c	(revision 555)
@@ -10,7 +10,9 @@
     int i = 0;
     int lev = 0;
-    int errorFlag = 0;
+    int successFlag = true;
 
-    lev = psGetTraceLevel(".");
+    printPositiveTestHeader(stderr,
+                            "psTrace functions",
+                            "Testing psTraceReset()");
 
     for (i=0;i<10;i++) {
@@ -22,11 +24,24 @@
             printf("ERROR: expected trace level was %d, actual was %d\n",
                    i, lev);
-            errorFlag = 1;
+            successFlag = false;
         }
     }
+    psSetTraceLevel(".", 5);
+    psSetTraceLevel(".a", 4);
+    psSetTraceLevel(".a.b", 3);
+    psSetTraceLevel(".a.b.c", 2);
+    psTraceReset();
+    if ((UNKNOWN_TRACE_LEVEL != psGetTraceLevel(".")) ||
+            (UNKNOWN_TRACE_LEVEL != psGetTraceLevel(".a")) ||
+            (UNKNOWN_TRACE_LEVEL != psGetTraceLevel(".a.b")) ||
+            (UNKNOWN_TRACE_LEVEL != psGetTraceLevel(".a.b.c"))) {
+        printf("ERROR: trace levels were not reset properly\n");
+        successFlag = false;
+    }
 
-    if (errorFlag == 0) {
-        printf("All tests in %s ran successfully\n", __FILE__);
-    }
+    printFooter(stderr,
+                "psTrace functions",
+                "Testing psTraceReset()",
+                successFlag);
     exit(0);
 }
Index: /trunk/psLib/test/sysUtils/tst_psTrace02.c
===================================================================
--- /trunk/psLib/test/sysUtils/tst_psTrace02.c	(revision 554)
+++ /trunk/psLib/test/sysUtils/tst_psTrace02.c	(revision 555)
@@ -13,10 +13,24 @@
     int errorFlag = 0;
 
-    lev = psGetTraceLevel(".");
     psSetTraceLevel(".", 4);
-    psTrace(".", 5, "This message should not be displayed (%x)\n",
+    psTrace(".", 5, "(0) This message should not be displayed (%x)\n",
             0xbeefface);
     psSetTraceLevel(".", 7);
-    psTrace(".", 5, "This message should be displayed (%x)\n",
+    psTrace(".", 5, "(0) This message should be displayed (%x)\n",
+            0xbeefface);
+
+    psSetTraceLevel(".a", 4);
+    psTrace(".a", 5, "(1) This message should not be displayed (%x)\n",
+            0xbeefface);
+    psSetTraceLevel(".a", 7);
+    psTrace(".a", 5, "(1) This message should be displayed (%x)\n",
+            0xbeefface);
+
+
+    psSetTraceLevel(".a.b", 4);
+    psTrace(".a.b", 5, "(2) This message should not be displayed (%x)\n",
+            0xbeefface);
+    psSetTraceLevel(".a.b", 7);
+    psTrace(".a.b", 5, "(2) This message should be displayed (%x)\n",
             0xbeefface);