Index: /trunk/psLib/test/astronomy/verified/tst_psMetadata_01.stdout
===================================================================
--- /trunk/psLib/test/astronomy/verified/tst_psMetadata_01.stdout	(revision 2612)
+++ /trunk/psLib/test/astronomy/verified/tst_psMetadata_01.stdout	(revision 2613)
@@ -9,5 +9,5 @@
  Key Name:   BITPIX  Key pType: 260  Key mdType: 0  Key Value:               8  Key Comment: number of bits per data pixel
  Key Name:    NAXIS  Key pType: 260  Key mdType: 0  Key Value:               0  Key Comment: number of data axes
- Key Name:  HISTORY  Key pType: 0  Key mdType: 2  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T11:11:18
+ Key Name:  HISTORY  Key pType: 0  Key mdType: 2  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
 
 Contents of metadata table:
@@ -15,5 +15,5 @@
  Key Name:   SIMPLE  Key pType: 256  Key mdType: 0  Key Value:               1  Key Comment: file does conform to FITS standard
  Key Name:   BITPIX  Key pType: 260  Key mdType: 0  Key Value:               8  Key Comment: number of bits per data pixel
- Key Name:  HISTORY  Key pType: 0  Key mdType: 2  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T11:11:18
+ Key Name:  HISTORY  Key pType: 0  Key mdType: 2  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
 
 ---> TESTPOINT PASSED (psMetadata{Test A - Read 1st hdr from simple FITS file} | tst_psMetadata_01.c)
@@ -34,8 +34,8 @@
  Key Name:   BITPIX  Key pType: 260  Key mdType: 0  Key Value:             -64  Key Comment: number of bits per data pixel
  Key Name:  EXTNAME  Key pType: 0  Key mdType: 2  Key Value:     'MY_DATA_1'  Key Comment: 
- Key Name:  HISTORY  Key pType: 0  Key mdType: 2  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T13:14:45
- Key Name:  HISTORY  Key pType: 0  Key mdType: 2  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T13:15:29
- Key Name:  HISTORY  Key pType: 0  Key mdType: 2  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T13:21:18
- Key Name:  HISTORY  Key pType: 0  Key mdType: 2  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T13:21:46
+ Key Name:  HISTORY  Key pType: 0  Key mdType: 2  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
+ Key Name:  HISTORY  Key pType: 0  Key mdType: 2  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
+ Key Name:  HISTORY  Key pType: 0  Key mdType: 2  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
+ Key Name:  HISTORY  Key pType: 0  Key mdType: 2  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
 
 Contents of metadata table:
@@ -49,8 +49,8 @@
  Key Name:   GCOUNT  Key pType: 260  Key mdType: 0  Key Value:               1  Key Comment: required keyword; must = 1
  Key Name:  HISTORY  Key pType: 0  Key mdType: 1  Key Value:                  Key Comment: 
-    Key Name:  HISTORY  Key pType: 0  Key mdType: 2  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T13:14:45
-    Key Name:  HISTORY  Key pType: 0  Key mdType: 2  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T13:15:29
-    Key Name:  HISTORY  Key pType: 0  Key mdType: 2  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T13:21:18
-    Key Name:  HISTORY  Key pType: 0  Key mdType: 2  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T13:21:46
+    Key Name:  HISTORY  Key pType: 0  Key mdType: 2  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
+    Key Name:  HISTORY  Key pType: 0  Key mdType: 2  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
+    Key Name:  HISTORY  Key pType: 0  Key mdType: 2  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
+    Key Name:  HISTORY  Key pType: 0  Key mdType: 2  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
  Key Name:  EXTNAME  Key pType: 0  Key mdType: 2  Key Value:     'MY_DATA_1'  Key Comment: 
 
@@ -71,6 +71,6 @@
  Key Name:   GCOUNT  Key pType: 260  Key mdType: 0  Key Value:               1  Key Comment: required keyword; must = 1
  Key Name:  EXTNAME  Key pType: 0  Key mdType: 2  Key Value:     'MY_DATA_2'  Key Comment: 
- Key Name:  HISTORY  Key pType: 0  Key mdType: 2  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T13:22:12
- Key Name:  HISTORY  Key pType: 0  Key mdType: 2  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T13:22:52
+ Key Name:  HISTORY  Key pType: 0  Key mdType: 2  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
+ Key Name:  HISTORY  Key pType: 0  Key mdType: 2  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
 
 Contents of metadata table:
