Clean up various minor content issues.
diff --git a/libraries/EPF_Practices_Library/core.tech.common.base/guidances/checklists/implementation.xmi b/libraries/EPF_Practices_Library/core.tech.common.base/guidances/checklists/implementation.xmi
index 7ad8e5d..fe42b90 100644
--- a/libraries/EPF_Practices_Library/core.tech.common.base/guidances/checklists/implementation.xmi
+++ b/libraries/EPF_Practices_Library/core.tech.common.base/guidances/checklists/implementation.xmi
@@ -1,16 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <org.eclipse.epf.uma:ContentDescription xmi:version="2.0"
     xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.5/uma.ecore"
-    xmlns:epf="http://www.eclipse.org/epf" epf:version="1.5.0" xmlns:rmc="http://www.ibm.com/rmc"
-    rmc:version="7.5.0" xmi:id="-cev1w72zE7XqPYsSv19prg"
-    name="new_checklist,_OhJKUNWsEduaE6F4-SvXzg" guid="-cev1w72zE7XqPYsSv19prg" changeDate="2008-08-11T12:18:16.296-0700"
+    xmlns:rmc="http://www.ibm.com/rmc" rmc:version="7.5.0" xmlns:epf="http://www.eclipse.org/epf"
+    epf:version="1.5.0" xmi:id="-cev1w72zE7XqPYsSv19prg"
+    name="new_checklist,_OhJKUNWsEduaE6F4-SvXzg" guid="-cev1w72zE7XqPYsSv19prg" changeDate="2008-08-12T16:20:23.127-0700"
     version="1.0.0">
   <mainDescription>&lt;p>&#xD;
-    This checklist is not something that should be considered only for heavyweight code reviews. Each developer should keep&#xD;
-    the quality criteria embodied in these check items in mind while coding. When developers work together, the review&#xD;
-    against these criteria should be done in real time so that quality is ensured up front as they are writing the code.&#xD;
-&lt;/p>&#xD;
-&lt;p>&#xD;
     Appropriate divergence from the quality criteria described here could be worthy of a comment in the implementation so&#xD;
     that developers examining the code in the future know why the exception occurred.&#xD;
 &lt;/p></mainDescription>
diff --git a/libraries/EPF_Practices_Library/core.tech.common.base/guidances/guidelines/developer_testing.xmi b/libraries/EPF_Practices_Library/core.tech.common.base/guidances/guidelines/developer_testing.xmi
index 2b203e8..0bcfa74 100644
--- a/libraries/EPF_Practices_Library/core.tech.common.base/guidances/guidelines/developer_testing.xmi
+++ b/libraries/EPF_Practices_Library/core.tech.common.base/guidances/guidelines/developer_testing.xmi
@@ -3,19 +3,11 @@
     xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.5/uma.ecore"
     xmlns:rmc="http://www.ibm.com/rmc" rmc:version="7.5.0" xmlns:epf="http://www.eclipse.org/epf"
     epf:version="1.5.0" xmi:id="-wuu2cNRUPlrBuaO0OdzLFg"
-    name=",_ByOd4O6pEduvoopEslG-4g" guid="-wuu2cNRUPlrBuaO0OdzLFg" changeDate="2008-05-24T16:02:26.992-0700"
+    name=",_ByOd4O6pEduvoopEslG-4g" guid="-wuu2cNRUPlrBuaO0OdzLFg" changeDate="2008-08-12T16:22:40.234-0700"
     version="1.0.0">
   <mainDescription>&lt;h3>&#xD;
-    &lt;a id=&quot;DeveloperTestingPitfalls&quot; name=&quot;DeveloperTestingPitfalls&quot;>&lt;/a>Pitfalls Getting Started with Developer Testing&#xD;
-&lt;/h3>&#xD;
-&lt;p>&#xD;
-    Many developers who begin trying to do a substantially more thorough job of testing give up the effort shortly&#xD;
-    thereafter. They find that it does not seem to be yielding value. Further, some developers who begin well with&#xD;
-    developer testing find that they've created an unmaintainable test suite that is eventually abandoned.&#xD;
-&lt;/p>&#xD;
-&lt;h4>&#xD;
     Establish expectations&#xD;
-&lt;/h4>&#xD;
+&lt;/h3>&#xD;
 &lt;p>&#xD;
     Those who find developer testing rewarding do it. Those who view it as a chore find ways to avoid it. This is simply in&#xD;
     the nature of most developers in most industries, and treating it as a shameful lack of discipline hasn't historically&#xD;
diff --git a/libraries/EPF_Practices_Library/meth_mgmt.review_status.base/plugin.xmi b/libraries/EPF_Practices_Library/meth_mgmt.review_status.base/plugin.xmi
index 757c233..bb11f54 100644
--- a/libraries/EPF_Practices_Library/meth_mgmt.review_status.base/plugin.xmi
+++ b/libraries/EPF_Practices_Library/meth_mgmt.review_status.base/plugin.xmi
@@ -2,8 +2,8 @@
 <xmi:XMI xmi:version="2.0"
     xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.5/uma.ecore" xmlns:org.eclipse.epf.uma.resourcemanager="http:///org/eclipse/epf/uma/resourcemanager.ecore"
