Index: trunk/psLib/test/collections/verified/tst_psBitSet_01.stderr
===================================================================
--- trunk/psLib/test/collections/verified/tst_psBitSet_01.stderr	(revision 1402)
+++ trunk/psLib/test/collections/verified/tst_psBitSet_01.stderr	(revision 1404)
@@ -1,6 +1,6 @@
- <DATE> <TIME> |<HOST>|E|   psBitSetTest| : Line 151 - Bit position too small: -4
- <DATE> <TIME> |<HOST>|E|   psBitSetTest| : Line 154 - Bit position too large: 200
- <DATE> <TIME> |<HOST>|E|   psBitSetTest| : Line 148 - Null psBitSet for inBitSet argument
- <DATE> <TIME> |<HOST>|E|    psBitSetSet| : Line 129 - Bit position too small: -4
- <DATE> <TIME> |<HOST>|E|    psBitSetSet| : Line 132 - Bit position too large: 200
- <DATE> <TIME> |<HOST>|E|    psBitSetSet| : Line 126 - Null psBitSet for inBitSet argument
+<DATE><TIME>|<HOST>|E|   psBitSetTest| : Line <LINENO> - Bit position too small: -4
+<DATE><TIME>|<HOST>|E|   psBitSetTest| : Line <LINENO> - Bit position too large: 200
+<DATE><TIME>|<HOST>|E|   psBitSetTest| : Line <LINENO> - Null psBitSet for inBitSet argument
+<DATE><TIME>|<HOST>|E|    psBitSetSet| : Line <LINENO> - Bit position too small: -4
+<DATE><TIME>|<HOST>|E|    psBitSetSet| : Line <LINENO> - Bit position too large: 200
+<DATE><TIME>|<HOST>|E|    psBitSetSet| : Line <LINENO> - Null psBitSet for inBitSet argument
Index: trunk/psLib/test/collections/verified/tst_psBitSet_05.stderr
===================================================================
--- trunk/psLib/test/collections/verified/tst_psBitSet_05.stderr	(revision 1402)
+++ trunk/psLib/test/collections/verified/tst_psBitSet_05.stderr	(revision 1404)
@@ -1,1 +1,1 @@
- <DATE> <TIME> |<HOST>|E|     psBitSetOp| : Line 197 - psBitSet sizes not the same
+<DATE><TIME>|<HOST>|E|     psBitSetOp| : Line <LINENO> - psBitSet sizes not the same
Index: trunk/psLib/test/collections/verified/tst_psBitSet_06.stderr
===================================================================
--- trunk/psLib/test/collections/verified/tst_psBitSet_06.stderr	(revision 1402)
+++ trunk/psLib/test/collections/verified/tst_psBitSet_06.stderr	(revision 1404)
@@ -1,2 +1,2 @@
- <DATE> <TIME> |<HOST>|E|     psBitSetOp| : Line 224 - Invalid psBitMask binary operation: ZZXOR
- <DATE> <TIME> |<HOST>|E|  psBitSetAlloc| : Line 88 - Allocation size must be > 0: size = -4
+<DATE><TIME>|<HOST>|E|     psBitSetOp| : Line <LINENO> - Invalid psBitMask binary operation: ZZXOR
+<DATE><TIME>|<HOST>|E|  psBitSetAlloc| : Line <LINENO> - Allocation size must be > 0: size = -4
Index: trunk/psLib/test/collections/verified/tst_psBitSet_08.stderr
===================================================================
--- trunk/psLib/test/collections/verified/tst_psBitSet_08.stderr	(revision 1402)
+++ trunk/psLib/test/collections/verified/tst_psBitSet_08.stderr	(revision 1404)
@@ -1,1 +1,1 @@
- <DATE> <TIME> |<HOST>|E|    psBitSetNot| : Line 238 - Null psBitSet for inBitSet argument
+<DATE><TIME>|<HOST>|E|    psBitSetNot| : Line <LINENO> - Null psBitSet for inBitSet argument
Index: trunk/psLib/test/collections/verified/tst_psList.stderr
===================================================================
--- trunk/psLib/test/collections/verified/tst_psList.stderr	(revision 1402)
+++ trunk/psLib/test/collections/verified/tst_psList.stderr	(revision 1404)
@@ -5,5 +5,5 @@
 \**********************************************************************************/
 
- <DATE> <TIME> |<HOST>|I|  testListAlloc|psListAlloc shall create a psList with either 0 or 1 element.
+<DATE><TIME>|<HOST>|I|  testListAlloc|psListAlloc shall create a psList with either 0 or 1 element.
 
 ---> TESTPOINT PASSED (psList{psListAlloc} | tst_psList.c)
@@ -15,9 +15,9 @@
 \**********************************************************************************/
 
- <DATE> <TIME> |<HOST>|I|    testListAdd|psListAdd shall add an element to list
- <DATE> <TIME> |<HOST>|I|    testListAdd|Following should error with invalid insert location
- <DATE> <TIME> |<HOST>|W|      psListAdd|The given insert location (-10) for psListAdd is invalid.
- <DATE> <TIME> |<HOST>|I|    testListAdd|Following should be a warning.
- <DATE> <TIME> |<HOST>|W|      psListAdd|Invalid index 9 (only 6 elements in psList); assuming tail.
+<DATE><TIME>|<HOST>|I|    testListAdd|psListAdd shall add an element to list
+<DATE><TIME>|<HOST>|I|    testListAdd|Following should error with invalid insert location
+<DATE><TIME>|<HOST>|W|      psListAdd|The given insert location (-10) for psListAdd is invalid.
+<DATE><TIME>|<HOST>|I|    testListAdd|Following should be a warning.
+<DATE><TIME>|<HOST>|W|      psListAdd|Invalid index 9 (only 6 elements in psList); assuming tail.
 
 ---> TESTPOINT PASSED (psList{psListAdd} | tst_psList.c)
