Index: /trunk/psLib/test/astronomy/verified/tst_psMetadata_01.stderr
===================================================================
--- /trunk/psLib/test/astronomy/verified/tst_psMetadata_01.stderr	(revision 1728)
+++ /trunk/psLib/test/astronomy/verified/tst_psMetadata_01.stderr	(revision 1729)
@@ -1,6 +1,6 @@
-<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
+<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
Index: /trunk/psLib/test/astronomy/verified/tst_psMetadata_02.stderr
===================================================================
--- /trunk/psLib/test/astronomy/verified/tst_psMetadata_02.stderr	(revision 1728)
+++ /trunk/psLib/test/astronomy/verified/tst_psMetadata_02.stderr	(revision 1729)
@@ -1,4 +1,4 @@
-<DATE><TIME>|<HOST>|E|psMetadataItemA|Null value for name not allowed
-<DATE><TIME>|<HOST>|E|psMetadataItemA|Invalid psMetadataType: 6
-<DATE><TIME>|<HOST>|E|psMetadataAddIt|Null metadata collection not allowed
-<DATE><TIME>|<HOST>|E|psMetadataAddIt|Null metadata item not allowed
+<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
Index: /trunk/psLib/test/astronomy/verified/tst_psMetadata_03.stderr
===================================================================
--- /trunk/psLib/test/astronomy/verified/tst_psMetadata_03.stderr	(revision 1728)
+++ /trunk/psLib/test/astronomy/verified/tst_psMetadata_03.stderr	(revision 1729)
@@ -1,3 +1,3 @@
-<DATE><TIME>|<HOST>|E|psMetadataRemov|Null metadata collection not allowed
-<DATE><TIME>|<HOST>|E|psMetadataRemov|Couldn't find metadata item. Name: AARGH
-<DATE><TIME>|<HOST>|E|psMetadataRemov|Couldn't find metadata item in list. Index: 22
+<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
Index: /trunk/psLib/test/astronomy/verified/tst_psMetadata_04.stderr
===================================================================
--- /trunk/psLib/test/astronomy/verified/tst_psMetadata_04.stderr	(revision 1728)
+++ /trunk/psLib/test/astronomy/verified/tst_psMetadata_04.stderr	(revision 1729)
@@ -1,4 +1,4 @@
-<DATE><TIME>|<HOST>|E|psMetadataLooku|Null metadata collection not allowed
-<DATE><TIME>|<HOST>|E|psMetadataLooku|Null key name not allowed
+<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
Index: /trunk/psLib/test/astronomy/verified/tst_psMetadata_05.stderr
===================================================================
--- /trunk/psLib/test/astronomy/verified/tst_psMetadata_05.stderr	(revision 1728)
+++ /trunk/psLib/test/astronomy/verified/tst_psMetadata_05.stderr	(revision 1729)
@@ -1,6 +1,6 @@
-<DATE><TIME>|<HOST>|E|psMetadataSetIt|Null metadata collection not allowed
-<DATE><TIME>|<HOST>|E|psMetadataGetNe|Null metadata collection not allowed
-<DATE><TIME>|<HOST>|E|psMetadataGetPr|Null metadata collection not allowed
-<DATE><TIME>|<HOST>|E|psMetadataItemP|Null file descriptor not allowed
-<DATE><TIME>|<HOST>|E|psMetadataItemP|Null format not allowed
-<DATE><TIME>|<HOST>|E|psMetadataItemP|Null metadata not allowed
+<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
Index: /trunk/psLib/test/collections/verified/tst_psList.stderr
===================================================================
--- /trunk/psLib/test/collections/verified/tst_psList.stderr	(revision 1728)
+++ /trunk/psLib/test/collections/verified/tst_psList.stderr	(revision 1729)
@@ -68,8 +68,8 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|I|testListIterato| psListSetIterator/psListGetNext/psListGetPrev shall move the list cursor to the specified location
-<DATE><TIME>|<HOST>|I|testListIterato|Following should error with 'Unexpected null pointer'
+<DATE><TIME>|<HOST>|I|+stListIterator| psListSetIterator/psListGetNext/psListGetPrev shall move the list cursor to the specified location
+<DATE><TIME>|<HOST>|I|+stListIterator|Following should error with 'Unexpected null pointer'
 <DATE><TIME>|<HOST>|E|listSetIterator|Unexpected null pointer for psList parameter (psList.c:<LINENO>).