-    xmlns:epf="http://www.eclipse.org/epf" epf:version="1.5.0" xmlns:rmc="http://www.ibm.com/rmc"
-    rmc:version="7.5.0">
+    xmlns:rmc="http://www.ibm.com/rmc" rmc:version="7.5.0" xmlns:epf="http://www.eclipse.org/epf"
+    epf:version="1.5.0">
   <org.eclipse.epf.uma.resourcemanager:ResourceManager xmi:id="_Nh8IAa0EEdyKsPiG2Ur1fQ"
       guid="_Nh8IAa0EEdyKsPiG2Ur1fQ"/>
   <org.eclipse.epf.uma:MethodPlugin xmi:id="_Nh8H8K0EEdyKsPiG2Ur1fQ" name="meth_mgmt.review_status.base"
@@ -242,6 +242,7 @@
             <categorizedElements xsi:type="org.eclipse.epf.uma:Example" href="uma://_qqyzAJ6WEdyQN-zRFaRrCQ#_TuNhIEE4EdulKujnGUuxbg"/>
             <categorizedElements xsi:type="org.eclipse.epf.uma:Practice" href="uma://_qqyzAJ6WEdyQN-zRFaRrCQ#_LR_g4J9WEdy3Nc4rvuj7bA"/>
             <categorizedElements xsi:type="org.eclipse.epf.uma:Guideline" href="uma://_vJYucEfUEdyiPI8btkmvmw#_68JUYN8-Edyhmsbt0Xyl8A"/>
+            <categorizedElements xsi:type="org.eclipse.epf.uma:CustomCategory" href="#_Fl84sGjIEd2PJ-nlV-86WA"/>
           </contentElements>
           <contentElements xsi:type="org.eclipse.epf.uma:CustomCategory" xmi:id="_XIKbUK0EEdyKsPiG2Ur1fQ"
               name="returned_for_rework" guid="_XIKbUK0EEdyKsPiG2Ur1fQ" presentationName="Returned for Rework">
@@ -355,8 +356,6 @@
             <categorizedElements xsi:type="org.eclipse.epf.uma:Guideline" href="uma://_OOB2AAouEdyhlpBPrduOMw#_ByOd4O6pEduvoopEslG-4g"/>
             <categorizedElements xsi:type="org.eclipse.epf.uma:Guideline" href="uma://_DZ1rEI7-Edy7q8CKc_B8eg#_5s_DUJ03EdyQ3oTO93enUw"/>
             <categorizedElements xsi:type="org.eclipse.epf.uma:Guideline" href="uma://_OOB2AAouEdyhlpBPrduOMw#_mlKb8JyJEdy9brKHb521mQ"/>
-            <categorizedElements xsi:type="org.eclipse.epf.uma:Whitepaper" href="uma://_DZ1rEI7-Edy7q8CKc_B8eg#_t7IacJRmEdyrdaw_xGakyw"/>
-            <categorizedElements xsi:type="org.eclipse.epf.uma:Example" href="uma://_DZ1rEI7-Edy7q8CKc_B8eg#_QeE7YMCsEdyHnYlsYwuJQw"/>
             <categorizedElements xsi:type="org.eclipse.epf.uma:Task" href="uma://_DZ1rEI7-Edy7q8CKc_B8eg#_Ht-z8JfJEdyZkIR-s-Y8wQ"/>
             <categorizedElements xsi:type="org.eclipse.epf.uma:Concept" href="uma://_OOB2AAouEdyhlpBPrduOMw#_0LcUkA4LEduibvKwrGxWxA"/>
           </contentElements>
@@ -427,6 +426,12 @@
               presentationName="Evolutionary Architecture Passed"/>
           <contentElements xsi:type="org.eclipse.epf.uma:CustomCategory" xmi:id="_Onz6EGdwEd2ztMWPXX1L_A"
               name="passed_by_category" guid="_Onz6EGdwEd2ztMWPXX1L_A" categorizedElements="_LseNUGTeEd2Mod36zlj0MA _Ykr14GTeEd2Mod36zlj0MA _ZHVHUGWLEd2VvssSSHSnIg _bmuh8GWLEd2VvssSSHSnIg _doC5cGWLEd2VvssSSHSnIg"/>
+          <contentElements xsi:type="org.eclipse.epf.uma:CustomCategory" xmi:id="_Fl84sGjIEd2PJ-nlV-86WA"
+              name="tdd_ready" guid="_Fl84sGjIEd2PJ-nlV-86WA" presentationName="TDD Ready">
+            <categorizedElements xsi:type="org.eclipse.epf.uma:SupportingMaterial"
+                href="uma://_DZ1rEI7-Edy7q8CKc_B8eg#_vLvAUGjFEd2PJ-nlV-86WA"/>
+            <categorizedElements xsi:type="org.eclipse.epf.uma:Practice" href="uma://_DZ1rEI7-Edy7q8CKc_B8eg#_FUDtMB4mEd2bS8fFOQ7WWA"/>
+          </contentElements>
         </childPackages>
       </childPackages>
       <childPackages xsi:type="org.eclipse.epf.uma:ContentPackage" xmi:id="_Nh8H_K0EEdyKsPiG2Ur1fQ"
diff --git a/libraries/EPF_Practices_Library/practice.tech.evolutionary_design.base/guidances/checklists/design_vm.xmi b/libraries/EPF_Practices_Library/practice.tech.evolutionary_design.base/guidances/checklists/design.vm.xmi
similarity index 100%
rename from libraries/EPF_Practices_Library/practice.tech.evolutionary_design.base/guidances/checklists/design_vm.xmi
rename to libraries/EPF_Practices_Library/practice.tech.evolutionary_design.base/guidances/checklists/design.vm.xmi
diff --git a/libraries/EPF_Practices_Library/practice.tech.evolutionary_design.base/plugin.xmi b/libraries/EPF_Practices_Library/practice.tech.evolutionary_design.base/plugin.xmi
index ca71007..4fe2d60 100644
--- a/libraries/EPF_Practices_Library/practice.tech.evolutionary_design.base/plugin.xmi
+++ b/libraries/EPF_Practices_Library/practice.tech.evolutionary_design.base/plugin.xmi
@@ -2,8 +2,8 @@
 <xmi:XMI xmi:version="2.0"
     xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.5/uma.ecore" xmlns:org.eclipse.epf.uma.resourcemanager="http:///org/eclipse/epf/uma/resourcemanager.ecore"
