diff --git a/documentation/pvDataCpp.html b/documentation/pvDataCpp.html
index a4a032d..c8f781f 100644
--- a/documentation/pvDataCpp.html
+++ b/documentation/pvDataCpp.html
@@ -14,10 +14,13 @@ Overview<br />
 
 <p>TODO</p>
 <ul>
-  <li>rename epicsException to exception</li>
+  <li>rename epicsException to exception. Do we want a assert under pvData? I
+    think yes.</li>
   <li>implement misc: Status??</li>
-  <li>Implement pvMisc: BitSetUtil.</li>
-  <li>Implement property</li>
+  <li>pvMiscBitSetUtil has not been tested.</li>
+  <li>Update testBaseException testBitSet testByteBuffer testSerialization so
+    that they can be part of testAll.pl</li>
+  <li>Change all throw statements so that they generated stack trace.</li>
 </ul>
 CONTENTS 
 <hr />
@@ -2055,8 +2058,7 @@ public:
     void setMessage(String value);
     AlarmSeverity getSeverity() const;
     void setSeverity(AlarmSeverity value);
-};
-</pre>
+};</pre>
 
 <p>where</p>
 
@@ -2073,8 +2075,7 @@ public:
     // set returns false if field is immutable
     Alarm get() const;
     bool set(Alarm alarm); 
-};
-</pre>
+};</pre>
 
 <p>where</p>
 
@@ -2099,8 +2100,7 @@ public:
     double getHigh() const;
     void setLow(double value);
     void setHigh(double value);
-};
-</pre>
+};</pre>
 
 <p>where</p>
 
@@ -2117,8 +2117,7 @@ public:
     // set returns false if field is immutable
     Control get() const;
     bool set(Control control);
-};
-</pre>
+};</pre>
 
 <p>where</p>
 
@@ -2166,12 +2165,10 @@ public:
     // a set returns false if field is immutable
     Display get() const;
     bool set(Display display);
-};
-</pre>
+};</pre>
 
 <p>where</p>
-<pre>
-</pre>
+<pre></pre>
 
 <h3 style="text-align: center">pvEnumerated</h3>
 
diff --git a/test/testLinkedListAux b/test/testLinkedListAux
index 8d0b691..307693d 100644
--- a/test/testLinkedListAux
+++ b/test/testLinkedListAux
@@ -1,20 +1,20 @@
 
 Time test
-diff 26.576570 milliSeconds
-time per iteration 26.576570 microseconds
-time per addTail/removeHead 0.013288 microseconds
+diff 86.701878 milliSeconds
+time per iteration 86.701878 microseconds
+time per addTail/removeHead 0.043351 microseconds
 
 Time test locked
-diff 176.520531 milliSeconds
-time per iteration 176.520531 microseconds
-time per addTail/removeHead 0.088260 microseconds
+diff 608.700458 milliSeconds
+time per iteration 608.700458 microseconds
+time per addTail/removeHead 0.304350 microseconds
 
 Time std::list test
-diff 648.731941 milliSeconds
-time per iteration 648.731941 microseconds
-time per addTail/removeHead 0.324366 microseconds
+diff 2209.051253 milliSeconds
+time per iteration 2209.051253 microseconds
+time per addTail/removeHead 1.104526 microseconds
 
 Time std::list test locked
-diff 800.533745 milliSeconds
-time per iteration 800.533745 microseconds
-time per addTail/removeHead 0.400267 microseconds
+diff 2720.724619 milliSeconds
+time per iteration 2720.724619 microseconds
+time per addTail/removeHead 1.360362 microseconds
diff --git a/test/testThreadAux b/test/testThreadAux
index b156fe0..530c9d9 100644
--- a/test/testThreadAux
+++ b/test/testThreadAux
@@ -1 +1 @@
-time per call 39.543418 microseconds
+time per call 25.270516 microseconds
diff --git a/test/testTimeStampAux b/test/testTimeStampAux
index 1b10845..806bd7b 100644
--- a/test/testTimeStampAux
+++ b/test/testTimeStampAux
@@ -1,5 +1,5 @@
-current 1291810268 497980466 milliSec 1291810268497
-2010.12.08 07:11:08 497980466 nanoSeconds isDst false
+current 1291814737 128832482 milliSec 1291814737128
+2010.12.08 08:25:37 128832482 nanoSeconds isDst false
 fromTime_t
-current 1291810268 0 milliSec 1291810268000
-2010.12.08 07:11:08 0 nanoSeconds isDst false
+current 1291814737 0 milliSec 1291814737000
+2010.12.08 08:25:37 0 nanoSeconds isDst false
diff --git a/test/testTimerAux b/test/testTimerAux
index 9ee1d80..81aaca8 100644
--- a/test/testTimerAux
+++ b/test/testTimerAux
@@ -1,6 +1,6 @@
-one requested 0.400000  diff 0.400200 seconds
-two requested 0.200000  diff 0.200171 seconds
-one requested 0.200000  diff 0.200248 seconds
-two requested 0.400000  diff 0.400307 seconds
-one requested 0.000000  diff 0.000031 seconds
-two requested 0.000000  diff 0.000089 seconds
+one requested 0.400000  diff 0.400202 seconds
+two requested 0.200000  diff 0.200183 seconds
+one requested 0.200000  diff 0.200157 seconds
+two requested 0.400000  diff 0.400198 seconds
+one requested 0.000000  diff 0.000025 seconds
+two requested 0.000000  diff 0.000042 seconds
diff --git a/testApp/Makefile b/testApp/Makefile
index b0788ec..a2771b3 100644
--- a/testApp/Makefile
+++ b/testApp/Makefile
@@ -1,7 +1,7 @@
 TOP = ..
 include $(TOP)/configure/CONFIG
