Index: /trunk/psLib/test/db/tap_psDB.c
===================================================================
--- /trunk/psLib/test/db/tap_psDB.c	(revision 12093)
+++ /trunk/psLib/test/db/tap_psDB.c	(revision 12094)
@@ -5,6 +5,6 @@
  *  @author Aaron Culliney, MHPCC
  *
- *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-01-24 01:24:38 $
+ *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-27 23:56:12 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -57,5 +57,5 @@
 int main(int argc, char* argv[])
 {
-    plan_tests(1);
+    plan_tests(2);
 
     // Initialize database connection with test database
Index: /trunk/psLib/test/imageops/Makefile.am
===================================================================
--- /trunk/psLib/test/imageops/Makefile.am	(revision 12093)
+++ /trunk/psLib/test/imageops/Makefile.am	(revision 12094)
@@ -24,7 +24,4 @@
 	tap_psImagePixelExtract
 
-noinst_PROGRAMS = \
-	convolutionBench
-
 if BUILD_TESTS
 bin_PROGRAMS = $(TEST_PROGS)
Index: /trunk/psLib/test/imageops/tap_psImageConvolve.c
===================================================================
--- /trunk/psLib/test/imageops/tap_psImageConvolve.c	(revision 12093)
+++ /trunk/psLib/test/imageops/tap_psImageConvolve.c	(revision 12094)
@@ -5,6 +5,10 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-02-07 22:30:14 $
+ *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-27 23:56:12 $
+ *
+ *  XXX: Must test the tRelative parameter to psKernelGenerate()
+ *  XXX: Must test psImageConvolveFFT()
+ *  XXX: Make sure psImageConvolveDirect() is correct.
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -95,5 +99,5 @@
         }
 
-        psKernel* result = psKernelGenerate(tVec, xVec, yVec, false);
+        psKernel* result = psKernelGenerate(tVec, xVec, yVec, false, false);
         ok(result != NULL, "psKernelGenerate() returned non-NULL");
         skip_start(result == NULL, 3, "Skipping tests because psKernelGenerate() returned NULL");
@@ -143,5 +147,5 @@
         }
 
-        psKernel *result = psKernelGenerate(tVec, xVec, yVec, true);
+        psKernel *result = psKernelGenerate(tVec, xVec, yVec, false, true);
         ok(result != NULL, "psKernelGenerate() returned non-NULL");
         skip_start(result == NULL, 3, "Skipping tests because psKernelGenerate() returned NULL");
@@ -197,5 +201,5 @@
 
         tVec->n--; // decrease size by one to make vectors unequal in length.
-        psKernel *result = psKernelGenerate(tVec, xVec, yVec, false);
+        psKernel *result = psKernelGenerate(tVec, xVec, yVec, false, false);
         ok(result == NULL, "psKernelGenerate returned NULL given differing sized vectors");
         psFree(result);