-<DATE><TIME>|<HOST>|I|testListIterato|Following should error with 'Can't move to an unknown position.'
+<DATE><TIME>|<HOST>|I|+stListIterator|Following should error with 'Can't move to an unknown position.'
 <DATE><TIME>|<HOST>|E|listSetIterator|Can't move to an unknown position.  Not moving the iterator position.
 
Index: /trunk/psLib/test/dataManip/verified/tst_psMatrix02.stderr
===================================================================
--- /trunk/psLib/test/dataManip/verified/tst_psMatrix02.stderr	(revision 1728)
+++ /trunk/psLib/test/dataManip/verified/tst_psMatrix02.stderr	(revision 1729)
@@ -1,6 +1,6 @@
-<DATE><TIME>|<HOST>|E|psMatrixTranspo|Invalid operation: Pointer to inImage is same as outImage.
-<DATE><TIME>|<HOST>|E|psMatrixTranspo|Invalid operation: inImage or its data is NULL.
-<DATE><TIME>|<HOST>|E|psMatrixTranspo|Invalid operation: inImage not PS_TYPE_F64.
-<DATE><TIME>|<HOST>|E|psMatrixTranspo|Invalid operation: inImage not square array.
-<DATE><TIME>|<HOST>|E|psMatrixTranspo|Invalid operation: outImage not PS_TYPE_F64.
-<DATE><TIME>|<HOST>|E|psMatrixTranspo|Invalid operation: outImage not square array.
+<DATE><TIME>|<HOST>|E|+atrixTranspose|Invalid operation: Pointer to inImage is same as outImage.
+<DATE><TIME>|<HOST>|E|+atrixTranspose|Invalid operation: inImage or its data is NULL.
+<DATE><TIME>|<HOST>|E|+atrixTranspose|Invalid operation: inImage not PS_TYPE_F64.
+<DATE><TIME>|<HOST>|E|+atrixTranspose|Invalid operation: inImage not square array.
+<DATE><TIME>|<HOST>|E|+atrixTranspose|Invalid operation: outImage not PS_TYPE_F64.
+<DATE><TIME>|<HOST>|E|+atrixTranspose|Invalid operation: outImage not square array.
Index: /trunk/psLib/test/dataManip/verified/tst_psMatrix07.stderr
===================================================================
--- /trunk/psLib/test/dataManip/verified/tst_psMatrix07.stderr	(revision 1728)
+++ /trunk/psLib/test/dataManip/verified/tst_psMatrix07.stderr	(revision 1729)
@@ -1,3 +1,3 @@
-<DATE><TIME>|<HOST>|E|psMatrixToVecto|Invalid operation: inImage or its data is NULL.
-<DATE><TIME>|<HOST>|E|psMatrixToVecto|Image does not have dim with 1 col or 1 row: (2 x 2).
-<DATE><TIME>|<HOST>|E|psVectorToMatri|Invalid operation: inVector or its data is NULL.
+<DATE><TIME>|<HOST>|E|+MatrixToVector|Invalid operation: inImage or its data is NULL.
+<DATE><TIME>|<HOST>|E|+MatrixToVector|Image does not have dim with 1 col or 1 row: (2 x 2).
+<DATE><TIME>|<HOST>|E|+VectorToMatrix|Invalid operation: inVector or its data is NULL.
Index: /trunk/psLib/test/dataManip/verified/tst_psVectorFFT.stderr
===================================================================
--- /trunk/psLib/test/dataManip/verified/tst_psVectorFFT.stderr	(revision 1728)
+++ /trunk/psLib/test/dataManip/verified/tst_psVectorFFT.stderr	(revision 1729)
@@ -23,5 +23,5 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|I|testVectorCompl|Following should be an error (type mismatch).
+<DATE><TIME>|<HOST>|I|+tVectorComplex|Following should be an error (type mismatch).
 <DATE><TIME>|<HOST>|E|psVectorComplex|The inputs to psVectorComplex must be the same type.
 