-DIRS += miscTest
-DIRS += pvTest
-DIRS += propertyTest
+DIRS += misc
+DIRS += pv
+DIRS += property
 include $(TOP)/configure/RULES_DIRS
 
diff --git a/testApp/miscTest/Makefile b/testApp/misc/Makefile
similarity index 100%
rename from testApp/miscTest/Makefile
rename to testApp/misc/Makefile
diff --git a/testApp/miscTest/testBaseException.cpp b/testApp/misc/testBaseException.cpp
similarity index 100%
rename from testApp/miscTest/testBaseException.cpp
rename to testApp/misc/testBaseException.cpp
diff --git a/testApp/miscTest/testBitSet.cpp b/testApp/misc/testBitSet.cpp
similarity index 100%
rename from testApp/miscTest/testBitSet.cpp
rename to testApp/misc/testBitSet.cpp
diff --git a/testApp/miscTest/testByteBuffer.cpp b/testApp/misc/testByteBuffer.cpp
similarity index 100%
rename from testApp/miscTest/testByteBuffer.cpp
rename to testApp/misc/testByteBuffer.cpp
diff --git a/testApp/miscTest/testLinkedList.cpp b/testApp/misc/testLinkedList.cpp
similarity index 100%
rename from testApp/miscTest/testLinkedList.cpp
rename to testApp/misc/testLinkedList.cpp
diff --git a/testApp/miscTest/testMessageQueue.cpp b/testApp/misc/testMessageQueue.cpp
similarity index 100%
rename from testApp/miscTest/testMessageQueue.cpp
rename to testApp/misc/testMessageQueue.cpp
diff --git a/testApp/miscTest/testQueue.cpp b/testApp/misc/testQueue.cpp
similarity index 100%
rename from testApp/miscTest/testQueue.cpp
rename to testApp/misc/testQueue.cpp
diff --git a/testApp/miscTest/testSerialization.cpp b/testApp/misc/testSerialization.cpp
similarity index 100%
rename from testApp/miscTest/testSerialization.cpp
rename to testApp/misc/testSerialization.cpp
diff --git a/testApp/miscTest/testThread.cpp b/testApp/misc/testThread.cpp
similarity index 100%
rename from testApp/miscTest/testThread.cpp
rename to testApp/misc/testThread.cpp
diff --git a/testApp/miscTest/testTimeStamp.cpp b/testApp/misc/testTimeStamp.cpp
similarity index 100%
rename from testApp/miscTest/testTimeStamp.cpp
rename to testApp/misc/testTimeStamp.cpp
diff --git a/testApp/miscTest/testTimer.cpp b/testApp/misc/testTimer.cpp
similarity index 100%
rename from testApp/miscTest/testTimer.cpp
rename to testApp/misc/testTimer.cpp
diff --git a/testApp/propertyTest/Makefile b/testApp/property/Makefile
similarity index 100%
rename from testApp/propertyTest/Makefile
rename to testApp/property/Makefile
diff --git a/testApp/propertyTest/testProperty.cpp b/testApp/property/testProperty.cpp
similarity index 100%
rename from testApp/propertyTest/testProperty.cpp
rename to testApp/property/testProperty.cpp
diff --git a/testApp/pvTest/Makefile b/testApp/pv/Makefile
similarity index 100%
rename from testApp/pvTest/Makefile
rename to testApp/pv/Makefile
diff --git a/testApp/pvTest/testIntrospect.cpp b/testApp/pv/testIntrospect.cpp
similarity index 100%
rename from testApp/pvTest/testIntrospect.cpp
rename to testApp/pv/testIntrospect.cpp
diff --git a/testApp/pvTest/testPVAuxInfo.cpp b/testApp/pv/testPVAuxInfo.cpp
similarity index 100%
rename from testApp/pvTest/testPVAuxInfo.cpp
rename to testApp/pv/testPVAuxInfo.cpp
diff --git a/testApp/pvTest/testPVData.cpp b/testApp/pv/testPVData.cpp
similarity index 100%
rename from testApp/pvTest/testPVData.cpp
rename to testApp/pv/testPVData.cpp
diff --git a/testApp/pvTest/testPVStructureArray.cpp b/testApp/pv/testPVStructureArray.cpp
similarity index 100%
rename from testApp/pvTest/testPVStructureArray.cpp
rename to testApp/pv/testPVStructureArray.cpp
diff --git a/testApp/pvTest/testPVType.cpp b/testApp/pv/testPVType.cpp
similarity index 100%
rename from testApp/pvTest/testPVType.cpp
rename to testApp/pv/testPVType.cpp