@@ -213,5 +217,5 @@
     {
         psMemId id = psMemGetId();
-        psKernel *result = psKernelGenerate(NULL, xVec, yVec, true);
+        psKernel *result = psKernelGenerate(NULL, xVec, yVec, false, true);
         ok(result == NULL, "psKernelGenerate returned NULL with no time vector");
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
@@ -222,5 +226,5 @@
     {
         psMemId id = psMemGetId();
-        psKernel *result = psKernelGenerate(tVec, NULL, yVec, true);
+        psKernel *result = psKernelGenerate(tVec, NULL, yVec, false, true);
         ok(result == NULL, "psKernelGenerate returned NULL with no x vector");
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
@@ -231,5 +235,5 @@
     {
         psMemId id = psMemGetId();
-        psKernel *result = psKernelGenerate(tVec, xVec, NULL, true);
+        psKernel *result = psKernelGenerate(tVec, xVec, NULL, false, true);
         ok(result == NULL, "psKernelGenerate returned NULL with no y vector");
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
@@ -282,11 +286,11 @@
     if (0) {
         psMemId id = psMemGetId();
-        psImage* out = psImageConvolve(NULL, img, g, true);
-        ok(out != NULL, "psImageConvolve() returned non-NULL");
-        skip_start(out == NULL, 3, "Skipping tests because psImageConvolve() returned NULL");
+        psImage* out = psImageConvolveDirect(NULL, img, g);
+        ok(out != NULL, "psImageConvolveDirect() returned non-NULL");
+        skip_start(out == NULL, 3, "Skipping tests because psImageConvolveDirect() returned NULL");
         ok(out->numCols == c && out->numRows == r,
-           "psImageConvolve result image is %dx%d, expected %dx%d",
+           "psImageConvolveDirect result image is %dx%d, expected %dx%d",
            out->numCols, out->numRows, c,r);
-        ok(out->type.type == PS_TYPE_F32, "psImageConvolve() produced the correct type");
+        ok(out->type.type == PS_TYPE_F32, "psImageConvolveDirect() produced the correct type");
 
         // test values
@@ -318,18 +322,18 @@
 
     // test fourier convolution of gaussian
-    ok(false, "XXXX: Skipping this psImageConvolve() because of bugs");
+    ok(false, "XXXX: Skipping this psImageConvolveDirect() because of bugs");
     if (0) {
         psMemId id = psMemGetId();
-        psImage* out = psImageConvolve(NULL, img, g, true);
-        psImage* out2 = psImageConvolve(out, img, g, false);
-
-        ok(out != NULL, "psImageConvolve() returned non-NULL");
-        ok(out2 != NULL, "psImageConvolve() returned non-NULL");
-        skip_start(out == NULL || out2 == NULL, 3, "Skipping tests because psImageConvolve() returned NULL");
-        ok(out == out2, "psImageConvolve did recycle the supplied out image struct");
+        psImage* out = psImageConvolveDirect(NULL, img, g);
+        psImage* out2 = psImageConvolveDirect(out, img, g);
+
+        ok(out != NULL, "psImageConvolveDirect() returned non-NULL");
+        ok(out2 != NULL, "psImageConvolveDirect() returned non-NULL");
+        skip_start(out == NULL || out2 == NULL, 3, "Skipping tests because psImageConvolveDirect() returned NULL");
+        ok(out == out2, "psImageConvolveDirect did recycle the supplied out image struct");
         ok(out->numCols == c && out->numRows == r,
-           "psImageConvolve result image is %dx%d, expected %dx%d",
+           "psImageConvolveDirect result image is %dx%d, expected %dx%d",
            out->numCols, out->numRows, c,r);
-        ok(out->type.type == PS_TYPE_F32, "psImageConvolve() produced the correct type");
+        ok(out->type.type == PS_TYPE_F32, "psImageConvolveDirect() produced the correct type");
 
         // test values
Index: /trunk/psLib/test/imageops/tap_psImagePixelManip.c
===================================================================
--- /trunk/psLib/test/imageops/tap_psImagePixelManip.c	(revision 12093)
+++ /trunk/psLib/test/imageops/tap_psImagePixelManip.c	(revision 12094)
@@ -6,6 +6,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-02-07 22:50:18 $
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-27 23:56:12 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -686,4 +686,6 @@
         // Verify program execution doen't stop, if the overly image contains
         // zero values with division operation is specified.
+        // XXX: This currently doesn't work.  Apparently, the psImageOverlaySection()
+        // will happily divide by 0.0.
         for (unsigned row=0;row<r;row++)
         {
@@ -695,5 +697,5 @@
         retVal = psImageOverlaySection(img,img2,0,0,"/");
         ok(retVal == 0, "psImageOverlaySection returned zero when checking divide-by-zero");
-
+        printf("XXX: retVal is %d, should be 0\n", retVal);
         psFree(img);
         psFree(img2);
Index: /trunk/psLib/test/imageops/tap_psImageShiftKernel.c
===================================================================
--- /trunk/psLib/test/imageops/tap_psImageShiftKernel.c	(revision 12093)
+++ /trunk/psLib/test/imageops/tap_psImageShiftKernel.c	(revision 12094)
@@ -8,5 +8,5 @@
 int main (void)
 {
-    plan_tests(39);
+    plan_tests(34);
 
     diag("psImageShiftKernel() tests");
Index: /trunk/psLib/test/imageops/tap_psImageSmooth.c
===================================================================
--- /trunk/psLib/test/imageops/tap_psImageSmooth.c	(revision 12093)
+++ /trunk/psLib/test/imageops/tap_psImageSmooth.c	(revision 12094)
@@ -5,6 +5,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-02-08 01:22:08 $
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-27 23:56:12 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -47,11 +47,9 @@
 
     if (flags & TS00_IM_NULL) {
-        if (VERBOSE)
-            printf("        using a NULL image\n");
+        if (VERBOSE) printf("        using a NULL image\n");
     }
 
     if (flags & TS00_IM_F32) {
-        if (VERBOSE)
-            printf("        using a psF32 image\n");
+        if (VERBOSE) printf("        using a psF32 image\n");
         img = psImageAlloc(numCols, numRows, PS_TYPE_F32);
         // Set a checkboard pattern
Index: /trunk/psLib/test/math/Makefile.am
===================================================================
--- /trunk/psLib/test/math/Makefile.am	(revision 12093)
+++ /trunk/psLib/test/math/Makefile.am	(revision 12094)
@@ -46,4 +46,5 @@
 	tap_psStats09 \
 	tap_psStatsTiming \
+	tap_psFunc01 \
 	tap_psStats_Sample_01
 
Index: /trunk/psLib/test/math/tap_psHist02.c
===================================================================
--- /trunk/psLib/test/math/tap_psHist02.c	(revision 12093)
+++ /trunk/psLib/test/math/tap_psHist02.c	(revision 12094)
@@ -35,6 +35,6 @@
 
         psHistogram *myHist = psHistogramAlloc(lower, higher, numBins );
-        myHist = psVectorHistogram( myHist, myData, NULL, NULL, 0 );
-        ok(myHist != NULL, "psVectorHistogram() returned a non-NULL psHistogram");
+        bool rc = psVectorHistogram( myHist, myData, NULL, NULL, 0 );
+        ok(rc == false, "psVectorHistogram() returned TRUE");
         skip_start(myHist == NULL, 1, "Skipping tests because psVectorHistogram() returned NULL");
 
@@ -80,6 +80,6 @@
         }
         psHistogram *myHist = psHistogramAlloc(lower, higher, numBins );
-        myHist = psVectorHistogram(myHist, myData, NULL, myMask, 1);
-        ok(myHist != NULL, "psVectorHistogram() returned a non-NULL psHistogram");
+        bool rc = psVectorHistogram(myHist, myData, NULL, myMask, 1);
+        ok(rc == false, "psVectorHistogram() returned TRUE");
         skip_start(myHist == NULL, 1, "Skipping tests because psVectorHistogram() returned NULL");
 
@@ -123,5 +123,6 @@
             myData->data.F32[ i ] = lower + ( ( higher - lower ) / ( float ) NUM_DATA ) * ( float ) i;
         }
-        ok(NULL == psVectorHistogram( NULL, myData, NULL, NULL, 0 ), "psVectorHistogram() returned NULL with a NULL psHistogram input");
+        ok(false == psVectorHistogram( NULL, myData, NULL, NULL, 0 ),
+          "psVectorHistogram() returned FALSE with a NULL psHistogram input");
         psFree( myData );
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
@@ -135,5 +136,6 @@
         psMemId id = psMemGetId();
         psHistogram *myHist = psHistogramAlloc(lower, higher, numBins );
-        ok(NULL != psVectorHistogram( myHist, NULL, NULL, NULL, 0 ), "psVectorHistogram() returns non-NULL with a NULL input array");
+        ok(true == psVectorHistogram( myHist, NULL, NULL, NULL, 0 ),
+          "psVectorHistogram() returns TRUE with a NULL input array");
         psFree(myHist);
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
@@ -149,6 +151,6 @@
         psVector *myData = psVectorAlloc(0, PS_TYPE_F32);
         psHistogram *myHist = psHistogramAlloc(lower, higher, numBins);
-        myHist = psVectorHistogram(myHist, NULL, NULL, NULL, 0);
-        ok(NULL != psVectorHistogram( myHist, NULL, NULL, NULL, 0 ), "psVectorHistogram() returns non-NULL with an empty input array");
+        ok(true == psVectorHistogram( myHist, NULL, NULL, NULL, 0 ),
+          "psVectorHistogram() returns TRUE with an empty input array");
         psFree(myHist);
         psFree(myData);
Index: /trunk/psLib/test/math/tap_psHist03.c
===================================================================
--- /trunk/psLib/test/math/tap_psHist03.c	(revision 12093)
+++ /trunk/psLib/test/math/tap_psHist03.c	(revision 12094)
@@ -50,5 +50,7 @@
         ok(myHist->uniform == false, "psHistogramAlloc() initialized ->uniform to false");
 
-        myHist = psVectorHistogram( myHist, myData, NULL, NULL, 0 );
+        bool rc = psVectorHistogram( myHist, myData, NULL, NULL, 0 );
+        ok(rc == true, "psVectorHistogram() returned TRUE");
+        // XXX: skip_start here
         for (int i=0;i<numBins;i++) {
             psF32 expected = ((float) NUM_DATA) / ((float) numBins);
@@ -84,5 +86,5 @@
     psTraceSetLevel("UpdateHistogramBins", 0);
     psTraceSetLevel("psVectorHistogram", 0);
-    plan_tests(32);
+    plan_tests(36);
 
     genericTest(1, 1, 2);
Index: /trunk/psLib/test/math/tap_psStats07.c
===================================================================
--- /trunk/psLib/test/math/tap_psStats07.c	(revision 12093)
+++ /trunk/psLib/test/math/tap_psStats07.c	(revision 12094)
@@ -500,6 +500,7 @@
     plan_tests(3);
 
-    ok(genericRobustStatsTest(TST_IN_F32 | TST_ERRORS_NULL | TST_MASK_NULL, NUM_DATA, 1, true), "RobustStatsTest() F32 data");
+//    ok(genericRobustStatsTest(TST_IN_F32 | TST_ERRORS_NULL | TST_MASK_NULL, NUM_DATA, 1, true), "RobustStatsTest() F32 data");
     ok(genericRobustStatsTest(TST_IN_F32 | TST_ERRORS_NULL | TST_MASK_U8, NUM_DATA, 1, true), "RobustStatsTest() F32 data, non-NULL errors and mask vector");
+//    ok(genericRobustStatsTest(TST_IN_F32 | TST_ERRORS_F32 | TST_MASK_U8, NUM_DATA, 1, true), "RobustStatsTest() F32 data, non-NULL errors and mask vector");
 
     ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
Index: /trunk/psLib/test/sys/tst_psError.c
===================================================================
--- /trunk/psLib/test/sys/tst_psError.c	(revision 12093)
+++ /trunk/psLib/test/sys/tst_psError.c	(revision 12094)
@@ -13,6 +13,6 @@
  *  @author  Eric Van Alst, MHPCC
  *
- *  @version $Revision: 1.1 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2005-07-13 02:47:01 $
+ *  @version $Revision: 1.2 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2007-02-27 23:56:12 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -62,5 +62,6 @@
     psLogSetLevel( PS_LOG_INFO );
 
-    return ( !runTestSuite(stderr, "psError", tests, argc, argv) );
+//    return ( !runTestSuite(stderr, "psError", tests, argc, argv) );
+    testError03();
 }
 
Index: /trunk/psLib/test/types/tap_psArguments_all.c
===================================================================
--- /trunk/psLib/test/types/tap_psArguments_all.c	(revision 12093)
+++ /trunk/psLib/test/types/tap_psArguments_all.c	(revision 12094)
@@ -23,4 +23,6 @@
 int main(void)
 {
+    psLogSetFormat("HLNM");
+    psLogSetLevel(PS_LOG_INFO);
     plan_tests(27);
 
Index: /trunk/psLib/test/types/tap_psBitSet_all.c
===================================================================
--- /trunk/psLib/test/types/tap_psBitSet_all.c	(revision 12093)
+++ /trunk/psLib/test/types/tap_psBitSet_all.c	(revision 12094)
@@ -68,25 +68,25 @@
     //Return NULL for NULL input psBitSet
     {
-        noBits = psBitSetSet(noBits, 0);
-        ok( noBits == NULL,
-            "psBitSetSet:           return NULL for NULL BitSet input.");
+        bool rc = psBitSetSet(noBits, 0);
+        ok( rc == true,
+            "psBitSetSet:           return TRUE for NULL BitSet input.");
     }
     //Return input BitSet for negative bit input
     {
-        noBits = psBitSetSet(bs, -1);
-        ok( noBits == bs,
-            "psBitSetSet:           return input BitSet for negative bits input.");
+        bool rc = psBitSetSet(bs, -1);
+        ok( rc == true,
+            "psBitSetSet:           return TRUE for negative bits input.");
         noBits = NULL;
     }
     //Return input BitSet for out-of-range bits
     {
-        noBits = psBitSetSet(bs, 8);
-        ok( noBits == bs,
-            "psBitSetSet:           return input BitSet for out-of-range bits input.");
+        bool rc = psBitSetSet(bs, 8);
+        ok( rc = true,
+            "psBitSetSet:           return TRUE for out-of-range bits input.");
         noBits = NULL;
     }
     //Return set BitSet for valid inputs
     {
-        bs = psBitSetSet(bs, 2);
+        psBitSetSet(bs, 2);
         ok( bs->bits[0] == 4,
             "psBitSetSet:           return properly set BitSet for valid inputs.");
@@ -96,25 +96,25 @@
     //Return NULL for NULL input psBitSet
     {
-        noBits = psBitSetClear(noBits, 0);
-        ok( noBits == NULL,
-            "psBitSetClear:         return NULL for NULL BitSet input.");
+        bool rc = psBitSetClear(noBits, 0);
+        ok( rc == false,
+            "psBitSetClear:         return FALSE for NULL BitSet input.");
     }
     //Return input BitSet for negative bit input
     {
-        noBits = psBitSetClear(bs, -1);
-        ok( noBits == bs,
-            "psBitSetClear:        return input BitSet for negative bits input.");
+        bool rc = psBitSetClear(bs, -1);
+        ok( rc = true,
+            "psBitSetClear:        return TRUE for negative bits input.");
         noBits = NULL;
     }
     //Return input BitSet for out-of-range bits
     {
-        noBits = psBitSetClear(bs, 8);
-        ok( noBits == bs,
-            "psBitSetClear:        return input BitSet for out-of-range bits input.");
+        bool rc = psBitSetClear(bs, 8);
+        ok( rc == true,
+            "psBitSetClear:        return TRUE for out-of-range bits input.");
         noBits = NULL;
     }
     //Return cleared BitSet for valid inputs
     {
-        bs = psBitSetClear(bs, 2);
+        psBitSetClear(bs, 2);
         ok( bs->bits[0] == 0,
             "psBitSetClear:        return properly cleared BitSet for valid inputs.");
@@ -144,5 +144,5 @@
     //Return false for non-matching bit in BitSet
     {
-        bs = psBitSetSet(bs, 2);
+        psBitSetSet(bs, 2);
         ok( psBitSetTest(bs, 2),
             "psBitSetTest:         return true for matching bit in BitSet.");
@@ -163,10 +163,10 @@
     psBitSet *bs = NULL;
     bs = psBitSetAlloc(8);
-    bs = psBitSetSet(bs, 2);  // 0000 0100 == 4
-    bs = psBitSetSet(bs, 3);  // 0000 1100 == 12
-    bs = psBitSetSet(bs, 4);  // 0001 1100 == 28
-    bs = psBitSetSet(bs, 5);  // 0011 1100 == 60
-    bs = psBitSetSet(bs, 6);  // 0111 1100 == 124
-    bs = psBitSetSet(bs, 7);  // 1111 1100 == 252
+    psBitSetSet(bs, 2);  // 0000 0100 == 4
+    psBitSetSet(bs, 3);  // 0000 1100 == 12
+    psBitSetSet(bs, 4);  // 0001 1100 == 28
+    psBitSetSet(bs, 5);  // 0011 1100 == 60
+    psBitSetSet(bs, 6);  // 0111 1100 == 124
+    psBitSetSet(bs, 7);  // 1111 1100 == 252
     psBitSet *out = NULL;
 
@@ -222,6 +222,6 @@
     psFree(bs);
     bs = psBitSetAlloc(16);
-    bs = psBitSetSet(bs, 1);     // 0000 0010 == 2
-    bs2 = psBitSetSet(bs2, 2);   // 0000 0100 == 4
+    psBitSetSet(bs, 1);     // 0000 0010 == 2
+    psBitSetSet(bs2, 2);   // 0000 0100 == 4
     //Return correct psBitSet output for valid inputs with AND operator
     {
@@ -239,5 +239,5 @@
     }
     //Return correct psBitSet output for valid inputs with XOR operator
-    bs2 = psBitSetSet(bs2, 1);     // 0000 0110 == 6
+    psBitSetSet(bs2, 1);     // 0000 0110 == 6
     {
         out = psBitSetOp(out, bs, "XOR", bs2);
@@ -250,10 +250,10 @@
         psFree(out);
         out = psBitSetAlloc(0);
-        bs = psBitSetSet(bs, 2);  // 0000 0110 == 4
-        bs = psBitSetSet(bs, 3);  // 0000 1110 == 12
-        bs = psBitSetSet(bs, 4);  // 0001 1110 == 28
-        bs = psBitSetSet(bs, 5);  // 0011 1110 == 60
-        bs = psBitSetSet(bs, 6);  // 0111 1110 == 124
-        bs = psBitSetSet(bs, 7);  // 1111 1110 == 252
+        psBitSetSet(bs, 2);  // 0000 0110 == 4
+        psBitSetSet(bs, 3);  // 0000 1110 == 12
+        psBitSetSet(bs, 4);  // 0001 1110 == 28
+        psBitSetSet(bs, 5);  // 0011 1110 == 60
+        psBitSetSet(bs, 6);  // 0111 1110 == 124
+        psBitSetSet(bs, 7);  // 1111 1110 == 252
         out = psBitSetOp(out, bs, "NOT", bs2);
         ok( out->bits[0] == 1,
@@ -274,5 +274,5 @@
         psFree(bs);
         bs = psBitSetAlloc(8);
-        bs = psBitSetSet(bs, 2);  // 0000 0100 == 4
+        psBitSetSet(bs, 2);  // 0000 0100 == 4
         bitStr = psBitSetToString(bs);
         ok( !strncmp(bitStr, "00000100", 10),
Index: /trunk/psLib/test/types/tap_psMetadata_copying.c
===================================================================
--- /trunk/psLib/test/types/tap_psMetadata_copying.c	(revision 12093)
+++ /trunk/psLib/test/types/tap_psMetadata_copying.c	(revision 12094)
@@ -2,5 +2,5 @@
  *  C Implementation: tap_psMetadata_copying
  *
- * Description:  Tests for psMetadataCopy, psMetadataItemCopy, & psMetadataItemTransfer.
+ * Description:  Tests for psMetadataCopy, psMetadataItemCopy, & psMetadataItemSupplement.
  *
  *
@@ -23,4 +23,5 @@
 int main(void)
 {
+    psLogSetFormat("HLNM");
     plan_tests(36);
 
@@ -426,5 +427,5 @@
 void testMetadataItemTransfer(void)
 {
-    note("  >>>Test 3:  psMetadataItemTransfer");
+    note("  >>>Test 3:  psMetadataItemSupplement");
     psMetadata *out = psMetadataAlloc();
     psMetadata *in = psMetadataAlloc();
@@ -434,16 +435,16 @@
     //Return false for NULL in input
     {
-        ok( !psMetadataItemTransfer(out, NULL, key),
-            "psMetadataItemTransfer:  return false for NULL in metadata.");
+        ok( !psMetadataItemSupplement(out, NULL, key),
+            "psMetadataItemSupplement:  return false for NULL in metadata.");
     }
     //Return false for NULL out input
     {
-        ok( !psMetadataItemTransfer(NULL, in, key),
-            "psMetadataItemTransfer:  return false for NULL out metadata.");
+        ok( !psMetadataItemSupplement(NULL, in, key),
+            "psMetadataItemSupplement:  return false for NULL out metadata.");
     }
     //Return false for NULL key input
     {
-        ok( !psMetadataItemTransfer(out, in, NULL),
-            "psMetadataItemTransfer:  return false for NULL key string.");
+        ok( !psMetadataItemSupplement(out, in, NULL),
+            "psMetadataItemSupplement:  return false for NULL key string.");
     }
     psMetadataAddS32(in, PS_LIST_HEAD, "key", PS_META_NO_REPLACE, "", 666);
@@ -452,5 +453,5 @@
     //Return true for valid inputs
     {
-        bool transfered = psMetadataItemTransfer(out, in, key);
+        bool transfered = psMetadataItemSupplement(out, in, key);
         psMetadataItem *item = NULL;
         if (transfered)
@@ -458,5 +459,5 @@
         ok(transfered && item->type == PS_DATA_S32 && strncmp(item->name, "key", 4) == 0
            && item->data.S32 == 666 && strncmp(item->comment, "", 2) == 0,
-           "psMetadataItemTransfer:  return true for valid inputs.");
+           "psMetadataItemSupplement:  return true for valid inputs.");
     }
     /*  Attempt here was to return false inside of ItemTransfer at psMetadataAddItem.
@@ -466,6 +467,6 @@
         psMetadataItem *item = psMetadataGet(in, PS_LIST_HEAD);
         psMetadataAddItem(out, item, PS_LIST_TAIL, PS_META_NO_REPLACE);
-        ok( !psMetadataItemTransfer(out, in, key),
-            "psMetadataItemTransfer:  return false for duplicate metadataItem.");
+        ok( !psMetadataItemSupplement(out, in, key),
+            "psMetadataItemSupplement:  return false for duplicate metadataItem.");
     }
     */
@@ -473,6 +474,6 @@
     {
         strncpy(key, "not MY key", 15);
-        ok( !psMetadataItemTransfer(out, in, key),
-            "psMetadataItemTransfer:  return false for invalid key.");
+        ok( !psMetadataItemSupplement(out, in, key),
+            "psMetadataItemSupplement:  return false for invalid key.");
     }
     //Return false for invalid metadata
@@ -481,6 +482,6 @@
     invalid->hash = NULL;
     {
-        ok( !psMetadataItemTransfer(invalid, in, "key"),
-            "psMetadataItemTransfer:  return false for invalid metadata.");
+        ok( !psMetadataItemSupplement(invalid, in, "key"),
+            "psMetadataItemSupplement:  return false for invalid metadata.");
     }
     psFree(invalid);