-    xmlns:epf="http://www.eclipse.org/epf" epf:version="1.5.0" xmlns:rmc="http://www.ibm.com/rmc"
-    rmc:version="7.5.0">
+    xmlns:rmc="http://www.ibm.com/rmc" rmc:version="7.5.0" xmlns:epf="http://www.eclipse.org/epf"
+    epf:version="1.5.0">
   <org.eclipse.epf.uma.resourcemanager:ResourceManager xmi:id="_Z20lULPPEduocbW-TPTq7A"
       guid="_Z20lULPPEduocbW-TPTq7A">
     <resourceDescriptors xmi:id="_nGJZ0vL5Edm6Nvont3uinw" id="_NrC20qeqEdmKDbQuyzCoqQ"
@@ -13,7 +13,7 @@
     <resourceDescriptors xmi:id="_TVGdwDBGEduMqpUNhaTSRA" id="-1xE2ZW3MjNAJ7jkaZNbkww"
         uri="guidances/guidelines/designing_visually.xmi"/>
     <resourceDescriptors xmi:id="_eSrjED6TEduAL-bCqar_dg" id="-HQSI39vBrjpmQL1qHYOJtA"
-        uri="guidances/checklists/design_vm.xmi"/>
+        uri="guidances/checklists/design.vm.xmi"/>
     <resourceDescriptors xmi:id="_m-3tI_L5Edm6Nvont3uinw" id="_zxB-QKYcEdmvhNXG0Oc2uA"
         uri="workproducts/design.xmi"/>
     <resourceDescriptors xmi:id="_tCV2gPTfEduDKIuqTXQ8SA" id="-c5Uh71vXTPN-VmrGYVRV7w"
@@ -198,15 +198,15 @@
             <presentation xmi:id="-1xE2ZW3MjNAJ7jkaZNbkww" href="uma://-1xE2ZW3MjNAJ7jkaZNbkww#-1xE2ZW3MjNAJ7jkaZNbkww"/>
           </contentElements>
           <contentElements xsi:type="org.eclipse.epf.uma:Checklist" xmi:id="_nnSXcD6SEduAL-bCqar_dg"
-              name="design_vm" guid="_nnSXcD6SEduAL-bCqar_dg" presentationName="Visual Modeling Design"
+              name="design.vm" guid="_nnSXcD6SEduAL-bCqar_dg" presentationName="Visual Modeling Design"
               variabilityType="contributes" variabilityBasedOnElement="_0XSzsMlgEdmt3adZL5Dmdw">
             <presentation xmi:id="-HQSI39vBrjpmQL1qHYOJtA" href="uma://-HQSI39vBrjpmQL1qHYOJtA#-HQSI39vBrjpmQL1qHYOJtA"/>
           </contentElements>
           <contentElements xsi:type="org.eclipse.epf.uma:Guideline" xmi:id="_m42lMPTeEduDKIuqTXQ8SA"
-              name="analyze_the_design_vm" guid="_m42lMPTeEduDKIuqTXQ8SA" variabilityType="contributes"
+              name="analyze_the_design.vm" guid="_m42lMPTeEduDKIuqTXQ8SA" variabilityType="contributes"
               variabilityBasedOnElement="__MnggPTdEduDKIuqTXQ8SA" guidelines="_1fM3AC9_EduW5uTjiIcspQ"/>
           <contentElements xsi:type="org.eclipse.epf.uma:Guideline" xmi:id="_jkvJEPTeEduDKIuqTXQ8SA"
-              name="evolve_the_design_vm" guid="_jkvJEPTeEduDKIuqTXQ8SA" variabilityType="contributes"
+              name="evolve_the_design.vm" guid="_jkvJEPTeEduDKIuqTXQ8SA" variabilityType="contributes"
               variabilityBasedOnElement="_C4U9QPTeEduDKIuqTXQ8SA" guidelines="_1fM3AC9_EduW5uTjiIcspQ"/>
         </childPackages>
       </childPackages>
diff --git a/libraries/EPF_Practices_Library/practice.tech.test_driven_development.base/guidances/practices/test_driven_dev.xmi b/libraries/EPF_Practices_Library/practice.tech.test_driven_development.base/guidances/practices/test_driven_dev.xmi
index 6517282..e612929 100644
--- a/libraries/EPF_Practices_Library/practice.tech.test_driven_development.base/guidances/practices/test_driven_dev.xmi
+++ b/libraries/EPF_Practices_Library/practice.tech.test_driven_development.base/guidances/practices/test_driven_dev.xmi
@@ -1,10 +1,71 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <org.eclipse.epf.uma:PracticeDescription xmi:version="2.0"
     xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.5/uma.ecore"