@@ -82,6 +82,6 @@
  Key Name:   BITPIX  Key pType: 260  Key mdType: 0  Key Value:             -64  Key Comment: number of bits per data pixel
  Key Name:  HISTORY  Key pType: 0  Key mdType: 1  Key Value:                  Key Comment: 
-    Key Name:  HISTORY  Key pType: 0  Key mdType: 2  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T13:22:12
-    Key Name:  HISTORY  Key pType: 0  Key mdType: 2  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T13:22:52
+    Key Name:  HISTORY  Key pType: 0  Key mdType: 2  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
+    Key Name:  HISTORY  Key pType: 0  Key mdType: 2  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
  Key Name:  EXTNAME  Key pType: 0  Key mdType: 2  Key Value:     'MY_DATA_2'  Key Comment: 
 
@@ -104,6 +104,6 @@
  Key Name:   GCOUNT  Key pType: 260  Key mdType: 0  Key Value:               1  Key Comment: required keyword; must = 1
  Key Name:  EXTNAME  Key pType: 0  Key mdType: 2  Key Value:     'MY_DATA_2'  Key Comment: 
- Key Name:  HISTORY  Key pType: 0  Key mdType: 2  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T13:22:12
- Key Name:  HISTORY  Key pType: 0  Key mdType: 2  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T13:22:52
+ Key Name:  HISTORY  Key pType: 0  Key mdType: 2  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
+ Key Name:  HISTORY  Key pType: 0  Key mdType: 2  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
 
 Contents of metadata table:
Index: /trunk/psLib/test/astronomy/verified/tst_psMetadata_02.stderr
===================================================================
--- /trunk/psLib/test/astronomy/verified/tst_psMetadata_02.stderr	(revision 2612)
+++ /trunk/psLib/test/astronomy/verified/tst_psMetadata_02.stderr	(revision 2613)
@@ -4,5 +4,5 @@
     Unallowable operation: name is NULL.
 <DATE><TIME>|<HOST>|E|psMetadataItemAllocV (psMetadata.c:<LINENO>)
-    Specified psMetadataType, 7, is not supported.
+    Specified psMetadataType, 11, is not supported.
 <DATE><TIME>|<HOST>|E|psMetadataAddItem (psMetadata.c:<LINENO>)
     Unallowable operation: md is NULL.
Index: /trunk/psLib/test/astronomy/verified/tst_psMetadata_02.stdout
===================================================================
--- /trunk/psLib/test/astronomy/verified/tst_psMetadata_02.stdout	(revision 2612)
+++ /trunk/psLib/test/astronomy/verified/tst_psMetadata_02.stdout	(revision 2613)
@@ -5,9 +5,9 @@
 \**********************************************************************************/
 
-Key Name:  myItem1  Key Type:  1  Key Value:               1  Key Comment: I am a boolean
-Key Name:  myItem2  Key Type:  2  Key Value:             111  Key Comment: I am a signed integer
-Key Name:  myItem3  Key Type:  3  Key Value:         222.222  Key Comment: I am a single precision floating point
-Key Name:  myItem4  Key Type:  4  Key Value:         333.333  Key Comment: I am a double precision floating point
-Key Name:  myItem5  Key Type:  5  Key Value:     HELLO WORLD  Key Comment: I am a string
+Key Name:  myItem1  Key pType: 256  Key mdType:  0  Key Value:               1  Key Comment: I am a boolean
+Key Name:  myItem2  Key pType: 260  Key mdType:  0  Key Value:             111  Key Comment: I am a signed integer
+Key Name:  myItem3  Key pType: 1028  Key mdType:  0  Key Value:         222.222  Key Comment: I am a single precision floating point
+Key Name:  myItem4  Key pType: 1032  Key mdType:  0  Key Value:         333.333  Key Comment: I am a double precision floating point
+Key Name:  myItem5  Key pType:  0  Key mdType:  2  Key Value:     HELLO WORLD  Key Comment: I am a string
 
 ---> TESTPOINT PASSED (psMetadata{Test A - Allocate metadata items} | tst_psMetadata_02.c)