Index: /trunk/psLib/test/image/verified/tst_psImageFFT.stderr
===================================================================
--- /trunk/psLib/test/image/verified/tst_psImageFFT.stderr	(revision 1728)
+++ /trunk/psLib/test/image/verified/tst_psImageFFT.stderr	(revision 1729)
@@ -23,7 +23,7 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|I|testImageComple|Following should be an error (type mismatch).
+<DATE><TIME>|<HOST>|I|+stImageComplex|Following should be an error (type mismatch).
 <DATE><TIME>|<HOST>|E| psImageComplex|The inputs to psImageComplex must be the same type.
-<DATE><TIME>|<HOST>|I|testImageComple|Following should be an error (size mismatch).
+<DATE><TIME>|<HOST>|I|+stImageComplex|Following should be an error (size mismatch).
 <DATE><TIME>|<HOST>|E| psImageComplex|The inputs to psImageComplex must be the same dimensions.
 
Index: /trunk/psLib/test/image/verified/tst_psImageManip.stderr
===================================================================
--- /trunk/psLib/test/image/verified/tst_psImageManip.stderr	(revision 1728)
+++ /trunk/psLib/test/image/verified/tst_psImageManip.stderr	(revision 1729)
@@ -27,5 +27,5 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|I|testImageClipNA|psImageClipNaN shall modified pixel values of NaN with a specified value
+<DATE><TIME>|<HOST>|I|+stImageClipNAN|psImageClipNaN shall modified pixel values of NaN with a specified value
 
 ---> TESTPOINT PASSED (psImage{psImageClipNAN} | tst_psImageManip.c)