-    xmlns:epf="http://www.eclipse.org/epf" epf:version="1.5.0" xmlns:rmc="http://www.ibm.com/rmc"
-    rmc:version="7.5.0" xmi:id="-nV4dgKPmOiwZnl6nUoKqQw"
-    name="new_practice,_FUDtMB4mEd2bS8fFOQ7WWA" guid="-nV4dgKPmOiwZnl6nUoKqQw" changeDate="2008-08-11T09:41:04.953-0700"
+    xmlns:rmc="http://www.ibm.com/rmc" rmc:version="7.5.0" xmlns:epf="http://www.eclipse.org/epf"
+    epf:version="1.5.0" xmi:id="-nV4dgKPmOiwZnl6nUoKqQw"
+    name="new_practice,_FUDtMB4mEd2bS8fFOQ7WWA" guid="-nV4dgKPmOiwZnl6nUoKqQw" changeDate="2008-08-12T16:31:22.245-0700"
     version="7.5.0">
+  <mainDescription>&lt;p>&#xD;
+    Test driven development&amp;nbsp;is the practice of writing&amp;nbsp;developer tests and&amp;nbsp;implementation code concurrently&#xD;
+    and at a very fine level of granularity.&#xD;
+&lt;/p>&#xD;
+&lt;p>&#xD;
+    In&amp;nbsp;test driven&amp;nbsp;design, the developer first writes a small test to validate a small change, runs the test to&#xD;
+    assure it fails (a sanity check), and then writes just enough&amp;nbsp;implementation code to make that&amp;nbsp;developer test&#xD;
+    run successfully. This cycle is short and it rarely goes beyond 10 minutes. In each cycle, the tests come first. Once a&#xD;
+    test is done, the&amp;nbsp;developer goes on to the next test until there are no more tests to be written for the&#xD;
+    implementation of the work item currently under development.&#xD;
+&lt;/p>&#xD;
+&lt;p>&#xD;
+    &lt;img alt=&quot;file:///C:/Documents%20and%20Settings/Administrator/Desktop/tdd_flow.jpg&quot; src=&quot;./resources/tdd_flow.jpg&quot; />&#xD;
+&lt;/p>&#xD;
+&lt;p>&#xD;
+    The practice of test driven development changes how&amp;nbsp;the developer&amp;nbsp;thinks. Tests are not written as an&#xD;
+    afterthought. Instead, developer tests are written as part of the everyday, every minute way of building software.&#xD;
+&lt;/p>&#xD;
+&lt;p>&#xD;
+    What are&amp;nbsp;the advantages of test driven design?&#xD;
+&lt;/p>&#xD;
+&lt;ol>&#xD;
+    &lt;li>&#xD;
+        Assumptions in the design are analyzed before the implementation code is written. To write developer tests, an&#xD;
+        examination must be made of the behavior of each piece of code to be written, correct and incorrect behaviors must&#xD;
+        be defined. In&amp;nbsp;a way, writing the tests before the code can be considered a version of detailed design.&#xD;
+    &lt;/li>&#xD;
+    &lt;li>&#xD;
+        Code units designed&amp;nbsp;for testability up front are cleaner and more loosely coupled.&#xD;
+    &lt;/li>&#xD;
+    &lt;li>&#xD;
+        Errors&amp;nbsp;are found earlier. Errors or gaps in the requirements and design are identified before coding begins&#xD;
+        when it could be more tempting to move ahead based on assumptions.&#xD;
+    &lt;/li>&#xD;
+    &lt;li>&#xD;
+        A clearer&amp;nbsp;collaboration strategy between the developer and others that might be responsible for the&#xD;
+        requirements, architecture, and design is put in place.&amp;nbsp;During the creation of the tests, there must be a&#xD;
+        meeting of the minds as to what&amp;nbsp;has been specified. After that, the implementation can carry on with&#xD;
+        confidence that there is a shared vision of what the code should do.&#xD;
+    &lt;/li>&#xD;
+    &lt;li>&#xD;
+        There are unambiguous criteria for completion of the code. When the tests pass, the code is working as specified.&#xD;
+        Non-functional quality dimensions can be dealt with separately, but there is a clear moment when the code behaves&#xD;
+        correctly.&#xD;
+    &lt;/li>&#xD;
+    &lt;li>&#xD;
+        The technique drives the developer to work in smaller increments with faster quality feedback. At any time the&#xD;
+        developer is just one test away from having error-free code.&#xD;
+    &lt;/li>&#xD;
+    &lt;li>&#xD;
+        There is a separation of concerns and effort between getting code working and improving the quality of the code&#xD;
+        that already runs correctly. Separating out these two areas of concern provides focus and time management support&#xD;
+        to a developer who in one pass over the implementation makes it pass the tests as simply as possible and then in a&#xD;
+        subsequent pass, looks for areas to improve.&#xD;
+    &lt;/li>&#xD;
+&lt;/ol>&#xD;
+&lt;p>&#xD;
+    See &lt;a class=&quot;elementLink&quot;&#xD;
+    href=&quot;./../../../practice.tech.test_driven_development.base/guidances/supportingmaterials/using_tdd_in_context_2ADBB50B.html&quot;&#xD;
+     guid=&quot;_vLvAUGjFEd2PJ-nlV-86WA&quot;>Using TDD in context&lt;/a>&amp;nbsp;for more information.&#xD;
+&lt;/p></mainDescription>
   <additionalInfo>&lt;p>&#xD;
     If you're just getting started with TDD or developer testing in general, you'll need to know why developer testing is a&#xD;
     good idea and the basics of what makes good developer tests. A good starting place is this &lt;a&#xD;
@@ -32,15 +93,17 @@
         &lt;a href=&quot;http://www.testdriven.com/&quot; target=&quot;_blank&quot;>Testdriven.com&lt;/a> is a developer testing site with a wealth&#xD;
         of information, news, and partner links about developer testing.&#xD;
     &lt;/li>&#xD;
