Index: /trunk/psLib/test/types/metaconf.in
===================================================================
--- /trunk/psLib/test/types/metaconf.in	(revision 9894)
+++ /trunk/psLib/test/types/metaconf.in	(revision 9895)
@@ -9,4 +9,5 @@
 item6-1          S32       ~
 item7            S64       555
+item7-1          S64       555 x
 item8            S8        3
 item8            S8        5
@@ -19,4 +20,5 @@
 itemu3           U8        1
 itemu4           U64       1634
+itemu4-1         U64       1634 1
 item9            BOOL      F                # I am a boolean2
 item10           S16       16
@@ -31,9 +33,9 @@
 @vector7  U32 1 2 3 4 5
 @vector8  U64 1 1
-@vector9  F32 1.0 2.0 3.0 4.0 5.0   # I am a vector
+@vector9  F32 1.0 2.3 3.1 4.5 5.0   # I am a vector
 @vector10 F64 1.0 2.0 3.0 4.0 5.0
 @vector11 C64 1.0 2.0 3.0 4.0 5.0
 @@@vector12 F64 1.0 2.0 3.0 4.0 5.0
-time01           TAI       1970-01-01T00:16:39Z  # I am time
+time01           TT        1970-01-01T00:16:39Z  # I am time
 time02           UTC       NULL     # I am time2
 
Index: /trunk/psLib/test/types/tap_psMetadataConfig_input.c
===================================================================
--- /trunk/psLib/test/types/tap_psMetadataConfig_input.c	(revision 9894)
+++ /trunk/psLib/test/types/tap_psMetadataConfig_input.c	(revision 9895)
@@ -25,5 +25,5 @@
 int main(void)
 {
-    plan_tests(25);
+    plan_tests(33);
 
     diag("Tests for psMetadataConfig Input Functions");
@@ -71,38 +71,61 @@
         out = NULL;
     }
-    //Return true for valid inputs
+    //Return true for valid inputs - overwrite = false
     {
         out = psMetadataConfigRead(out, &nfail, "metaconf.in", false);
         psMetadataItem *tempItem = psMetadataGet(out, PS_LIST_HEAD);
-        ok( out != NULL,
+        ok( out != NULL && nfail == 25,
             "psMetadataConfigRead:           return correct metadata for valid inputs.");
-        if (nfail != 0)
-            printf("\n nfail = %d   list->n = %ld\n", nfail, md->list->n);
-        skip_start(  tempItem == NULL, 1,
+        skip_start(  tempItem == NULL, 6,
                      "Skipping 1 tests because metadata container is empty!");
         ok_str( tempItem->name, "item1",
-                "psMetadataConfigRead:           return correct metadataItem from "
-                "returned metadata.");
-        skip_end();
-        psMetadataConfigWrite(out, "Test2.txt");
-    }
-    //Return true for valid inputs
+                "psMetadataConfigRead:           return correct metadataItem name from "
+                "returned metadata.");
+        ok( tempItem->type == PS_DATA_BOOL && tempItem->data.B == true,
+            "psMetadataConfigRead:           return correct metadataItem data from "
+            "returned metadata.");
+        ok_str( tempItem->comment, "I am a boolean",
+                "psMetadataConfigRead:           return correct metadataItem comment from "
+                "returned metadata.");
+        tempItem = psMetadataGet(out, PS_LIST_TAIL);
+        ok_str( tempItem->name, "meta1",
+                "psMetadataConfigRead:           return correct metadataItem name from "
+                "returned metadata.");
+        ok( tempItem->type == PS_DATA_METADATA &&
+            ((psMetadata*)(tempItem->data.V))->list->n == 1
+            && strlen(tempItem->comment) == 0,
+            "psMetadataConfigRead:          return correct metadataItem data from "
+            "returned metadata.");
+        skip_end();
+    }
+    //Return true for valid inputs - overwrite = true
     {
         psFree(out);
         out = NULL;
         out = psMetadataConfigRead(out, &nfail, "metaconf.in", true);
-        //        psMetadataPrint(NULL, out, 2);
-        psMetadataItem *tempItem = psMetadataGet(out, PS_LIST_HEAD);
-        ok( out != NULL,
-            "psMetadataConfigRead:           return correct metadata for valid inputs.");
-        if (nfail != 0)
-            printf("\n nfail = %d   list->n = %ld\n", nfail, md->list->n);
-        skip_start(  tempItem == NULL, 1,
+        psMetadataItem *tempItem = psMetadataGet(out, PS_LIST_HEAD);
+        ok( out != NULL  && nfail == 21,
+            "psMetadataConfigRead:          return correct metadata for valid inputs.");
+        skip_start(  tempItem == NULL, 6,
                      "Skipping 1 tests because metadata container is empty!");
         ok_str( tempItem->name, "item1",
-                "psMetadataConfigRead:           return correct metadataItem from "
-                "returned metadata.");
-        skip_end();
-        psMetadataConfigWrite(out, "Test.txt");
+                "psMetadataConfigRead:          return correct metadataItem name from "
+                "returned metadata.");
+        ok( tempItem->type == PS_DATA_BOOL && tempItem->data.B == false,
+            "psMetadataConfigRead:          return correct metadataItem data from "
+            "returned metadata.");
+        ok_str( tempItem->comment, "I am a boolean2",
+                "psMetadataConfigRead:          return correct metadataItem comment from "
+                "returned metadata.");
+        tempItem = psMetadataGet(out, PS_LIST_TAIL);
+        ok_str( tempItem->name, "DD2",
+                "psMetadataConfigRead:          return correct metadataItem name from "
+                "returned metadata.");
+        ok( tempItem->type == PS_DATA_METADATA &&
+            ((psMetadata*)(tempItem->data.V))->list->n == 1
+            && strlen(tempItem->comment) == 0,
+            "psMetadataConfigRead:          return correct metadataItem data from "
+            "returned metadata.");
+        skip_end();
     }
 
@@ -143,5 +166,5 @@
         out = psMetadataConfigParse(out, &nfail, NULL, false);
         ok( out == NULL,
-            "psMetadataConfigParse:          return NULL for NULL string input.");
+            "psMetadataConfigParse:         return NULL for NULL string input.");
     }
     //Return empty metadata for incorrect string input