@@ -37,31 +37,31 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|I|testImageClipCo|psImageClipNaN shall modified pixel values of NaN with a specified value
-<DATE><TIME>|<HOST>|I|testImageClipCo|Testing clipping at 409.6+256i to 682.667+512i for psC32
-<DATE><TIME>|<HOST>|I|testImageClipCo|Testing clipping at 409.6+256i to 682.667+512i for psC64
-<DATE><TIME>|<HOST>|I|testImageClipCo|Following should be an error:
-<DATE><TIME>|<HOST>|E|psImageClipComp|Can not perform clip on NULL image
-<DATE><TIME>|<HOST>|I|testImageClipCo|Following should be an error:
-<DATE><TIME>|<HOST>|E|psImageClipComp|psImageClipComplexRegion can not be invoked with max < min in the real image space.
-<DATE><TIME>|<HOST>|I|testImageClipCo|Following should be an error:
-<DATE><TIME>|<HOST>|E|psImageClipComp|psImageClipComplexRegion can not be invoked with max < min in the imaginary image space.
-<DATE><TIME>|<HOST>|I|testImageClipCo|Following should be an error:
-<DATE><TIME>|<HOST>|E|psImageClipComp|psImageClipComplexRegion can not be invoked with max < min in the real image space.
-<DATE><TIME>|<HOST>|I|testImageClipCo|Following should be an error:
-<DATE><TIME>|<HOST>|E|psImageClipComp|Specified vmin (-6.80565e+38+0i) is outside of image's psC32 pixel range
-<DATE><TIME>|<HOST>|I|testImageClipCo|Following should be an error:
-<DATE><TIME>|<HOST>|E|psImageClipComp|Specified vmin (6.80565e+38+0i) is outside of image's psC32 pixel range
-<DATE><TIME>|<HOST>|I|testImageClipCo|Following should be an error:
-<DATE><TIME>|<HOST>|E|psImageClipComp|Specified vmin (-0-6.80565e+38i) is outside of image's psC32 pixel range
-<DATE><TIME>|<HOST>|I|testImageClipCo|Following should be an error:
-<DATE><TIME>|<HOST>|E|psImageClipComp|Specified vmin (0+6.80565e+38i) is outside of image's psC32 pixel range
-<DATE><TIME>|<HOST>|I|testImageClipCo|Following should be an error:
-<DATE><TIME>|<HOST>|E|psImageClipComp|Specified vmax (-6.80565e+38+0i) is outside of image's psC32 pixel range
-<DATE><TIME>|<HOST>|I|testImageClipCo|Following should be an error:
-<DATE><TIME>|<HOST>|E|psImageClipComp|Specified vmax (6.80565e+38+0i) is outside of image's psC32 pixel range
-<DATE><TIME>|<HOST>|I|testImageClipCo|Following should be an error:
-<DATE><TIME>|<HOST>|E|psImageClipComp|Specified vmax (-0-6.80565e+38i) is outside of image's psC32 pixel range
-<DATE><TIME>|<HOST>|I|testImageClipCo|Following should be an error:
-<DATE><TIME>|<HOST>|E|psImageClipComp|Specified vmax (0+6.80565e+38i) is outside of image's psC32 pixel range
+<DATE><TIME>|<HOST>|I|+pComplexRegion|psImageClipNaN shall modified pixel values of NaN with a specified value
+<DATE><TIME>|<HOST>|I|+pComplexRegion|Testing clipping at 409.6+256i to 682.667+512i for psC32
+<DATE><TIME>|<HOST>|I|+pComplexRegion|Testing clipping at 409.6+256i to 682.667+512i for psC64
+<DATE><TIME>|<HOST>|I|+pComplexRegion|Following should be an error:
+<DATE><TIME>|<HOST>|E|+pComplexRegion|Can not perform clip on NULL image
+<DATE><TIME>|<HOST>|I|+pComplexRegion|Following should be an error:
+<DATE><TIME>|<HOST>|E|+pComplexRegion|psImageClipComplexRegion can not be invoked with max < min in the real image space.
+<DATE><TIME>|<HOST>|I|+pComplexRegion|Following should be an error:
+<DATE><TIME>|<HOST>|E|+pComplexRegion|psImageClipComplexRegion can not be invoked with max < min in the imaginary image space.
+<DATE><TIME>|<HOST>|I|+pComplexRegion|Following should be an error:
+<DATE><TIME>|<HOST>|E|+pComplexRegion|psImageClipComplexRegion can not be invoked with max < min in the real image space.
+<DATE><TIME>|<HOST>|I|+pComplexRegion|Following should be an error:
+<DATE><TIME>|<HOST>|E|+pComplexRegion|Specified vmin (-6.80565e+38+0i) is outside of image's psC32 pixel range
+<DATE><TIME>|<HOST>|I|+pComplexRegion|Following should be an error:
+<DATE><TIME>|<HOST>|E|+pComplexRegion|Specified vmin (6.80565e+38+0i) is outside of image's psC32 pixel range
+<DATE><TIME>|<HOST>|I|+pComplexRegion|Following should be an error:
+<DATE><TIME>|<HOST>|E|+pComplexRegion|Specified vmin (-0-6.80565e+38i) is outside of image's psC32 pixel range
+<DATE><TIME>|<HOST>|I|+pComplexRegion|Following should be an error:
+<DATE><TIME>|<HOST>|E|+pComplexRegion|Specified vmin (0+6.80565e+38i) is outside of image's psC32 pixel range
+<DATE><TIME>|<HOST>|I|+pComplexRegion|Following should be an error:
+<DATE><TIME>|<HOST>|E|+pComplexRegion|Specified vmax (-6.80565e+38+0i) is outside of image's psC32 pixel range
+<DATE><TIME>|<HOST>|I|+pComplexRegion|Following should be an error:
+<DATE><TIME>|<HOST>|E|+pComplexRegion|Specified vmax (6.80565e+38+0i) is outside of image's psC32 pixel range
+<DATE><TIME>|<HOST>|I|+pComplexRegion|Following should be an error:
+<DATE><TIME>|<HOST>|E|+pComplexRegion|Specified vmax (-0-6.80565e+38i) is outside of image's psC32 pixel range
+<DATE><TIME>|<HOST>|I|+pComplexRegion|Following should be an error:
+<DATE><TIME>|<HOST>|E|+pComplexRegion|Specified vmax (0+6.80565e+38i) is outside of image's psC32 pixel range
 
 ---> TESTPOINT PASSED (psImage{psImageClipComplexRegion} | tst_psImageManip.c)