+    &lt;li>&#xD;
+        Read the TDD whitepaper &lt;a href=&quot;http://www.agiledata.org/essays/tdd.html&quot; target=&quot;_blank&quot;>Introduction to TDD.&lt;/a>&#xD;
+    &lt;/li>&#xD;
 &lt;/ul>&#xD;
 &lt;p>&#xD;
     Once you're familiar with the basics of TDD,&amp;nbsp;select&amp;nbsp;various tasks to view more detail about what needs to be&#xD;
     done to perform the task. If you'll be creating a capability pattern or delivery process that includes TDD, see &lt;a&#xD;
-    class=&quot;elementLink&quot;&#xD;
-    href=&quot;./../../../practice.tech.test_driven_development.base/guidances/examples/using_tdd_in_context_F77E5C22.html&quot;&#xD;
-    guid=&quot;_QeE7YMCsEdyHnYlsYwuJQw&quot;>Using the TDD Practice in Context&lt;/a>. This shows one example of how TDD can be used in&#xD;
-    conjunction with other activities and capability patterns to create a pattern for developing software. This is only one&#xD;
-    possible example - there are many was to use TDD with other development practices.&#xD;
+    class=&quot;elementLink&quot; href=&quot;./../../../nullxusing_tdd_in_context_F77E5C22.html&quot; guid=&quot;_QeE7YMCsEdyHnYlsYwuJQw&quot;>Using the&#xD;
+    TDD Practice in Context&lt;/a>. This shows one example of how TDD can be used in conjunction with other activities and&#xD;
+    capability patterns to create a pattern for developing software. This is only one possible example - there are many was&#xD;
+    to use TDD with other development practices.&#xD;
 &lt;/p></additionalInfo>
   <problem>&lt;p>&#xD;
     The Test Driven Development practice reduces time to market by reducing the amount of time needed to integrate and&#xD;
@@ -56,19 +119,6 @@
     guid=&quot;_kh9FcJ02EdyQ3oTO93enUw&quot;>Developer Test&lt;/a>s.&#xD;
 &lt;/p>&#xD;
 &lt;p>&#xD;
-    TDD has&amp;nbsp;a simple flow: Create a new test to validate a planned change/addition to the software. Run the test to&#xD;
-    perform a sanity check - it should fail since no software has been written for it yet. Make a small change, refactor&#xD;
-    the code,&amp;nbsp;and run the test. Keep changing/refactoring/testing until the test passes and the code is in a robust,&#xD;
-    well-factored state. Then begin the cycle again on a new small piece of the solution.&#xD;
-&lt;/p>&#xD;
-&lt;p>&#xD;
-    &lt;img alt=&quot;file:///C:/Documents%20and%20Settings/Administrator/Desktop/tdd_flow.jpg&quot;&#xD;
-    src=&quot;./resources/tdd_flow.jpg&quot; />&lt;br />&#xD;
-&lt;/p>&lt;br />&#xD;
-&lt;p>&#xD;
-    &lt;strong>TDD Practice Information&lt;/strong>&#xD;
-&lt;/p>&#xD;
-&lt;p>&#xD;
     See the &lt;a class=&quot;elementLink&quot;&#xD;
     href=&quot;./../../../practice.tech.test_driven_development.base/guidances/roadmaps/adopt_tdd_practice_7D642D12.html&quot;&#xD;
     guid=&quot;_8yG48JRqEdyrdaw_xGakyw&quot;>How to Adopt the Test Driven Development Practice&lt;/a>&amp;nbsp;for information on navigating&#xD;
diff --git a/libraries/EPF_Practices_Library/practice.tech.test_driven_development.base/guidances/examples/using_tdd_in_context.xmi b/libraries/EPF_Practices_Library/practice.tech.test_driven_development.base/guidances/supportingmaterials/using_tdd_in_context.xmi
similarity index 64%
rename from libraries/EPF_Practices_Library/practice.tech.test_driven_development.base/guidances/examples/using_tdd_in_context.xmi
rename to libraries/EPF_Practices_Library/practice.tech.test_driven_development.base/guidances/supportingmaterials/using_tdd_in_context.xmi
index e8bb436..8f14bd0 100644
--- a/libraries/EPF_Practices_Library/practice.tech.test_driven_development.base/guidances/examples/using_tdd_in_context.xmi
+++ b/libraries/EPF_Practices_Library/practice.tech.test_driven_development.base/guidances/supportingmaterials/using_tdd_in_context.xmi
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:GuidanceDescription xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore"
-    xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmlns:rmc="http://www.ibm.com/rmc"
-    rmc:version="7.2.0" xmi:id="-TQU5YH4LPnqigOWvXe8sLA"
-    name="new_example,_QeE7YMCsEdyHnYlsYwuJQw" guid="-TQU5YH4LPnqigOWvXe8sLA" authors="Jim Ruehlin"
-    changeDate="2008-02-01T09:56:43.078-0800" version="7.2.0">
+<org.eclipse.epf.uma:ContentDescription xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.5/uma.ecore"
+    xmlns:rmc="http://www.ibm.com/rmc" rmc:version="7.5.0" xmlns:epf="http://www.eclipse.org/epf"
+    epf:version="1.5.0" xmi:id="-DAk3ahn7Yqi4DY4VKX5b7A"
+    name="new_supporting_material,_vLvAUGjFEd2PJ-nlV-86WA" guid="-DAk3ahn7Yqi4DY4VKX5b7A"
+    changeDate="2008-08-12T16:24:47.387-0700">
   <mainDescription>&lt;p>&#xD;
     The Test Driven Development practice is describes how to use TDD to create a high quality version of the&#xD;
     implementation. It should be used in conjunction with other practices or process elements to deliver high quality&#xD;
