Index: /trunk/psLib/test/astronomy/verified/tst_psMetadata_01.stderr
===================================================================
--- /trunk/psLib/test/astronomy/verified/tst_psMetadata_01.stderr	(revision 1622)
+++ /trunk/psLib/test/astronomy/verified/tst_psMetadata_01.stderr	(revision 1623)
@@ -1,4 +1,6 @@
-<DATE><TIME>|<HOST>|E|psMetadataFRead|Null FITS file descriptor not allowed
-<DATE><TIME>|<HOST>|E|psMetadataFRead|Null extName and extNum = 0 not allowed
-<DATE><TIME>|<HOST>|E|psMetadataFRead|FITS error while locating header 22: tried to move past end of file
-<DATE><TIME>|<HOST>|E|psMetadataFRead|FITS error while locating header AARGH: illegal HDU number
+<DATE><TIME>|<HOST>|E|psMetadataReadH|Null fileName not allowed
+<DATE><TIME>|<HOST>|E|psMetadataReadH|FITS error while opening file: missing.dat could not open the named file
+<DATE><TIME>|<HOST>|E|psMetadataReadH|Couldn't close FITS file. FITS error: NULL input pointer
+<DATE><TIME>|<HOST>|E|psMetadataReadH|Null extName and extNum = 0 not allowed
+<DATE><TIME>|<HOST>|E|psMetadataReadH|FITS error while locating header 22: tried to move past end of file
+<DATE><TIME>|<HOST>|E|psMetadataReadH|FITS error while locating header AARGH: illegal HDU number
Index: /trunk/psLib/test/astronomy/verified/tst_psMetadata_01.stdout
===================================================================
--- /trunk/psLib/test/astronomy/verified/tst_psMetadata_01.stdout	(revision 1622)
+++ /trunk/psLib/test/astronomy/verified/tst_psMetadata_01.stdout	(revision 1623)
@@ -4,6 +4,4 @@
 *             TestType: Positive                                                   *
 \**********************************************************************************/
-
-FITS file open status: OK - no error
 
 Contents of metadata list:
@@ -26,6 +24,4 @@
 *             TestType: Positive                                                   *
 \**********************************************************************************/
-
-FITS file open status: OK - no error
 
 Contents of metadata list:
@@ -66,6 +62,4 @@
 *             TestType: Positive                                                   *
 \**********************************************************************************/
-
-FITS file open status: OK - no error
 
 Contents of metadata list:
@@ -124,16 +118,27 @@
 /***************************** TESTPOINT ******************************************\
 *             TestFile: tst_psMetadata_01.c                                        *
-*            TestPoint: psMetadata{Test E - Attempt to use null file descriptor}   *
+*            TestPoint: psMetadata{Test E - Attempt to use null filename}          *
 *             TestType: Negative                                                   *
-*    ExpectedErrorText: Null FITS file descriptor not allowed                      *
+*    ExpectedErrorText: Null fileName not allowed                                  *
 *  ExpectedStatusValue: 0                                                          *
 \**********************************************************************************/
 
 
----> TESTPOINT PASSED (psMetadata{Test E - Attempt to use null file descriptor} | tst_psMetadata_01.c)
+---> TESTPOINT PASSED (psMetadata{Test E - Attempt to use null filename} | tst_psMetadata_01.c)
 
 /***************************** TESTPOINT ******************************************\
 *             TestFile: tst_psMetadata_01.c                                        *
-*            TestPoint: psMetadata{Test F - Attempt to use two null inputs}        *
+*            TestPoint: psMetadata{Test F - Attempt to open nonexistant file}      *
+*             TestType: Negative                                                   *
+*    ExpectedErrorText: FITS error while opening file: missing.dat...Couldn't close FITS file... *
+*  ExpectedStatusValue: 0                                                          *
+\**********************************************************************************/
+
+
+---> TESTPOINT PASSED (psMetadata{Test F - Attempt to open nonexistant file} | tst_psMetadata_01.c)
+
+/***************************** TESTPOINT ******************************************\
+*             TestFile: tst_psMetadata_01.c                                        *
+*            TestPoint: psMetadata{Test G - Attempt to use two null inputs}        *
 *             TestType: Negative                                                   *
 *    ExpectedErrorText: Null extName and extNum = 0 not allowed                    *
@@ -142,9 +147,9 @@
 
 
----> TESTPOINT PASSED (psMetadata{Test F - Attempt to use two null inputs} | tst_psMetadata_01.c)
+---> TESTPOINT PASSED (psMetadata{Test G - Attempt to use two null inputs} | tst_psMetadata_01.c)
 
 /***************************** TESTPOINT ******************************************\
 *             TestFile: tst_psMetadata_01.c                                        *
-*            TestPoint: psMetadata{Test G - Attempt to use bad extNum}             *
+*            TestPoint: psMetadata{Test H - Attempt to use bad extNum}             *
 *             TestType: Negative                                                   *
 *    ExpectedErrorText: FITS error while locating header 22: tried to move past end of file *
@@ -153,9 +158,9 @@
 
 
----> TESTPOINT PASSED (psMetadata{Test G - Attempt to use bad extNum} | tst_psMetadata_01.c)
+---> TESTPOINT PASSED (psMetadata{Test H - Attempt to use bad extNum} | tst_psMetadata_01.c)
 
 /***************************** TESTPOINT ******************************************\
 *             TestFile: tst_psMetadata_01.c                                        *
-*            TestPoint: psMetadata{Test H - Attempt to use bad extName}            *
+*            TestPoint: psMetadata{Test I - Attempt to use bad extName}            *
 *             TestType: Negative                                                   *
 *    ExpectedErrorText: FITS error while locating header AARGH: illegal HDU number *
@@ -164,13 +169,13 @@
 
 
----> TESTPOINT PASSED (psMetadata{Test H - Attempt to use bad extName} | tst_psMetadata_01.c)
+---> TESTPOINT PASSED (psMetadata{Test I - Attempt to use bad extName} | tst_psMetadata_01.c)
 
 /***************************** TESTPOINT ******************************************\
 *             TestFile: tst_psMetadata_01.c                                        *
-*            TestPoint: psMetadata{Test I - Free psMetadata}                       *
+*            TestPoint: psMetadata{Test J - Free psMetadata}                       *
 *             TestType: Positive                                                   *
 \**********************************************************************************/
 
 
----> TESTPOINT PASSED (psMetadata{Test I - Free psMetadata} | tst_psMetadata_01.c)
+---> TESTPOINT PASSED (psMetadata{Test J - Free psMetadata} | tst_psMetadata_01.c)