Index: /trunk/psLib/test/astronomy/verified/tst_psMetadata_03.stdout
===================================================================
--- /trunk/psLib/test/astronomy/verified/tst_psMetadata_03.stdout	(revision 2612)
+++ /trunk/psLib/test/astronomy/verified/tst_psMetadata_03.stdout	(revision 2613)
@@ -5,8 +5,8 @@
 \**********************************************************************************/
 
-Key Name:  myItem1  Key Type:  1  Key Value:               1  Key Comment: I am a boolean
-Key Name:  myItem2  Key Type:  2  Key Value:              55  Key Comment: I am a integer
-Key Name:  myItem3  Key Type:  1  Key Value:               0  Key Comment: I am a boolean
-Key Name:  myItem4  Key Type:  2  Key Value:              66  Key Comment: I am a integer
+Key Name:  myItem1  Key pType: 256  Key mdType:  0  Key Value:               1  Key Comment: I am a boolean
+Key Name:  myItem2  Key pType: 260  Key mdType:  0  Key Value:              55  Key Comment: I am a integer
+Key Name:  myItem3  Key pType: 256  Key mdType:  0  Key Value:               0  Key Comment: I am a boolean
+Key Name:  myItem4  Key pType: 260  Key mdType:  0  Key Value:              66  Key Comment: I am a integer
 
 ---> TESTPOINT PASSED (psMetadata{Test A - Allocate metadata items} | tst_psMetadata_03.c)
@@ -65,5 +65,5 @@
 /***************************** TESTPOINT ******************************************\
 *             TestFile: tst_psMetadata_03.c                                        *
-*            TestPoint: psMetadata{Test H - Attempt to add item to metadata w/o hash table} *
+*            TestPoint: psMetadata{Test G - Attempt to add item to metadata w/o hash table} *
 *             TestType: Negative                                                   *
 *    ExpectedErrorText: Couldn't add item to invalid metadata structure.           *
@@ -72,9 +72,9 @@
 
 
----> TESTPOINT PASSED (psMetadata{Test H - Attempt to add item to invalid metadata w/o hash table} | tst_psMetadata_03.c)
+---> TESTPOINT PASSED (psMetadata{Test G - Attempt to add item to invalid metadata w/o hash table} | tst_psMetadata_03.c)
 
 /***************************** TESTPOINT ******************************************\
 *             TestFile: tst_psMetadata_03.c                                        *
-*            TestPoint: psMetadata{Test J - Attempt to add item to metadata w/o link list} *
+*            TestPoint: psMetadata{Test H - Attempt to add item to metadata w/o link list} *
 *             TestType: Negative                                                   *
 *    ExpectedErrorText: Couldn't add item to invalid metadata structure.           *
@@ -83,9 +83,9 @@
 
 
----> TESTPOINT PASSED (psMetadata{Test J - Attempt to add item to invalid metadata w/o link list} | tst_psMetadata_03.c)
+---> TESTPOINT PASSED (psMetadata{Test H - Attempt to add item to invalid metadata w/o link list} | tst_psMetadata_03.c)
 
 /***************************** TESTPOINT ******************************************\
 *             TestFile: tst_psMetadata_03.c                                        *
-*            TestPoint: psMetadata{Test K - Attempt to add item with null name}    *
+*            TestPoint: psMetadata{Test I - Attempt to add item with null name}    *
 *             TestType: Negative                                                   *
 *    ExpectedErrorText: Couldn't add item with null name.                          *
@@ -94,9 +94,9 @@
 
 
----> TESTPOINT PASSED (psMetadata{Test K - Attempt to add item with null name} | tst_psMetadata_03.c)
+---> TESTPOINT PASSED (psMetadata{Test I - Attempt to add item with null name} | tst_psMetadata_03.c)
 
 /***************************** TESTPOINT ******************************************\
 *             TestFile: tst_psMetadata_03.c                                        *
-*            TestPoint: psMetadata{Test L - Attempt to add item to metadata w/o hash table} *
+*            TestPoint: psMetadata{Test J - Attempt to add item to metadata w/o hash table} *
 *             TestType: Negative                                                   *
 *    ExpectedErrorText: Couldn't add item to invalid metadata structure.           *
@@ -105,13 +105,13 @@
 
 
----> TESTPOINT PASSED (psMetadata{Test L - Attempt to add item to invalid metadata w/o hash table} | tst_psMetadata_03.c)
+---> TESTPOINT PASSED (psMetadata{Test J - Attempt to add item to invalid metadata w/o hash table} | tst_psMetadata_03.c)
 
 /***************************** TESTPOINT ******************************************\
 *             TestFile: tst_psMetadata_03.c                                        *
-*            TestPoint: psMetadata{Test G - Free psMetadata}                       *
+*            TestPoint: psMetadata{Test K - Free psMetadata}                       *
 *             TestType: Positive                                                   *
 \**********************************************************************************/
 
 