@@ -17,6 +17,6 @@
     then integrated with the rest of the system, and another small part of the system is selected for development.&amp;nbsp;&#xD;
 &lt;/p>&#xD;
 &lt;p>&#xD;
-    &lt;img height=&quot;587&quot; alt=&quot;&quot; src=&quot;resources/tdd_in_context.bmp&quot; width=&quot;598&quot; />&#xD;
+    &lt;img height=&quot;587&quot; alt=&quot;&quot; src=&quot;./resources/tdd_in_context.bmp&quot; width=&quot;598&quot; />&#xD;
 &lt;/p></mainDescription>
-</org.eclipse.epf.uma:GuidanceDescription>
+</org.eclipse.epf.uma:ContentDescription>
diff --git a/libraries/EPF_Practices_Library/practice.tech.test_driven_development.base/guidances/whitepapers/tdd_practice_whitepaper.xmi b/libraries/EPF_Practices_Library/practice.tech.test_driven_development.base/guidances/whitepapers/tdd_practice_whitepaper.xmi
deleted file mode 100644
index 2d8b327..0000000
--- a/libraries/EPF_Practices_Library/practice.tech.test_driven_development.base/guidances/whitepapers/tdd_practice_whitepaper.xmi
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:GuidanceDescription xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore"
-    xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmlns:rmc="http://www.ibm.com/rmc"
-    rmc:version="7.2.0" xmi:id="-2zZV_0MAt_SKIDiWIY3-AA"
-    name="new_whitepaper,_t7IacJRmEdyrdaw_xGakyw" guid="-2zZV_0MAt_SKIDiWIY3-AA" changeDate="2007-11-30T10:22:31.717-0800"
-    version="7.2.0">
-  <mainDescription>&lt;p>&#xD;
-    &lt;span style=&quot;FONT-FAMILY: Times&quot;>&lt;font size=&quot;2&quot;>The TDD whitepaper describes the TDD lifecycle as illustrated in this&#xD;
-    diagram:&lt;/font>&lt;/span>&#xD;
-&lt;/p>&#xD;
-&lt;p>&#xD;
-    &lt;span style=&quot;FONT-FAMILY: Times&quot;>&lt;strong>&lt;em>Note: This article describes Test Driven Design, so we may want to&#xD;
-    reference an article that only descirbes implementation - this practice does not address design. Also, we need to add&#xD;
-    refactoring to this image. The reference to the whitepaper should probably be changed in the final version to be a&#xD;
-    shippable whitepaper that includes refactoring.&lt;/em>&lt;/strong>&lt;/span>&#xD;
-&lt;/p>&#xD;
-&lt;p align=&quot;center&quot;>&#xD;
-    &lt;img src=&quot;http://www.agiledata.org/images/tddSteps.jpg&quot; border=&quot;0&quot; />&#xD;
-&lt;/p></mainDescription>
-  <attachments>&lt;a href=&quot;http://www.agiledata.org/essays/tdd.html&quot;>Test Driven Design&lt;/a></attachments>
-</org.eclipse.epf.uma:GuidanceDescription>
diff --git a/libraries/EPF_Practices_Library/practice.tech.test_driven_development.base/plugin.xmi b/libraries/EPF_Practices_Library/practice.tech.test_driven_development.base/plugin.xmi
index c468137..905bd76 100644
--- a/libraries/EPF_Practices_Library/practice.tech.test_driven_development.base/plugin.xmi
+++ b/libraries/EPF_Practices_Library/practice.tech.test_driven_development.base/plugin.xmi
@@ -6,8 +6,6 @@
     epf:version="1.5.0">
   <org.eclipse.epf.uma.resourcemanager:ResourceManager xmi:id="_DaytUI7-Edy7q8CKc_B8eg"
       guid="_DaytUI7-Edy7q8CKc_B8eg">
-    <resourceDescriptors xmi:id="_EwjdkJRoEdyrdaw_xGakyw" id="-2zZV_0MAt_SKIDiWIY3-AA"
-        uri="guidances/whitepapers/tdd_practice_whitepaper.xmi"/>
     <resourceDescriptors xmi:id="_Ce744ZRrEdyrdaw_xGakyw" id="-CGSI-WD83sE5swSmSDjAYA"
         uri="guidances/roadmaps/adopt_tdd_practice.xmi"/>
     <resourceDescriptors xmi:id="_cUUNkJSOEdyVKbgqUOtqQA" id="-UW-yTFk3AppqcGGU-Px63A"
@@ -18,10 +16,6 @@
         uri="tasks/implement_solution.xmi"/>
     <resourceDescriptors xmi:id="_ODebUZ04EdyQ3oTO93enUw" id="-mItcFA1WMTAyJvkqMrXuMQ"
         uri="guidances/guidelines/test_driven_development.xmi"/>
-    <resourceDescriptors xmi:id="_aLEfQJ04EdyQ3oTO93enUw" id="-1ydZfAL3PacfKwqzAF6hUw"
-        uri="guidances/concepts/test_driven_development.xmi"/>
-    <resourceDescriptors xmi:id="_BkYGwMCtEdyHnYlsYwuJQw" id="-TQU5YH4LPnqigOWvXe8sLA"
-        uri="guidances/examples/using_tdd_in_context.xmi"/>
     <resourceDescriptors xmi:id="_qXojsCZ3EdyUaK463Ozu5g" id="-ykYi7xrRdC5O9qFXhU3doA"
         uri="guidances/concepts/collective_code_ownership.xmi"/>
     <resourceDescriptors xmi:id="_GMGfcMVFEdybJe13vGdZaA" id="-z3O_gW_DHejhovzE53ctgw"