@@ -73,10 +73,10 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|I|testImageOverla|Following should error as overlay isn't within image boundaries
-<DATE><TIME>|<HOST>|E|psImageOverlayS|Overlay image (32,64 -> 159,319) is partially outside of the input image (128 x 256).
-<DATE><TIME>|<HOST>|I|testImageOverla|Following should error as overlay is NULL
-<DATE><TIME>|<HOST>|E|psImageOverlayS|one of the input images was NULL.
-<DATE><TIME>|<HOST>|I|testImageOverla|Following should error as image input is NULL
-<DATE><TIME>|<HOST>|E|psImageOverlayS|one of the input images was NULL.
+<DATE><TIME>|<HOST>|I|+stImageOverlay|Following should error as overlay isn't within image boundaries
+<DATE><TIME>|<HOST>|E|+OverlaySection|Overlay image (32,64 -> 159,319) is partially outside of the input image (128 x 256).
+<DATE><TIME>|<HOST>|I|+stImageOverlay|Following should error as overlay is NULL
+<DATE><TIME>|<HOST>|E|+OverlaySection|one of the input images was NULL.
+<DATE><TIME>|<HOST>|I|+stImageOverlay|Following should error as image input is NULL
+<DATE><TIME>|<HOST>|E|+OverlaySection|one of the input images was NULL.
 
 ---> TESTPOINT PASSED (psImage{psImageOverlay} | tst_psImageManip.c)
@@ -130,21 +130,21 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|I|testImageShiftC|Testing psImageShift with a 64x128 image for a shift of 0,0.
-<DATE><TIME>|<HOST>|I|testImageShiftC|Testing psImageShift with a 64x128 image for a shift of 0,16.
-<DATE><TIME>|<HOST>|I|testImageShiftC|Testing psImageShift with a 64x128 image for a shift of 0,-16.
-<DATE><TIME>|<HOST>|I|testImageShiftC|Testing psImageShift with a 64x128 image for a shift of 32,0.
-<DATE><TIME>|<HOST>|I|testImageShiftC|Testing psImageShift with a 64x128 image for a shift of -32,0.
-<DATE><TIME>|<HOST>|I|testImageShiftC|Testing psImageShift with a 64x128 image for a shift of 32,16.
-<DATE><TIME>|<HOST>|I|testImageShiftC|Testing psImageShift with a 64x128 image for a shift of 32,-16.
-<DATE><TIME>|<HOST>|I|testImageShiftC|Testing psImageShift with a 64x128 image for a shift of -32,16.
-<DATE><TIME>|<HOST>|I|testImageShiftC|Testing psImageShift with a 64x128 image for a shift of -32,-16.
-<DATE><TIME>|<HOST>|I|testImageShiftC|Testing psImageShift with a 64x128 image for a shift of 0,16.4.
-<DATE><TIME>|<HOST>|I|testImageShiftC|Testing psImageShift with a 64x128 image for a shift of 0,-16.4.
-<DATE><TIME>|<HOST>|I|testImageShiftC|Testing psImageShift with a 64x128 image for a shift of 32.7,0.
-<DATE><TIME>|<HOST>|I|testImageShiftC|Testing psImageShift with a 64x128 image for a shift of -32.7,0.
-<DATE><TIME>|<HOST>|I|testImageShiftC|Testing psImageShift with a 64x128 image for a shift of 32.6,16.2.
-<DATE><TIME>|<HOST>|I|testImageShiftC|Testing psImageShift with a 64x128 image for a shift of 32.6,-16.2.
-<DATE><TIME>|<HOST>|I|testImageShiftC|Testing psImageShift with a 64x128 image for a shift of -32.6,16.2.
-<DATE><TIME>|<HOST>|I|testImageShiftC|Testing psImageShift with a 64x128 image for a shift of -32.6,-16.2.
+<DATE><TIME>|<HOST>|I|+ImageShiftCase|Testing psImageShift with a 64x128 image for a shift of 0,0.
+<DATE><TIME>|<HOST>|I|+ImageShiftCase|Testing psImageShift with a 64x128 image for a shift of 0,16.
+<DATE><TIME>|<HOST>|I|+ImageShiftCase|Testing psImageShift with a 64x128 image for a shift of 0,-16.
+<DATE><TIME>|<HOST>|I|+ImageShiftCase|Testing psImageShift with a 64x128 image for a shift of 32,0.
+<DATE><TIME>|<HOST>|I|+ImageShiftCase|Testing psImageShift with a 64x128 image for a shift of -32,0.
+<DATE><TIME>|<HOST>|I|+ImageShiftCase|Testing psImageShift with a 64x128 image for a shift of 32,16.
+<DATE><TIME>|<HOST>|I|+ImageShiftCase|Testing psImageShift with a 64x128 image for a shift of 32,-16.
+<DATE><TIME>|<HOST>|I|+ImageShiftCase|Testing psImageShift with a 64x128 image for a shift of -32,16.
+<DATE><TIME>|<HOST>|I|+ImageShiftCase|Testing psImageShift with a 64x128 image for a shift of -32,-16.
+<DATE><TIME>|<HOST>|I|+ImageShiftCase|Testing psImageShift with a 64x128 image for a shift of 0,16.4.
+<DATE><TIME>|<HOST>|I|+ImageShiftCase|Testing psImageShift with a 64x128 image for a shift of 0,-16.4.
+<DATE><TIME>|<HOST>|I|+ImageShiftCase|Testing psImageShift with a 64x128 image for a shift of 32.7,0.
+<DATE><TIME>|<HOST>|I|+ImageShiftCase|Testing psImageShift with a 64x128 image for a shift of -32.7,0.
+<DATE><TIME>|<HOST>|I|+ImageShiftCase|Testing psImageShift with a 64x128 image for a shift of 32.6,16.2.
+<DATE><TIME>|<HOST>|I|+ImageShiftCase|Testing psImageShift with a 64x128 image for a shift of 32.6,-16.2.
+<DATE><TIME>|<HOST>|I|+ImageShiftCase|Testing psImageShift with a 64x128 image for a shift of -32.6,16.2.
+<DATE><TIME>|<HOST>|I|+ImageShiftCase|Testing psImageShift with a 64x128 image for a shift of -32.6,-16.2.
 <DATE><TIME>|<HOST>|I| testImageShift|Following should be an error...
 <DATE><TIME>|<HOST>|E|   psImageShift|Input image can not be NULL.