----> TESTPOINT PASSED (psMetadata{Test G - Free psMetadata} | tst_psMetadata_03.c)
+---> TESTPOINT PASSED (psMetadata{Test K - Free psMetadata} | tst_psMetadata_03.c)
 
Index: /trunk/psLib/test/astronomy/verified/tst_psMetadata_04.stdout
===================================================================
--- /trunk/psLib/test/astronomy/verified/tst_psMetadata_04.stdout	(revision 2612)
+++ /trunk/psLib/test/astronomy/verified/tst_psMetadata_04.stdout	(revision 2613)
@@ -5,8 +5,8 @@
 \**********************************************************************************/
 
-Key Name:  myItem1  Key Type:  1  Key Value:               1  Key Comment: I am a boolean
-Key Name:  myItem2  Key Type:  2  Key Value:              55  Key Comment: I am a integer
-Key Name:  myItem3  Key Type:  1  Key Value:               0  Key Comment: I am a boolean
-Key Name:  myItem4  Key Type:  2  Key Value:              66  Key Comment: I am a integer
+Key Name:  myItem1  Key pType: 256  Key mdType:  0  Key Value:               1  Key Comment: I am a boolean
+Key Name:  myItem2  Key pType: 260  Key mdType:  0  Key Value:              55  Key Comment: I am a integer
+Key Name:  myItem3  Key pType: 256  Key mdType:  0  Key Value:               0  Key Comment: I am a boolean
+Key Name:  myItem4  Key pType: 260  Key mdType:  0  Key Value:              66  Key Comment: I am a integer
 
 ---> TESTPOINT PASSED (psMetadata{Test A - Allocate metadata items} | tst_psMetadata_04.c)
@@ -89,5 +89,5 @@
 /***************************** TESTPOINT ******************************************\
 *             TestFile: tst_psMetadata_04.c                                        *
-*            TestPoint: psMetadata{Test J - Attemp to look up with an invalid metadata} *
+*            TestPoint: psMetadata{Test I - Attemp to look up with an invalid metadata} *
 *             TestType: Negative                                                   *
 *    ExpectedErrorText: Lookup item with invalid metadata object.                  *
@@ -96,9 +96,9 @@
 
 
----> TESTPOINT PASSED (psMetadata{Test J - Attempt to lookup an invalid metadata object.} | tst_psMetadata_04.c)
+---> TESTPOINT PASSED (psMetadata{Test I - Attempt to lookup an invalid metadata object.} | tst_psMetadata_04.c)
 
 /***************************** TESTPOINT ******************************************\
 *             TestFile: tst_psMetadata_04.c                                        *
-*            TestPoint: psMetadata{Test K - Attemp to get item with an invalid metadata} *
+*            TestPoint: psMetadata{Test J - Attemp to get item with an invalid metadata} *
 *             TestType: Negative                                                   *
 *    ExpectedErrorText: Get item with invalid metadata object.                     *
@@ -107,13 +107,13 @@
 
 
----> TESTPOINT PASSED (psMetadata{Test K - Attempt to get item with  invalid metadata object.} | tst_psMetadata_04.c)
+---> TESTPOINT PASSED (psMetadata{Test J - Attempt to get item with  invalid metadata object.} | tst_psMetadata_04.c)
 
 /***************************** TESTPOINT ******************************************\
 *             TestFile: tst_psMetadata_04.c                                        *
-*            TestPoint: psMetadata{Test I - Free psMetadata}                       *
+*            TestPoint: psMetadata{Test K - Free psMetadata}                       *
 *             TestType: Positive                                                   *
 \**********************************************************************************/
 
 