@@ -32,6 +26,8 @@
         uri="guidances/practices/test_driven_dev.xmi"/>
     <resourceDescriptors xmi:id="_gvl44SnlEd2W590fuUWNqw" id="-7ketKzGlDB1TVwsYHvVLfg"
         uri="guidances/guidelines/developer_testing.tdd.xmi"/>
+    <resourceDescriptors xmi:id="_2oHSUWjFEd2PJ-nlV-86WA" id="-DAk3ahn7Yqi4DY4VKX5b7A"
+        uri="guidances/supportingmaterials/using_tdd_in_context.xmi"/>
   </org.eclipse.epf.uma.resourcemanager:ResourceManager>
   <org.eclipse.epf.uma:MethodPlugin xmi:id="_DZ1rEI7-Edy7q8CKc_B8eg" name="practice.tech.test_driven_development.base"
       guid="_DZ1rEI7-Edy7q8CKc_B8eg" presentationName="Test-Driven Development" briefDescription="This practice develops tests prior to implementing the code and uses those tests to drive the implementation."
@@ -66,19 +62,12 @@
           name="CoreContent" guid="_DZ1rHI7-Edy7q8CKc_B8eg">
         <childPackages xsi:type="org.eclipse.epf.uma:ContentPackage" xmi:id="_iEvlIJMPEdyaRZQqSbPe-w"
             name="test_driven_development" guid="_iEvlIJMPEdyaRZQqSbPe-w" presentationName="Test Driven Development">
-          <contentElements xsi:type="org.eclipse.epf.uma:Whitepaper" xmi:id="_t7IacJRmEdyrdaw_xGakyw"
-              name="tdd_practice_whitepaper" guid="_t7IacJRmEdyrdaw_xGakyw" presentationName="Test Driven Development"
-              briefDescription="This whitepaper provides a detailed description of test driven development.">
-            <presentation xmi:id="-2zZV_0MAt_SKIDiWIY3-AA" href="uma://-2zZV_0MAt_SKIDiWIY3-AA#-2zZV_0MAt_SKIDiWIY3-AA"/>
-          </contentElements>
           <contentElements xsi:type="org.eclipse.epf.uma:Roadmap" xmi:id="_8yG48JRqEdyrdaw_xGakyw"
               name="adopt_tdd_practice" guid="_8yG48JRqEdyrdaw_xGakyw" presentationName="How to Adopt the Test Driven Development Practice"
               briefDescription="This roadmap describes how to adopt the Test Driven Development (TDD) Practice."
-              examples="_QeE7YMCsEdyHnYlsYwuJQw">
+              supportingMaterials="_vLvAUGjFEd2PJ-nlV-86WA">
             <presentation xmi:id="-CGSI-WD83sE5swSmSDjAYA" href="uma://-CGSI-WD83sE5swSmSDjAYA#-CGSI-WD83sE5swSmSDjAYA"/>
             <conceptsAndPapers href="uma://_OOB2AAouEdyhlpBPrduOMw#_ADwlAJRtEdyrdaw_xGakyw"/>
-            <conceptsAndPapers href="#_aI-NgJ04EdyQ3oTO93enUw"/>
-            <conceptsAndPapers href="#_t7IacJRmEdyrdaw_xGakyw"/>
           </contentElements>
           <contentElements xsi:type="org.eclipse.epf.uma:Task" xmi:id="_znlIcJR9EdyVKbgqUOtqQA"
               name="implement_developer_tests" guid="_znlIcJR9EdyVKbgqUOtqQA" presentationName="Implement Developer Tests"
@@ -115,23 +104,11 @@
               name="test_driven_development" guid="_5s_DUJ03EdyQ3oTO93enUw" presentationName="Test Driven Development"
               briefDescription="This guideline explains how to apply test driven design.">
             <presentation xmi:id="-mItcFA1WMTAyJvkqMrXuMQ" href="uma://-mItcFA1WMTAyJvkqMrXuMQ#-mItcFA1WMTAyJvkqMrXuMQ"/>
-            <conceptsAndPapers href="#_aI-NgJ04EdyQ3oTO93enUw"/>
             <conceptsAndPapers href="uma://_OOB2AAouEdyhlpBPrduOMw#_ADwlAJRtEdyrdaw_xGakyw"/>
             <conceptsAndPapers href="uma://_OOB2AAouEdyhlpBPrduOMw#_Poc7IPDzEdqYgerqi84oCA"/>
             <guidelines href="uma://_OOB2AAouEdyhlpBPrduOMw#_YNx2sJ05EdyQ3oTO93enUw"/>
             <guidelines href="uma://_OOB2AAouEdyhlpBPrduOMw#_ByOd4O6pEduvoopEslG-4g"/>
           </contentElements>
