Index: trunk/psLib/test/types/Makefile.am
===================================================================
--- trunk/psLib/test/types/Makefile.am	(revision 9720)
+++ trunk/psLib/test/types/Makefile.am	(revision 9736)
@@ -29,5 +29,7 @@
 	tap_psBitSet_all \
 	tap_psList_all \
-	tap_psLookupTable_all
+	tap_psLookupTable_all \
+	tap_psMetadataConfig_output \
+	tap_psMetadataConfig_input
 
 if BUILD_TESTS
Index: trunk/psLib/test/types/execute_tap
===================================================================
--- trunk/psLib/test/types/execute_tap	(revision 9720)
+++ trunk/psLib/test/types/execute_tap	(revision 9736)
@@ -1,3 +1,3 @@
-make
+make test
 ./tap_psArray_all
 ./tap_psListIterator
@@ -18,2 +18,4 @@
 ./tap_psList_all
 ./tap_psLookupTable_all
+./tap_psMetadataConfig_output
+./tap_psMetadataConfig_input
Index: trunk/psLib/test/types/tap_psMetadata_copying.c
===================================================================
--- trunk/psLib/test/types/tap_psMetadata_copying.c	(revision 9720)
+++ trunk/psLib/test/types/tap_psMetadata_copying.c	(revision 9736)
@@ -23,5 +23,5 @@
 int main(void)
 {
-    plan_tests(34);
+    plan_tests(35);
 
     diag("psMetadataCopy and psMetadataItemCopy tests");
@@ -59,21 +59,29 @@
         out = NULL;
     }
-    //Return NULL for attempt to copy item of unsupported data type
+    //Return NULL for attempt to copy item of unsupported data type - NULL out metadata
+    psMetadataItem *notype = NULL;
     {
         in = psMetadataAlloc();
         psMetadataAddS32(in, PS_LIST_HEAD, "S32", 0, "", 1);
-        psMetadataItem *notype = psMetadataGet(in, PS_LIST_HEAD);
-        //        notype->type = PS_DATA_METADATA_MULTI + 1000;
+        notype = psMetadataGet(in, PS_LIST_HEAD);
         notype->type = -1;
-        psFree(outTest);
-        outTest = NULL;
+        outTest = psMetadataCopy(out, in);
+        ok( outTest == NULL,
+            "psMetadataCopy:  return NULL for metadata with item of bad type.");
+        psFree(out);
+        out = NULL;
+    }
+    //Return NULL for attempt to copy item of unsupported data type - allocated out metadata
+    {
+        out = psMetadataAlloc();
+        psMetadataAddS32(out, PS_LIST_TAIL, "S32", 0, "", 2);
         outTest = psMetadataCopy(out, in);
         ok( outTest == NULL,
             "psMetadataCopy:  return NULL for metadata with item of bad type.");
         notype->type = PS_DATA_S32;
+        psFree(out);
+        out = NULL;
         psFree(in);
         in = NULL;
-        psFree(out);
-        out = NULL;
     }