@@ -29,6 +29,6 @@
 \**********************************************************************************/
 
- <DATE> <TIME> |<HOST>|I|    testListGet|Following should be an error
- <DATE> <TIME> |<HOST>|E|listSetIterator|Unexpected null pointer for psList parameter (psList.c:259).
+<DATE><TIME>|<HOST>|I|    testListGet|Following should be an error
+<DATE><TIME>|<HOST>|E|listSetIterator|Unexpected null pointer for psList parameter (psList.c:<LINENO>).
 
 ---> TESTPOINT PASSED (psList{psListGet} | tst_psList.c)
@@ -40,14 +40,14 @@
 \**********************************************************************************/
 
- <DATE> <TIME> |<HOST>|I| testListRemove|Following should be an error
- <DATE> <TIME> |<HOST>|E|   psListRemove|list parameter found to be NULL in psListRemove
- <DATE> <TIME> |<HOST>|I| testListRemove|Next message should be an error
- <DATE> <TIME> |<HOST>|E|   psListRemove|Couldn't position to given index (-4) to remove element from list.
- <DATE> <TIME> |<HOST>|I| testListRemove|Next message should be an error
- <DATE> <TIME> |<HOST>|E|   psListRemove|Couldn't position to given index (-2) to remove element from list.
- <DATE> <TIME> |<HOST>|I| testListRemove|Next message should be an error
- <DATE> <TIME> |<HOST>|E|   psListRemove|Failed to find item in given psList.
- <DATE> <TIME> |<HOST>|I| testListRemove|Next message should be an error
- <DATE> <TIME> |<HOST>|E|   psListRemove|Failed to find item in given psList.
+<DATE><TIME>|<HOST>|I| testListRemove|Following should be an error
+<DATE><TIME>|<HOST>|E|   psListRemove|list parameter found to be NULL in psListRemove
+<DATE><TIME>|<HOST>|I| testListRemove|Next message should be an error
+<DATE><TIME>|<HOST>|E|   psListRemove|Couldn't position to given index (-4) to remove element from list.
+<DATE><TIME>|<HOST>|I| testListRemove|Next message should be an error
+<DATE><TIME>|<HOST>|E|   psListRemove|Couldn't position to given index (-2) to remove element from list.
+<DATE><TIME>|<HOST>|I| testListRemove|Next message should be an error
+<DATE><TIME>|<HOST>|E|   psListRemove|Failed to find item in given psList.
+<DATE><TIME>|<HOST>|I| testListRemove|Next message should be an error
+<DATE><TIME>|<HOST>|E|   psListRemove|Failed to find item in given psList.
 
 ---> TESTPOINT PASSED (psList{psListRemove} | tst_psList.c)
@@ -68,9 +68,9 @@
 \**********************************************************************************/
 
- <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>|E|listSetIterator|Unexpected null pointer for psList parameter (psList.c:259).
- <DATE> <TIME> |<HOST>|I|testListIterato|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.
+<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>|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>|E|listSetIterator|Can't move to an unknown position.  Not moving the iterator position.
 
 ---> TESTPOINT PASSED (psList{psListIterator} | tst_psList.c)
Index: trunk/psLib/test/collections/verified/tst_psVector.stderr
===================================================================
--- trunk/psLib/test/collections/verified/tst_psVector.stderr	(revision 1402)
+++ trunk/psLib/test/collections/verified/tst_psVector.stderr	(revision 1404)
@@ -1,4 +1,4 @@
- <DATE> <TIME> |<HOST>|I|           main|Following should be an error message.
- <DATE> <TIME> |<HOST>|E|  psVectorAlloc|Invalid value for nalloc. nalloc: 0
- <DATE> <TIME> |<HOST>|I|           main|Following should be an error message.
- <DATE> <TIME> |<HOST>|E|psVectorRealloc|Null input vector
+<DATE><TIME>|<HOST>|I|           main|Following should be an error message.
+<DATE><TIME>|<HOST>|E|  psVectorAlloc|Invalid value for nalloc. nalloc: 0
+<DATE><TIME>|<HOST>|I|           main|Following should be an error message.
+<DATE><TIME>|<HOST>|E|psVectorRealloc|Null input vector
Index: trunk/psLib/test/collections/verified/tst_psVectorSort_03.stderr
===================================================================
--- trunk/psLib/test/collections/verified/tst_psVectorSort_03.stderr	(revision 1402)
+++ trunk/psLib/test/collections/verified/tst_psVectorSort_03.stderr	(revision 1404)
@@ -1,2 +1,2 @@
- <DATE> <TIME> |<HOST>|E|   psVectorSort| : Line 178 - Input and output vector sizes are not equal: in=5 out=6
- <DATE> <TIME> |<HOST>|E|   psVectorSort| : Line 184 - Input and output vectors are not same type: in=1028 out=1032
+<DATE><TIME>|<HOST>|E|   psVectorSort| : Line <LINENO> - Input and output vector sizes are not equal: in=5 out=6
+<DATE><TIME>|<HOST>|E|   psVectorSort| : Line <LINENO> - Input and output vectors are not same type: in=1028 out=1032
Index: trunk/psLib/test/collections/verified/tst_psVectorSort_04.stderr
===================================================================
--- trunk/psLib/test/collections/verified/tst_psVectorSort_04.stderr	(revision 1402)
+++ trunk/psLib/test/collections/verified/tst_psVectorSort_04.stderr	(revision 1404)
@@ -1,1 +1,1 @@
- <DATE> <TIME> |<HOST>|E|   psVectorSort| : Line 160 - Null input vector
+<DATE><TIME>|<HOST>|E|   psVectorSort| : Line <LINENO> - Null input vector