Index: /trunk/psLib/test/sysUtils/verified/tst_psLogMsg.stderr
===================================================================
--- /trunk/psLib/test/sysUtils/verified/tst_psLogMsg.stderr	(revision 1728)
+++ /trunk/psLib/test/sysUtils/verified/tst_psLogMsg.stderr	(revision 1729)
@@ -97,5 +97,5 @@
 
 <DATE><TIME>|<HOST>|A| Under 15 chars|Hello World!
-<DATE><TIME>|<HOST>|A|This string is |Hello World!
+<DATE><TIME>|<HOST>|A|+ than 15 chars|Hello World!
 <DATE><TIME>|<HOST>|A|   testLogMsg04|Line #1
 <DATE><TIME>|<HOST>|A|   testLogMsg04|Line #2
Index: /trunk/psLib/test/sysUtils/verified/tst_psMemory.stderr
===================================================================
--- /trunk/psLib/test/sysUtils/verified/tst_psMemory.stderr	(revision 1728)
+++ /trunk/psLib/test/sysUtils/verified/tst_psMemory.stderr	(revision 1729)
@@ -5,5 +5,5 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|I|TPCheckBufferPo|psAlloc shall allocate memory blocks writeable by caller.
+<DATE><TIME>|<HOST>|I|+BufferPositive|psAlloc shall allocate memory blocks writeable by caller.
 
 ---> TESTPOINT PASSED (psMemory{checkBufferPositive} | tst_psMemory.c)
@@ -16,5 +16,5 @@
 
 <DATE><TIME>|<HOST>|I|  TPOutOfMemory|Upon requesting more memory than is available, psalloc shall call the psMemExhaustedCallback.
-<DATE><TIME>|<HOST>|I|TPOutOfMemoryEx|Custom MemExhaustedCallback was invoked.
+<DATE><TIME>|<HOST>|I|+austedCallback|Custom MemExhaustedCallback was invoked.
 <DATE><TIME>|<HOST>|A|      p_psAlloc|Failed to allocate <N> bytes at tst_psMemory.c:<LINENO>
 
@@ -27,5 +27,5 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|I|TPReallocOutOfM|Upon requesting more memory than is available, psRealloc shall call the psMemExhaustedCallback.
+<DATE><TIME>|<HOST>|I|+locOutOfMemory|Upon requesting more memory than is available, psRealloc shall call the psMemExhaustedCallback.
 <DATE><TIME>|<HOST>|A|    p_psRealloc|Failed to reallocate <N> bytes at tst_psMemory.c:<LINENO>
 
@@ -51,10 +51,10 @@
 
 <DATE><TIME>|<HOST>|I|TPallocCallback|call to psAlloc/psRealloc shall generate a callback if specified memory ID is allocated.