----> TESTPOINT PASSED (psMetadata{Test I - Free psMetadata} | tst_psMetadata_04.c)
+---> TESTPOINT PASSED (psMetadata{Test K - Free psMetadata} | tst_psMetadata_04.c)
 
Index: /trunk/psLib/test/astronomy/verified/tst_psMetadata_05.stderr
===================================================================
--- /trunk/psLib/test/astronomy/verified/tst_psMetadata_05.stderr	(revision 2612)
+++ /trunk/psLib/test/astronomy/verified/tst_psMetadata_05.stderr	(revision 2613)
@@ -1,18 +1,4 @@
-<DATE><TIME>|<HOST>|E|psMetadataItemAllocV (psMetadata.c:<LINENO>)
-    Specified psMetadataType, 11, is not supported.
-<DATE><TIME>|<HOST>|E|psMetadataGetPrevious (psMetadata.c:<LINENO>)
-    Unallowable operation: md->list is NULL.
 <DATE><TIME>|<HOST>|E|psMetadataItemPrint (psMetadataIO.c:<LINENO>)
-    Unallowable operation: metadataItem is NULL.
-<DATE><TIME>|<HOST>|E|psMetadataSetIterator (psMetadata.c:<LINENO>)
-    Unallowable operation: md is NULL.
-<DATE><TIME>|<HOST>|E|psMetadataSetIterator (psMetadata.c:<LINENO>)
-    Unallowable operation: md->list is NULL.
-<DATE><TIME>|<HOST>|E|psMetadataGetNext (psMetadata.c:<LINENO>)
-    Unallowable operation: md is NULL.
-<DATE><TIME>|<HOST>|E|psMetadataGetNext (psMetadata.c:<LINENO>)
-    Unallowable operation: md->list is NULL.
-<DATE><TIME>|<HOST>|E|psMetadataGetPrevious (psMetadata.c:<LINENO>)
-    Unallowable operation: md is NULL.
+    Specified psMetadataType, 10, is not supported.
 <DATE><TIME>|<HOST>|E|psMetadataItemPrint (psMetadataIO.c:<LINENO>)
     Unallowable operation: fd is NULL.
Index: /trunk/psLib/test/astronomy/verified/tst_psMetadata_05.stdout
===================================================================
--- /trunk/psLib/test/astronomy/verified/tst_psMetadata_05.stdout	(revision 2612)
+++ /trunk/psLib/test/astronomy/verified/tst_psMetadata_05.stdout	(revision 2613)
@@ -5,49 +5,10 @@
 \**********************************************************************************/
 
-Key Name:  myItem1  Key Type:  1  Key Value:               1  Key Comment: I am a boolean
-Key Name:  myItem2  Key Type:  2  Key Value:              55  Key Comment: I am a integer
-Key Name:  myItem3  Key Type:  1  Key Value:               0  Key Comment: I am a boolean
-Key Name:  myItem4  Key Type:  2  Key Value:              66  Key Comment: I am a integer
+Key Name:  myItem1  Key pType: 256  Key mdType:  0  Key Value:               1  Key Comment: I am a boolean
+Key Name:  myItem2  Key pType: 260  Key mdType:  0  Key Value:              55  Key Comment: I am a integer
+Key Name:  myItem3  Key pType: 256  Key mdType:  0  Key Value:               0  Key Comment: I am a boolean
+Key Name:  myItem4  Key pType: 260  Key mdType:  0  Key Value:              66  Key Comment: I am a integer
 
 ---> TESTPOINT PASSED (psMetadata{Test A - Allocate metadata items} | tst_psMetadata_05.c)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psMetadata_05.c                                        *
