Index: /trunk/psLib/test/types/tap_psArguments_all.c
===================================================================
--- /trunk/psLib/test/types/tap_psArguments_all.c	(revision 10818)
+++ /trunk/psLib/test/types/tap_psArguments_all.c	(revision 10819)
@@ -23,7 +23,7 @@
 int main(void)
 {
-    plan_tests(27);
-
-    diag("Tests for psArguments Functions");
+    plan_tests(30);
+
+    note("Tests for psArguments Functions");
 
     testArgumentGetParse();
@@ -36,5 +36,5 @@
 void testArgumentGetParse(void)
 {
-    diag("  >>>Test 1:  psArgument Get, Remove, Parse, and Help Fxns");
+    note("  >>>Test 1:  psArgument Get, Remove, Parse, and Help Fxns");
     psMetadata *arg = NULL;
     char *argv[25];
@@ -217,5 +217,5 @@
 void testArgumentVerbosity(void)
 {
-    diag("  >>>Test 2:  psArgumentRemove & psArgumentVerbosity Fxns");
+    note("  >>>Test 2:  psArgumentRemove & psArgumentVerbosity Fxns");
 
     //Return 2 (default) for NULL input argument
@@ -317,5 +317,5 @@
 void testLogTraceArguments(void)
 {
-    diag("  >>>Test 3:  psLogArguments & psTraceArguments Fxns");
+    note("  >>>Test 3:  psLogArguments & psTraceArguments Fxns");
  
     //Return 2 (default) for NULL arguments input
Index: /trunk/psLib/test/types/tap_psArray_all.c
===================================================================
--- /trunk/psLib/test/types/tap_psArray_all.c	(revision 10818)
+++ /trunk/psLib/test/types/tap_psArray_all.c	(revision 10819)
@@ -24,7 +24,7 @@
 int main(void)
 {
-    plan_tests(29);
-
-    diag("Tests for psArray Functions");
+    plan_tests(34);
+
+    note("Tests for psArray Functions");
 
     testArrayAllocs();
@@ -38,5 +38,5 @@
 void testArrayAllocs(void)
 {
-    diag("  >>>Test 1:  psArrayAlloc, Realloc, & Free Fxns");
+    note("  >>>Test 1:  psArrayAlloc, Realloc, & Free Fxns");
     psArray *a = NULL;
 
@@ -127,5 +127,5 @@
 void testArrayAddRemove(void)
 {
-    diag("  >>>Test 2:  psArrayAdd & psArrayRemove Fxns");
+    note("  >>>Test 2:  psArrayAdd & psArrayRemove Fxns");
     psArray *a = psArrayAlloc(0);
     psS32 *s1 = (psS32*)psAlloc(sizeof(psS32));
@@ -200,5 +200,5 @@
 void testArraySetGet(void)
 {
-    diag("  >>>Test 3:  psArraySet & psArrayGet Fxns");
+    note("  >>>Test 3:  psArraySet & psArrayGet Fxns");
     psArray *a = NULL;
     psArray *b = NULL;
@@ -285,5 +285,5 @@
 void testArraySort(void)
 {
-    diag("  >>>Test 4:  psArray Sort Function");
+    note("  >>>Test 4:  psArray Sort Function");
     psArray *a = NULL;
     a = psArrayAlloc(3);
Index: /trunk/psLib/test/types/tap_psBitSet_all.c
===================================================================
--- /trunk/psLib/test/types/tap_psBitSet_all.c	(revision 10818)
+++ /trunk/psLib/test/types/tap_psBitSet_all.c	(revision 10819)
@@ -22,7 +22,7 @@
 int main(void)
 {
-    plan_tests(31);
-
-    diag("Tests for psBitSet Functions");
+    plan_tests(34);
+
+    note("Tests for psBitSet Functions");
 
     testBitSetBasics();
@@ -34,5 +34,5 @@
 void testBitSetBasics(void)
 {
-    diag("  >>>Test 1:  psBitSet Basic Fxns");
+    note("  >>>Test 1:  psBitSet Basic Fxns");
 
     psBitSet *noBits = NULL;
@@ -159,5 +159,5 @@
 void testBitSetOps(void)
 {
-    diag("  >>>Test 2:  psBitSet Operation Fxns");
+    note("  >>>Test 2:  psBitSet Operation Fxns");
     psBitSet *noBits = NULL;
     psBitSet *bs = NULL;
Index: /trunk/psLib/test/types/tap_psHash_all.c
===================================================================
--- /trunk/psLib/test/types/tap_psHash_all.c	(revision 10818)
+++ /trunk/psLib/test/types/tap_psHash_all.c	(revision 10819)
@@ -23,7 +23,7 @@
 int main(void)
 {
-    plan_tests(25);
-
-    diag("Tests for psHash Functions");
+    plan_tests(29);
+
+    note("Tests for psHash Functions");
 
     testHashCreate();
@@ -36,5 +36,5 @@
 void testHashCreate(void)
 {
-    diag("  >>>Test 1:  psHash Creation Fxns");
+    note("  >>>Test 1:  psHash Creation Fxns");
 
     psHash *h1 = NULL;
@@ -112,5 +112,5 @@
 void testHashManip(void)
 {
-    diag("  >>>Test 2:  psHash Manipulation Fxns");
+    note("  >>>Test 2:  psHash Manipulation Fxns");
 
     psHash *h1 = NULL;
@@ -181,5 +181,5 @@
 void testHashConvert(void)
 {
-    diag("  >>>Test 3:  psHash Conversion/List Fxns");
+    note("  >>>Test 3:  psHash Conversion/List Fxns");
 
     psHash *h1 = NULL;
Index: /trunk/psLib/test/types/tap_psListIterator.c
===================================================================
--- /trunk/psLib/test/types/tap_psListIterator.c	(revision 10818)
+++ /trunk/psLib/test/types/tap_psListIterator.c	(revision 10819)
@@ -72,10 +72,10 @@
 int main (void)
 {
-    plan_tests(66);
+    plan_tests(73);
 
-    diag("psListIterator tests");
+    note("psListIterator tests");
 
     {
-        diag("Forwards");
+        note("Forwards");
         psList *list = listGenerate();
         psListIterator *iter = psListIteratorAlloc(list, PS_LIST_HEAD, false);
@@ -97,5 +97,5 @@
 
     {
-        diag("Backwards");
+        note("Backwards");
         psList *list = listGenerate();
         psListIterator *iter = psListIteratorAlloc(list, PS_LIST_TAIL, NULL);
@@ -117,5 +117,5 @@
 
     {
-        diag("Jumping in halfway through (using allocator), forwards");
+        note("Jumping in halfway through (using allocator), forwards");
         psList *list = listGenerate();
         psListIterator *iter = psListIteratorAlloc(list, 3, NULL);
@@ -134,5 +134,5 @@
 
     {
-        diag("Jumping in halfway through (using allocator), backwards");
+        note("Jumping in halfway through (using allocator), backwards");
         psList *list = listGenerate();
         psListIterator *iter = psListIteratorAlloc(list, -4, NULL);
@@ -151,5 +151,5 @@
 
     {
-        diag("Jumping in halfway through (using set), forwards");
+        note("Jumping in halfway through (using set), forwards");
         psList *list = listGenerate();
         psListIterator *iter = psListIteratorAlloc(list, PS_LIST_HEAD, NULL);
@@ -169,5 +169,5 @@
 
     {
-        diag("Jumping in halfway through (using set), backwards");
+        note("Jumping in halfway through (using set), backwards");
         psList *list = listGenerate();
         psListIterator *iter = psListIteratorAlloc(list, PS_LIST_HEAD, NULL);
Index: /trunk/psLib/test/types/tap_psList_all.c
===================================================================
--- /trunk/psLib/test/types/tap_psList_all.c	(revision 10818)
+++ /trunk/psLib/test/types/tap_psList_all.c	(revision 10819)
@@ -26,7 +26,7 @@
 int main(void)
 {
-    plan_tests(60);
-
-    diag("Tests for psList Functions");
+    plan_tests(64);
+
+    note("Tests for psList Functions");
 
     testListCreate();
@@ -39,5 +39,5 @@
 void testListCreate(void)
 {
-    diag("  >>>Test 1:  psList Creation Fxns");
+    note("  >>>Test 1:  psList Creation Fxns");
     psList *noList = NULL;
     psListIterator *noIter = NULL;
@@ -243,5 +243,5 @@
 void testListManip(void)
 {
-    diag("  >>>Test 2:  psList Manipulation Fxns");
+    note("  >>>Test 2:  psList Manipulation Fxns");
     psMetadata *md = psMetadataAlloc();
     psList *emptyList = psListAlloc(NULL);
@@ -427,5 +427,5 @@
 void testListConvertSort(void)
 {
-    diag("  >>>Test 3:  psList Conversion and Sorting Fxns");
+    note("  >>>Test 3:  psList Conversion and Sorting Fxns");
     psList *emptyList = psListAlloc(NULL);
     psS32 *s1 = (psS32*)psAlloc(sizeof(psS32));
Index: /trunk/psLib/test/types/tap_psLookupTable_all.c
===================================================================
--- /trunk/psLib/test/types/tap_psLookupTable_all.c	(revision 10818)
+++ /trunk/psLib/test/types/tap_psLookupTable_all.c	(revision 10819)
@@ -24,7 +24,7 @@
 int main(void)
 {
-    plan_tests(28);
-
-    diag("Tests for psLookupTable Functions");
+    plan_tests(30);
+
+    note("Tests for psLookupTable Functions");
 
     testLookupTableAlloc();
@@ -37,5 +37,5 @@
 void testLookupTableAlloc(void)
 {
-    diag("  >>>Test 1:  psLookupTableAlloc & psMemCheckLookupTable Fxns");
+    note("  >>>Test 1:  psLookupTableAlloc & psMemCheckLookupTable Fxns");
 
     psLookupTable *lt = NULL;
Index: /trunk/psLib/test/types/tap_psMetadataConfigParse_time.c
===================================================================
--- /trunk/psLib/test/types/tap_psMetadataConfigParse_time.c	(revision 10818)
+++ /trunk/psLib/test/types/tap_psMetadataConfigParse_time.c	(revision 10819)
@@ -7,7 +7,7 @@
 int main (void)
 {
-    plan_tests(40);
+    plan_tests(41);
 
-    diag("psMetadataParseConfig time format tests");
+    note("psMetadataParseConfig time format tests");
 
     {
Index: /trunk/psLib/test/types/tap_psMetadataConfigRead.c
===================================================================
--- /trunk/psLib/test/types/tap_psMetadataConfigRead.c	(revision 10818)
+++ /trunk/psLib/test/types/tap_psMetadataConfigRead.c	(revision 10819)
@@ -147,7 +147,7 @@
 int main (void)
 {
-    plan_tests(52);
-
-    diag("psMetadataConfigRead tests");
+    plan_tests(58);
+
+    note("psMetadataConfigRead tests");
 
     generateMDConfig();
@@ -155,4 +155,6 @@
     unsigned int numBadLines = 0;            // Number of bad lines
     psMetadata *md = psMetadataConfigRead(NULL, &numBadLines, FILENAME, false);
+    unlink (FILENAME);
+
     ok(md, "md = %x", md);
     ok(numBadLines == 1, "number of bad lines = %d", numBadLines); // One bad line from boolean
@@ -165,5 +167,5 @@
         psMetadataIterator *iterator = psMetadataIteratorAlloc(md, PS_LIST_HEAD, NULL); // Iterator
 
-        diag("Checking the output");
+        note("Checking the output");
         {
             psMetadataItem *item = psMetadataGetAndIncrement(iterator);
@@ -174,5 +176,5 @@
 
         {
-            diag("Checking the nested METADATA");
+            note("Checking the nested METADATA");
             psMetadataItem *item = psMetadataGetAndIncrement(iterator);
             mixedType value;            // Needed only to check the other stuff
@@ -200,5 +202,5 @@
         }
 
-        diag("Checking the rest");
+        note("Checking the rest");
         {
             psMetadataItem *item = psMetadataGetAndIncrement(iterator);
@@ -232,5 +234,5 @@
     }
 
-    diag("Checking the MULTI");
+    note("Checking the MULTI");
     {
         // Check that the correct item is MULTI
@@ -266,5 +268,5 @@
     }
 
-    diag("Checking the bad line");
+    note("Checking the bad line");
     {
         // Check that the bad one isn't there
Index: /trunk/psLib/test/types/tap_psMetadataConfig_input.c
===================================================================
--- /trunk/psLib/test/types/tap_psMetadataConfig_input.c	(revision 10818)
+++ /trunk/psLib/test/types/tap_psMetadataConfig_input.c	(revision 10819)
@@ -25,7 +25,7 @@
 int main(void)
 {
-    plan_tests(33);
-
-    diag("Tests for psMetadataConfig Input Functions");
+    plan_tests(36);
+
+    note("Tests for psMetadataConfig Input Functions");
 
     testMetaConfigRead();
@@ -37,5 +37,5 @@
 void testMetaConfigRead(void)
 {
-    diag("  >>>Test 1:  psMetadataConfigRead");
+    note("  >>>Test 1:  psMetadataConfigRead");
 
     //Return NULL for NULL filename input
@@ -97,5 +97,5 @@
             "returned metadata.");
         skip_end();
-        psMetadataConfigWrite(out, "mdc-overwrite_false.txt");
+        // psMetadataConfigWrite(out, "mdc-overwrite_false.txt");
         psFree(out);
     }
@@ -128,5 +128,5 @@
             "returned metadata.");
         skip_end();
-        psMetadataConfigWrite(out, "mdc-overwrite_true.txt");
+        // psMetadataConfigWrite(out, "mdc-overwrite_true.txt");
         psFree(out);
     }
@@ -138,5 +138,5 @@
 void testMetaConfigParse(void)
 {
-    diag("  >>>Test 2:  psMetadataConfigParse");
+    note("  >>>Test 2:  psMetadataConfigParse");
     char str1[70];
     char str2[70];
Index: /trunk/psLib/test/types/tap_psMetadataItemCompare.c
===================================================================
--- /trunk/psLib/test/types/tap_psMetadataItemCompare.c	(revision 10818)
+++ /trunk/psLib/test/types/tap_psMetadataItemCompare.c	(revision 10819)
@@ -19,7 +19,7 @@
 int main (void)
 {
-    plan_tests(22);
-
-    diag("psMetadataItemCompare() tests");
+    plan_tests(24);
+
+    note("psMetadataItemCompare() tests");
 
     testItemCompare();
@@ -30,5 +30,5 @@
 void testItemCompare(void)
 {
-    diag("  >>>Test 1:  psMetadataItemCompare");
+    note("  >>>Test 1:  psMetadataItemCompare");
 
     psMetadataItem *compare = NULL;
Index: /trunk/psLib/test/types/tap_psMetadataItemParse.c
===================================================================
--- /trunk/psLib/test/types/tap_psMetadataItemParse.c	(revision 10818)
+++ /trunk/psLib/test/types/tap_psMetadataItemParse.c	(revision 10819)
@@ -20,7 +20,7 @@
 int main (void)
 {
-    plan_tests(112);
-
-    diag("psMetadataItemParse() tests");
+    plan_tests(114);
+
+    note("psMetadataItemParse() tests");
 
     testItemParse();
@@ -31,5 +31,5 @@
 void testItemParse(void)
 {
-    diag("  >>>Test 1:  psMetadataItemParse");
+    note("  >>>Test 1:  psMetadataItemParse");
 
     psMetadataItem *itemBool = psMetadataItemAlloc("bool", PS_DATA_BOOL, "No Comment", true);
Index: /trunk/psLib/test/types/tap_psMetadataIterator.c
===================================================================
--- /trunk/psLib/test/types/tap_psMetadataIterator.c	(revision 10818)
+++ /trunk/psLib/test/types/tap_psMetadataIterator.c	(revision 10819)
@@ -102,10 +102,10 @@
 int main (void)
 {
-    plan_tests(242);
-
-    diag("psMetadataIterator tests");
-
-    {
-        diag("No regular expressions, forwards");
+    plan_tests(255);
+
+    note("psMetadataIterator tests");
+
+    {
+        note("No regular expressions, forwards");
         psMetadata *md = mdGenerate();
         psMetadataIterator *iter = psMetadataIteratorAlloc(md, PS_LIST_HEAD, NULL);
@@ -127,5 +127,5 @@
 
     {
-        diag("No regular expressions, backwards");
+        note("No regular expressions, backwards");
         psMetadata *md = mdGenerate();
         psMetadataIterator *iter = psMetadataIteratorAlloc(md, PS_LIST_TAIL, NULL);
@@ -147,5 +147,5 @@
 
     {
-        diag("No regular expressions, jumping in halfway through (using allocator), forwards");
+        note("No regular expressions, jumping in halfway through (using allocator), forwards");
         psMetadata *md = mdGenerate();
         psMetadataIterator *iter = psMetadataIteratorAlloc(md, 3, NULL);
@@ -164,5 +164,5 @@
 
     {
-        diag("No regular expressions, jumping in halfway through (using allocator), backwards");
+        note("No regular expressions, jumping in halfway through (using allocator), backwards");
         psMetadata *md = mdGenerate();
         psMetadataIterator *iter = psMetadataIteratorAlloc(md, -4, NULL);
@@ -181,5 +181,5 @@
 
     {
-        diag("No regular expressions, jumping in halfway through (using set), forwards");
+        note("No regular expressions, jumping in halfway through (using set), forwards");
         psMetadata *md = mdGenerate();
         psMetadataIterator *iter = psMetadataIteratorAlloc(md, PS_LIST_HEAD, NULL);
@@ -199,5 +199,5 @@
 
     {
-        diag("No regular expressions, jumping in halfway through (using set), backwards");
+        note("No regular expressions, jumping in halfway through (using set), backwards");
         psMetadata *md = mdGenerate();
         psMetadataIterator *iter = psMetadataIteratorAlloc(md, PS_LIST_HEAD, NULL);
@@ -217,5 +217,5 @@
 
     {
-        diag("With regular expressions, forwards");
+        note("With regular expressions, forwards");
         psMetadata *md = mdGenerate();
         psMetadataIterator *iter = psMetadataIteratorAlloc(md, PS_LIST_HEAD, "^" MULTI_NAME "$");
@@ -234,5 +234,5 @@
 
     {
-        diag("With regular expressions, backwards");
+        note("With regular expressions, backwards");
         psMetadata *md = mdGenerate();
         psMetadataIterator *iter = psMetadataIteratorAlloc(md, PS_LIST_TAIL, "^" MULTI_NAME "$");
@@ -251,5 +251,5 @@
 
     {
-        diag("With regular expressions, jumping in halfway through (using allocator), forwards");
+        note("With regular expressions, jumping in halfway through (using allocator), forwards");
         psMetadata *md = mdGenerate();
         psMetadataIterator *iter = psMetadataIteratorAlloc(md, 2, "^" MULTI_NAME "$");
@@ -266,5 +266,5 @@
 
     {
-        diag("With regular expressions, jumping in halfway through (using allocator), backwards");
+        note("With regular expressions, jumping in halfway through (using allocator), backwards");
         psMetadata *md = mdGenerate();
         psMetadataIterator *iter = psMetadataIteratorAlloc(md, -3, "^" MULTI_NAME "$");
@@ -281,5 +281,5 @@
 
     {
-        diag("With regular expressions, jumping in halfway through (using set), forwards");
+        note("With regular expressions, jumping in halfway through (using set), forwards");
         psMetadata *md = mdGenerate();
         psMetadataIterator *iter = psMetadataIteratorAlloc(md, PS_LIST_HEAD, "^" MULTI_NAME "$");
@@ -297,5 +297,5 @@
 
     {
-        diag("With regular expressions, jumping in halfway through (using set), backwards");
+        note("With regular expressions, jumping in halfway through (using set), backwards");
         psMetadata *md = mdGenerate();
         psMetadataIterator *iter = psMetadataIteratorAlloc(md, PS_LIST_HEAD, "^" MULTI_NAME "$");
Index: /trunk/psLib/test/types/tap_psMetadata_copying.c
===================================================================
--- /trunk/psLib/test/types/tap_psMetadata_copying.c	(revision 10818)
+++ /trunk/psLib/test/types/tap_psMetadata_copying.c	(revision 10819)
@@ -23,7 +23,7 @@
 int main(void)
 {
-    plan_tests(36);
-
-    diag("psMetadataCopy and psMetadataItemCopy tests");
+    plan_tests(40);
+
+    note("psMetadataCopy and psMetadataItemCopy tests");
 
     testMetadataCopy();
@@ -36,5 +36,5 @@
 void testMetadataCopy(void)
 {
-    diag("  >>>Test 1:  psMetadataCopy");
+    note("  >>>Test 1:  psMetadataCopy");
     psMetadata *in = NULL;
     psMetadata *out = NULL;
@@ -165,5 +165,5 @@
 void testMetadataItemCopy(void)
 {
-    diag("  >>>Test 2:  psMetadataItemCopy");
+    note("  >>>Test 2:  psMetadataItemCopy");
 
     //Return NULL for NULL input psMetadataItem
@@ -426,5 +426,5 @@
 void testMetadataItemTransfer(void)
 {
-    diag("  >>>Test 3:  psMetadataItemTransfer");
+    note("  >>>Test 3:  psMetadataItemTransfer");
     psMetadata *out = psMetadataAlloc();
     psMetadata *in = psMetadataAlloc();
Index: /trunk/psLib/test/types/tap_psMetadata_creating.c
===================================================================
--- /trunk/psLib/test/types/tap_psMetadata_creating.c	(revision 10818)
+++ /trunk/psLib/test/types/tap_psMetadata_creating.c	(revision 10819)
@@ -25,7 +25,7 @@
 int main(void)
 {
-    plan_tests(42);
-
-    diag("psMetadata & psMetadataItem Creation Functions");
+    plan_tests(46);
+
+    note("psMetadata & psMetadataItem Creation Functions");
 
     testItemAllocs();
@@ -38,5 +38,5 @@
 void testItemAllocs(void)
 {
-    diag("  >>>Test 1:  psMetadataItemAlloc Fxns");
+    note("  >>>Test 1:  psMetadataItemAlloc Fxns");
     psMetadataItem *itemStr = psMetadataItemAllocStr("itemStr", "", "itemStr");
     psMetadataItem *itemF32 = psMetadataItemAllocF32("itemF32", "", 6.66);
@@ -263,5 +263,5 @@
 void testMDAlloc_AddItem(void)
 {
-    diag("  >>>Test 2:  psMetadataAlloc & psMetadataAdd Fxns");
+    note("  >>>Test 2:  psMetadataAlloc & psMetadataAdd Fxns");
     psMetadata *md = NULL;
     md = psMetadataAlloc();
@@ -438,5 +438,5 @@
 void testIterAlloc(void)
 {
-    diag("  >>>Test 3:  psMetadataIteratorAlloc");
+    note("  >>>Test 3:  psMetadataIteratorAlloc");
     psMetadata *md = psMetadataAlloc();
     psMetadata *md2 = NULL;
Index: /trunk/psLib/test/types/tap_psMetadata_manip.c
===================================================================
--- /trunk/psLib/test/types/tap_psMetadata_manip.c	(revision 10818)
+++ /trunk/psLib/test/types/tap_psMetadata_manip.c	(revision 10819)
@@ -23,7 +23,7 @@
 int main(void)
 {
-    plan_tests(48);
-
-    diag("psMetadataLookup, Remove, and Iterator Fxns");
+    plan_tests(52);
+
+    note("psMetadataLookup, Remove, and Iterator Fxns");
 
     testLookups();
@@ -36,5 +36,5 @@
 void testLookups(void)
 {
-    diag("  >>>Test 1:  psMetadataLookup Functions");
+    note("  >>>Test 1:  psMetadataLookup Functions");
     psMetadata *md = psMetadataAlloc();
     psMetadataAddStr(md, PS_LIST_TAIL, "itemStr", 0, "I am a string", "GNIRTS");
@@ -315,5 +315,5 @@
 void testRemoves(void)
 {
-    diag("  >>>Test 2:  psMetadataRemove Functions");
+    note("  >>>Test 2:  psMetadataRemove Functions");
     psMetadata *md = psMetadataAlloc();
     psMetadataAddStr(md, PS_LIST_TAIL, "itemStr", 0, "I am a string", "GNIRTS");
@@ -403,5 +403,5 @@
 void testIter(void)
 {
-    diag("  >>>Test 3:  psMetadataIterator Functions");
+    note("  >>>Test 3:  psMetadataIterator Functions");
     psMetadata *md = psMetadataAlloc();
     psMetadataAddS32(md, PS_LIST_HEAD, "S32_1", PS_META_NO_REPLACE, "", 1);
Index: /trunk/psLib/test/types/tap_psMetadata_polynomials.c
===================================================================
--- /trunk/psLib/test/types/tap_psMetadata_polynomials.c	(revision 10818)
+++ /trunk/psLib/test/types/tap_psMetadata_polynomials.c	(revision 10819)
@@ -24,7 +24,7 @@
 int main(void)
 {
-    plan_tests(89);
-
-    diag("psPolynomial(1D, 2D, 3D, & 4D)(to/from)Metadata tests");
+    plan_tests(96);
+
+    note("psPolynomial(1D, 2D, 3D, & 4D)(to/from)Metadata tests");
 
     test1Dcase();
@@ -39,5 +39,5 @@
 void test1Dcase(void)
 {
-    diag("  >>>Test 1:  psPolynomial1DtoMetadata & psPolynomial1DfromMetadata functions");
+    note("  >>>Test 1:  psPolynomial1DtoMetadata & psPolynomial1DfromMetadata functions");
     psMetadata *md = psMetadataAlloc();
     psPolynomial1D *p1d = psPolynomial1DAlloc(PS_POLYNOMIAL_ORD, 1);
@@ -50,5 +50,5 @@
     //Return a valid metadata containing a polynomial-metadata structure
     {
-        diag ("example of 1DtoMD using the names not the sequence");
+        note ("example of 1DtoMD using the names not the sequence");
 
         ok( psPolynomial1DtoMetadata(md, p1d, "polyMD"),
@@ -198,5 +198,5 @@
 void test2Dcase(void)
 {
-    diag("  >>>Test 2:  psPolynomial2DtoMetadata & psPolynomial2DfromMetadata functions");
+    note("  >>>Test 2:  psPolynomial2DtoMetadata & psPolynomial2DfromMetadata functions");
     psMetadata *md = psMetadataAlloc();
     psPolynomial2D *p2d = psPolynomial2DAlloc(PS_POLYNOMIAL_ORD, 1, 1);
@@ -216,5 +216,5 @@
             "psPolynomial2DtoMetadata:     return true for valid inputs.");
 
-        psMetadataConfigWrite (md, "test.md");
+        // psMetadataConfigWrite (md, "test.md");
 
         //XXX        ok (0, "these tests are relying on the ORDER of the MD components not the NAMES");
@@ -249,10 +249,10 @@
     //Return a valid metadata containing a polynomial-metadata structure
     {
-        diag ("example of 2DtoMD using the names not the sequence");
+        note ("example of 2DtoMD using the names not the sequence");
 
         ok( psPolynomial2DtoMetadata(md, p2d, "polyMD"),
             "psPolynomial2DtoMetadata:     return true for valid inputs.");
 
-        psMetadataConfigWrite (md, "test.md");
+        // psMetadataConfigWrite (md, "test.md");
 
         // of the components.  these seem like irrelevant tests.
@@ -418,5 +418,5 @@
 void test3Dcase(void)
 {
-    diag("  >>>Test 3:  psPolynomial3DtoMetadata & psPolynomial3DfromMetadata functions");
+    note("  >>>Test 3:  psPolynomial3DtoMetadata & psPolynomial3DfromMetadata functions");
     psMetadata *md = psMetadataAlloc();
     psPolynomial3D *p3d = psPolynomial3DAlloc(PS_POLYNOMIAL_ORD, 1, 1, 1);
@@ -616,5 +616,5 @@
 void test4Dcase(void)
 {
-    diag("  >>>Test 4:  psPolynomial4DtoMetadata & psPolynomial4DfromMetadata functions");
+    note("  >>>Test 4:  psPolynomial4DtoMetadata & psPolynomial4DfromMetadata functions");
     psMetadata *md = psMetadataAlloc();
     psPolynomial4D *p4d = psPolynomial4DAlloc(PS_POLYNOMIAL_ORD, 1, 1, 1, 1);
Index: /trunk/psLib/test/types/tap_psMetadata_printing.c
===================================================================
--- /trunk/psLib/test/types/tap_psMetadata_printing.c	(revision 10818)
+++ /trunk/psLib/test/types/tap_psMetadata_printing.c	(revision 10819)
@@ -23,7 +23,7 @@
 int main(void)
 {
-    plan_tests(30);
-
-    diag("psMetadataPrint and psMetadataItemPrint tests");
+    plan_tests(33);
+
+    note("psMetadataPrint and psMetadataItemPrint tests");
 
     testMetaPrint();
@@ -180,5 +180,5 @@
 void testMetaPrint(void)
 {
-    diag("  >>Test 1:  psMetadataPrint");
+    note("  >>Test 1:  psMetadataPrint");
     FILE *fd = fopen("psMetadataPrint.out", "w+");
     FILE *fd_read = fopen("Makefile", "r");
@@ -268,5 +268,5 @@
 void testMetaItemPrint(void)
 {
-    diag("  >>Test2:  psMetadataItemPrint");
+    note("  >>Test2:  psMetadataItemPrint");
     FILE *fd;
     //bool psMetadataItemPrint(FILE * fd, const char *format, const psMetadataItem* item)
@@ -402,4 +402,5 @@
     {
         fclose(fd);
+        unlink ("psMetadataItemPrint.out");
         psFree(item1);
         psFree(item2);
Index: /trunk/psLib/test/types/tap_psPixels_all.c
===================================================================
--- /trunk/psLib/test/types/tap_psPixels_all.c	(revision 10818)
+++ /trunk/psLib/test/types/tap_psPixels_all.c	(revision 10819)
@@ -23,7 +23,7 @@
 int main(void)
 {
-    plan_tests(38);
-
-    diag("Tests for psPixels Functions");
+    plan_tests(41);
+
+    note("Tests for psPixels Functions");
 
     testPixelsCreate();
@@ -35,5 +35,5 @@
 void testPixelsCreate(void)
 {
-    diag("  >>>Test 1:  psPixels Creation Fxns");
+    note("  >>>Test 1:  psPixels Creation Fxns");
 
     //Return allocated psPixels of length 0 with NULL data.
@@ -123,5 +123,5 @@
 void testPixelsManip(void)
 {
-    diag("  >>>Test 2:  psPixels Manipulation Fxns");
+    note("  >>>Test 2:  psPixels Manipulation Fxns");
 
     //Tests for psPixelsSet