-<DATE><TIME>|<HOST>|I|memAllocateCall|block 2 was (re)allocated
-<DATE><TIME>|<HOST>|I|memAllocateCall|block 3 was (re)allocated
+<DATE><TIME>|<HOST>|I|+locateCallback|block 2 was (re)allocated
+<DATE><TIME>|<HOST>|I|+locateCallback|block 3 was (re)allocated
 <DATE><TIME>|<HOST>|I|memFreeCallback|block 2 was freed
 <DATE><TIME>|<HOST>|I|memFreeCallback|block 3 was freed
-<DATE><TIME>|<HOST>|I|memAllocateCall|block 4 was (re)allocated
-<DATE><TIME>|<HOST>|I|memAllocateCall|block 4 was (re)allocated
+<DATE><TIME>|<HOST>|I|+locateCallback|block 4 was (re)allocated
+<DATE><TIME>|<HOST>|I|+locateCallback|block 4 was (re)allocated
 <DATE><TIME>|<HOST>|I|memFreeCallback|block 4 was freed
 
@@ -91,6 +91,6 @@
 <DATE><TIME>|<HOST>|I|TPmemCorruption|psMemCheckCorruption shall detect memory corruptions
 <DATE><TIME>|<HOST>|I|TPmemCorruption|psMemCheckCorruption should output an error message and memProblemCallback callback should be called.
-<DATE><TIME>|<HOST>|E|psLib.sysUtils.|Memory block 1 is corrupted; buffer underflow detected.
-<DATE><TIME>|<HOST>|I|memProblemCallb|memory callback called for id 1 (psMemCheckCorruption:<LINENO>).
+<DATE><TIME>|<HOST>|E|+scheckMemBlock|Memory block 1 is corrupted; buffer underflow detected.
+<DATE><TIME>|<HOST>|I|+roblemCallback|memory callback called for id 1 (psMemCheckCorruption:<LINENO>).
 
 ---> TESTPOINT PASSED (psMemory{psMemCorruption} | tst_psMemory.c)
@@ -102,6 +102,6 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|I|TPFreeReference|memory reference count shall be incrementable/decrementable
-<DATE><TIME>|<HOST>|I|TPFreeReference|psFree shall be just decrement a multiple refererenced pointer.
+<DATE><TIME>|<HOST>|I|+ferencedMemory|memory reference count shall be incrementable/decrementable
+<DATE><TIME>|<HOST>|I|+ferencedMemory|psFree shall be just decrement a multiple refererenced pointer.
 
 ---> TESTPOINT PASSED (psMemory{freeReferencedMemory} | tst_psMemory.c)
@@ -114,7 +114,5 @@
 
 <DATE><TIME>|<HOST>|I| TPmultipleFree|Next should be an error about multiple freeing.
-<DATE><TIME>|<HOST>|E|psLib.sysUtils.|Memory block 1 was freed but still used.
-<DATE><TIME>|<HOST>|E|psLib.sysUtils.|Block 1 allocated at tst_psMemory.c:<LINENO> freed more than once at tst_psMemory.c:<LINENO>.
-<DATE><TIME>|<HOST>|A|memProblemCallb|Detected a problem in the memory system at tst_psMemory.c:<LINENO>
+<DATE><TIME>|<HOST>|E|+sysUtilspsFree|Block 1, allocated at tst_psMemory.c:<LINENO>, freed multiple times at tst_psMemory.c:<LINENO>.
 
 ---> TESTPOINT PASSED (psMemory{multipleFree} | tst_psMemory.c)
Index: /trunk/psLib/test/sysUtils/verified/tst_psStringCopy.stderr
===================================================================
--- /trunk/psLib/test/sysUtils/verified/tst_psStringCopy.stderr	(revision 1728)
+++ /trunk/psLib/test/sysUtils/verified/tst_psStringCopy.stderr	(revision 1729)
@@ -50,5 +50,5 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|psLib.sysUtils.|Can not copy a negative number of characters (-5).
+<DATE><TIME>|<HOST>|E|+spsStringNCopy|Can not copy a negative number of characters (-5).
 
 ---> TESTPOINT PASSED (psString{Copy string with negative size} | tst_psStringCopy.c)