Index: trunk/psLib/test/astronomy/verified/tst_psMetadata_01.stderr
===================================================================
--- trunk/psLib/test/astronomy/verified/tst_psMetadata_01.stderr	(revision 1729)
+++ trunk/psLib/test/astronomy/verified/tst_psMetadata_01.stderr	(revision 1761)
@@ -1,6 +1,12 @@
-<DATE><TIME>|<HOST>|E|+dataReadHeader|Null fileName not allowed
-<DATE><TIME>|<HOST>|E|+dataReadHeader|FITS error while opening file: missing.dat could not open the named file
-<DATE><TIME>|<HOST>|E|+dataReadHeader|Couldn't close FITS file. FITS error: NULL input pointer
-<DATE><TIME>|<HOST>|E|+dataReadHeader|Null extName and extNum = 0 not allowed
-<DATE><TIME>|<HOST>|E|+dataReadHeader|FITS error while locating header 22: tried to move past end of file
-<DATE><TIME>|<HOST>|E|+dataReadHeader|FITS error while locating header AARGH: illegal HDU number
+<DATE><TIME>|<HOST>|E|psMetadataReadHeader
+    Null fileName not allowed
+<DATE><TIME>|<HOST>|E|psMetadataReadHeader
+    FITS error while opening file: missing.dat could not open the named file
+<DATE><TIME>|<HOST>|E|psMetadataReadHeader
+    Couldn't close FITS file. FITS error: NULL input pointer
+<DATE><TIME>|<HOST>|E|psMetadataReadHeader
+    Null extName and extNum = 0 not allowed
+<DATE><TIME>|<HOST>|E|psMetadataReadHeader
+    FITS error while locating header 22: tried to move past end of file
+<DATE><TIME>|<HOST>|E|psMetadataReadHeader
+    FITS error while locating header AARGH: illegal HDU number
Index: trunk/psLib/test/astronomy/verified/tst_psMetadata_02.stderr
===================================================================
--- trunk/psLib/test/astronomy/verified/tst_psMetadata_02.stderr	(revision 1729)
+++ trunk/psLib/test/astronomy/verified/tst_psMetadata_02.stderr	(revision 1761)
@@ -1,4 +1,8 @@
-<DATE><TIME>|<HOST>|E|+dataItemAllocV|Null value for name not allowed
-<DATE><TIME>|<HOST>|E|+dataItemAllocV|Invalid psMetadataType: 6
-<DATE><TIME>|<HOST>|E|+etadataAddItem|Null metadata collection not allowed
-<DATE><TIME>|<HOST>|E|+etadataAddItem|Null metadata item not allowed
+<DATE><TIME>|<HOST>|E|psMetadataItemAllocV
+    Null value for name not allowed
+<DATE><TIME>|<HOST>|E|psMetadataItemAllocV
+    Invalid psMetadataType: 6
+<DATE><TIME>|<HOST>|E|psMetadataAddItem
+    Null metadata collection not allowed
+<DATE><TIME>|<HOST>|E|psMetadataAddItem
+    Null metadata item not allowed
Index: trunk/psLib/test/astronomy/verified/tst_psMetadata_03.stderr
===================================================================
--- trunk/psLib/test/astronomy/verified/tst_psMetadata_03.stderr	(revision 1729)
+++ trunk/psLib/test/astronomy/verified/tst_psMetadata_03.stderr	(revision 1761)
@@ -1,3 +1,6 @@
-<DATE><TIME>|<HOST>|E|+MetadataRemove|Null metadata collection not allowed
-<DATE><TIME>|<HOST>|E|+MetadataRemove|Couldn't find metadata item. Name: AARGH
-<DATE><TIME>|<HOST>|E|+MetadataRemove|Couldn't find metadata item in list. Index: 22
+<DATE><TIME>|<HOST>|E|psMetadataRemove
+    Null metadata collection not allowed
+<DATE><TIME>|<HOST>|E|psMetadataRemove
+    Couldn't find metadata item. Name: AARGH
+<DATE><TIME>|<HOST>|E|psMetadataRemove
+    Couldn't find metadata item in list. Index: 22
Index: trunk/psLib/test/astronomy/verified/tst_psMetadata_04.stderr
===================================================================
--- trunk/psLib/test/astronomy/verified/tst_psMetadata_04.stderr	(revision 1729)
+++ trunk/psLib/test/astronomy/verified/tst_psMetadata_04.stderr	(revision 1761)
@@ -1,4 +1,8 @@
-<DATE><TIME>|<HOST>|E|+MetadataLookup|Null metadata collection not allowed
-<DATE><TIME>|<HOST>|E|+MetadataLookup|Null key name not allowed
-<DATE><TIME>|<HOST>|E|  psMetadataGet|Null metadata collection not allowed
-<DATE><TIME>|<HOST>|E|  psMetadataGet|Couldn't find metadata item with given index. Index: 22
+<DATE><TIME>|<HOST>|E|psMetadataLookup
+    Null metadata collection not allowed
+<DATE><TIME>|<HOST>|E|psMetadataLookup
+    Null key name not allowed
+<DATE><TIME>|<HOST>|E|psMetadataGet
+    Null metadata collection not allowed
+<DATE><TIME>|<HOST>|E|psMetadataGet
+    Couldn't find metadata item with given index. Index: 22
Index: trunk/psLib/test/astronomy/verified/tst_psMetadata_05.stderr
===================================================================
--- trunk/psLib/test/astronomy/verified/tst_psMetadata_05.stderr	(revision 1729)
+++ trunk/psLib/test/astronomy/verified/tst_psMetadata_05.stderr	(revision 1761)
@@ -1,6 +1,12 @@
-<DATE><TIME>|<HOST>|E|+ataSetIterator|Null metadata collection not allowed
-<DATE><TIME>|<HOST>|E|+etadataGetNext|Null metadata collection not allowed
-<DATE><TIME>|<HOST>|E|+ataGetPrevious|Null metadata collection not allowed
-<DATE><TIME>|<HOST>|E|+adataItemPrint|Null file descriptor not allowed
-<DATE><TIME>|<HOST>|E|+adataItemPrint|Null format not allowed
-<DATE><TIME>|<HOST>|E|+adataItemPrint|Null metadata not allowed
+<DATE><TIME>|<HOST>|E|psMetadataSetIterator
+    Null metadata collection not allowed
+<DATE><TIME>|<HOST>|E|psMetadataGetNext
+    Null metadata collection not allowed
+<DATE><TIME>|<HOST>|E|psMetadataGetPrevious
+    Null metadata collection not allowed
+<DATE><TIME>|<HOST>|E|psMetadataItemPrint
+    Null file descriptor not allowed
+<DATE><TIME>|<HOST>|E|psMetadataItemPrint
+    Null format not allowed
+<DATE><TIME>|<HOST>|E|psMetadataItemPrint
+    Null metadata not allowed
Index: trunk/psLib/test/astronomy/verified/tst_psTime_02.stderr
===================================================================
--- trunk/psLib/test/astronomy/verified/tst_psTime_02.stderr	(revision 1729)
+++ trunk/psLib/test/astronomy/verified/tst_psTime_02.stderr	(revision 1761)
@@ -1,7 +1,14 @@
-<DATE><TIME>|<HOST>|E|    psISOToTime|Month must have a value from 1 to 12. Value: 99
-<DATE><TIME>|<HOST>|E|    psISOToTime|Day must have a value from 1 to 31. Value: 99
-<DATE><TIME>|<HOST>|E|    psISOToTime|Hour must have a value from 0 to 23. Value: 99
-<DATE><TIME>|<HOST>|E|    psISOToTime|Minute must have a value from 0 to 59. Value: 99
-<DATE><TIME>|<HOST>|E|    psISOToTime|Second must have a value from 0 to 59. Value: 99
-<DATE><TIME>|<HOST>|E|    psISOToTime|Millisecond must have a value from 0 to 999. Value: -999
-<DATE><TIME>|<HOST>|E|psTimevalToTime|NULL value not allowed
+<DATE><TIME>|<HOST>|E|psISOToTime
+    Month must have a value from 1 to 12. Value: 99
+<DATE><TIME>|<HOST>|E|psISOToTime
+    Day must have a value from 1 to 31. Value: 99
+<DATE><TIME>|<HOST>|E|psISOToTime
+    Hour must have a value from 0 to 23. Value: 99
+<DATE><TIME>|<HOST>|E|psISOToTime
+    Minute must have a value from 0 to 59. Value: 99
+<DATE><TIME>|<HOST>|E|psISOToTime
+    Second must have a value from 0 to 59. Value: 99
+<DATE><TIME>|<HOST>|E|psISOToTime
+    Millisecond must have a value from 0 to 999. Value: -999
+<DATE><TIME>|<HOST>|E|psTimevalToTime
+    NULL value not allowed