-*            TestPoint: psMetadata{Test B - Set iterator at second index}          *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-
----> TESTPOINT PASSED (psMetadata{Test B - Set iterator at second index} | tst_psMetadata_05.c)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psMetadata_05.c                                        *
-*            TestPoint: psMetadata{Test C - Get next item at index}                *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-Found item named myItem1
-
----> TESTPOINT PASSED (psMetadata{Test C - Get next item at index} | tst_psMetadata_05.c)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psMetadata_05.c                                        *
-*            TestPoint: psMetadata{Test D - Get next item at index and string}     *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-Found item named myItem1
-
----> TESTPOINT PASSED (psMetadata{Test D - Get next item at index and string} | tst_psMetadata_05.c)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psMetadata_05.c                                        *
-*            TestPoint: psMetadata{Test E - Get previous item at index}            *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-Found item named myItem4
-
----> TESTPOINT PASSED (psMetadata{Test E - Get previous item at index} | tst_psMetadata_05.c)
 
 /***************************** TESTPOINT ******************************************\
@@ -59,37 +20,4 @@
 
 ---> TESTPOINT PASSED (psMetadata{Test F - Write metadata item to file} | tst_psMetadata_05.c)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psMetadata_05.c                                        *
-*            TestPoint: psMetadata{Test G - Attempt to use null metadata with setIterator} *
-*             TestType: Negative                                                   *
-*    ExpectedErrorText: Null metadata collection not allowed                       *
-*  ExpectedStatusValue: 0                                                          *
-\**********************************************************************************/
-
-
----> TESTPOINT PASSED (psMetadata{Test G - Attempt to use null metadata with setIterator} | tst_psMetadata_05.c)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psMetadata_05.c                                        *
-*            TestPoint: psMetadata{Test H - Attempt to use null metadata with getNext} *
-*             TestType: Negative                                                   *
-*    ExpectedErrorText: Null metadata collection not allowed                       *
-*  ExpectedStatusValue: 0                                                          *
-\**********************************************************************************/
-
-
----> TESTPOINT PASSED (psMetadata{Test H - Attempt to use null metadata with getNext} | tst_psMetadata_05.c)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psMetadata_05.c                                        *
-*            TestPoint: psMetadata{Test I - Attempt to use null metadata with getPrevious} *
-*             TestType: Negative                                                   *
-*    ExpectedErrorText: Null metadata collection not allowed                       *
-*  ExpectedStatusValue: 0                                                          *
-\**********************************************************************************/
-
-
----> TESTPOINT PASSED (psMetadata{Test I - Attempt to use null metadata with getPrevious} | tst_psMetadata_05.c)
 
 /***************************** TESTPOINT ******************************************\
Index: /trunk/psLib/test/astronomy/verified/tst_psMetadata_06.stdout
===================================================================
--- /trunk/psLib/test/astronomy/verified/tst_psMetadata_06.stdout	(revision 2612)
+++ /trunk/psLib/test/astronomy/verified/tst_psMetadata_06.stdout	(revision 2613)
@@ -5,9 +5,9 @@
 \**********************************************************************************/
 
-Key Name:  myItem1  Key Type:  1  Key Value:               1  Key Comment: I am a boolean
-Key Name:  myItem1  Key Type:  2  Key Value:             111  Key Comment: I am a signed integer
-Key Name:  myItem1  Key Type:  2  Key Value:             222  Key Comment: I am a signed integer
-Key Name:  myItem2  Key Type:  2  Key Value:             333  Key Comment: I am a signed integer
-Key Name:  myItem2  Key Type:  0  Bad type: 0 Key Comment: I am a folder node
+Key Name:  myItem1  Key pType: 256  Key mdType:  0  Key Value:               1  Key Comment: I am a boolean
+Key Name:  myItem1  Key pType: 260  Key mdType:  0  Key Value:             111  Key Comment: I am a signed integer
+Key Name:  myItem1  Key pType: 260  Key mdType:  0  Key Value:             222  Key Comment: I am a signed integer
+Key Name:  myItem2  Key pType: 260  Key mdType:  0  Key Value:             333  Key Comment: I am a signed integer
+Key Name:  myItem2  Key pType:  0  Key mdType:  1  Key Value:                  Key Comment: I am a folder node
 
 ---> TESTPOINT PASSED (psMetadata{Test A - Allocate metadata and items} | tst_psMetadata_06.c)
Index: /trunk/psLib/test/astronomy/verified/tst_psMetadata_07.stderr
===================================================================
--- /trunk/psLib/test/astronomy/verified/tst_psMetadata_07.stderr	(revision 2613)
+++ /trunk/psLib/test/astronomy/verified/tst_psMetadata_07.stderr	(revision 2613)
@@ -0,0 +1,3 @@
+I/O warning : failed to load external entity "psMetadata"
+<DATE><TIME>|<HOST>|E|psMetadataParseConfigXml (psMetadataIO.c:<LINENO>)
+    Failed to open file 'psMetadata'. Check if it exists and it has the proper permissions.