-          <contentElements xsi:type="org.eclipse.epf.uma:Concept" xmi:id="_aI-NgJ04EdyQ3oTO93enUw"
-              name="test_driven_development" guid="_aI-NgJ04EdyQ3oTO93enUw" presentationName="Test Driven Development"
-              briefDescription="This concept describes a technique to bring test design chronologically in-line with software design."
-              examples="_QeE7YMCsEdyHnYlsYwuJQw">
-            <presentation xmi:id="-1ydZfAL3PacfKwqzAF6hUw" href="uma://-1ydZfAL3PacfKwqzAF6hUw#-1ydZfAL3PacfKwqzAF6hUw"/>
-          </contentElements>
-          <contentElements xsi:type="org.eclipse.epf.uma:Example" xmi:id="_QeE7YMCsEdyHnYlsYwuJQw"
-              name="using_tdd_in_context" guid="_QeE7YMCsEdyHnYlsYwuJQw" presentationName="Using the TDD Practice in Context"
-              briefDescription="This is one example of how the TDD practice can be used in conjunction with other practices in a development process.">
-            <presentation xmi:id="-TQU5YH4LPnqigOWvXe8sLA" href="uma://-TQU5YH4LPnqigOWvXe8sLA#-TQU5YH4LPnqigOWvXe8sLA"/>
-          </contentElements>
           <contentElements xsi:type="org.eclipse.epf.uma:Concept" xmi:id="_xYMPoCZnEdyUaK463Ozu5g"
               name="collective_code_ownership" guid="_xYMPoCZnEdyUaK463Ozu5g" presentationName="Collective Code Ownership"
               briefDescription="This concept explains the value of an atmosphere where any team member can change any piece of code in the system.">
@@ -157,19 +134,17 @@
             <contentReferences xsi:type="org.eclipse.epf.uma:Concept" href="#_xYMPoCZnEdyUaK463Ozu5g"/>
             <contentReferences xsi:type="org.eclipse.epf.uma:Concept" href="uma://_OOB2AAouEdyhlpBPrduOMw#_ADwlAJRtEdyrdaw_xGakyw"/>
             <contentReferences xsi:type="org.eclipse.epf.uma:Concept" href="uma://_OOB2AAouEdyhlpBPrduOMw#_Poc7IPDzEdqYgerqi84oCA"/>
-            <contentReferences xsi:type="org.eclipse.epf.uma:Concept" href="#_aI-NgJ04EdyQ3oTO93enUw"/>
             <contentReferences xsi:type="org.eclipse.epf.uma:Guideline" href="uma://_OOB2AAouEdyhlpBPrduOMw#_ByOd4O6pEduvoopEslG-4g"/>
             <contentReferences xsi:type="org.eclipse.epf.uma:Guideline" href="uma://_OOB2AAouEdyhlpBPrduOMw#_YNx2sJ05EdyQ3oTO93enUw"/>
             <contentReferences xsi:type="org.eclipse.epf.uma:Guideline" href="uma://_OOB2AAouEdyhlpBPrduOMw#_mlKb8JyJEdy9brKHb521mQ"/>
             <contentReferences xsi:type="org.eclipse.epf.uma:Guideline" href="#_5s_DUJ03EdyQ3oTO93enUw"/>
             <contentReferences xsi:type="org.eclipse.epf.uma:Artifact" href="uma://_OOB2AAouEdyhlpBPrduOMw#_kh9FcJ02EdyQ3oTO93enUw"/>
             <contentReferences xsi:type="org.eclipse.epf.uma:Artifact" href="uma://_OOB2AAouEdyhlpBPrduOMw#_JqYbgJ01EdyQ3oTO93enUw"/>
-            <contentReferences xsi:type="org.eclipse.epf.uma:Whitepaper" href="#_t7IacJRmEdyrdaw_xGakyw"/>
             <contentReferences xsi:type="org.eclipse.epf.uma:Task" href="#_znlIcJR9EdyVKbgqUOtqQA"/>
             <contentReferences xsi:type="org.eclipse.epf.uma:Task" href="#_Ht-z8JfJEdyZkIR-s-Y8wQ"/>
             <contentReferences xsi:type="org.eclipse.epf.uma:Task" href="#_R7atwJfIEdyZkIR-s-Y8wQ"/>
             <contentReferences xsi:type="org.eclipse.epf.uma:Roadmap" href="#_8yG48JRqEdyrdaw_xGakyw"/>
-            <contentReferences xsi:type="org.eclipse.epf.uma:Example" href="#_QeE7YMCsEdyHnYlsYwuJQw"/>
+            <contentReferences xsi:type="org.eclipse.epf.uma:SupportingMaterial" href="#_vLvAUGjFEd2PJ-nlV-86WA"/>
           </contentElements>
           <contentElements xsi:type="org.eclipse.epf.uma:Guideline" xmi:id="_PnYQMCnkEd2W590fuUWNqw"
               name="implementation_refactoring.tdd" guid="_PnYQMCnkEd2W590fuUWNqw"
@@ -187,6 +162,11 @@
             <presentation xmi:id="-7ketKzGlDB1TVwsYHvVLfg" href="uma://-7ketKzGlDB1TVwsYHvVLfg#-7ketKzGlDB1TVwsYHvVLfg"/>
             <variabilityBasedOnElement xsi:type="org.eclipse.epf.uma:Guideline" href="uma://_OOB2AAouEdyhlpBPrduOMw#_ByOd4O6pEduvoopEslG-4g"/>
           </contentElements>
+          <contentElements xsi:type="org.eclipse.epf.uma:SupportingMaterial" xmi:id="_vLvAUGjFEd2PJ-nlV-86WA"
+              name="using_tdd_in_context" guid="_vLvAUGjFEd2PJ-nlV-86WA" presentationName="Using TDD in context"
+              briefDescription="This is one example of how the TDD practice can be used in conjunction with other practices in a development process.">
+            <presentation xmi:id="-DAk3ahn7Yqi4DY4VKX5b7A" href="uma://-DAk3ahn7Yqi4DY4VKX5b7A#-DAk3ahn7Yqi4DY4VKX5b7A"/>
+          </contentElements>
         </childPackages>
       </childPackages>
       <childPackages xsi:type="org.eclipse.epf.uma:ProcessPackage" xmi:id="_DZ1rHY7-Edy7q8CKc_B8eg"