https://bugs.eclipse.org/bugs/show_bug.cgi?id=243938
diff --git a/libraries/EPF_Practices_Library/core.tech.common.base/guidances/concepts/developer_testing.xmi b/libraries/EPF_Practices_Library/core.tech.common.base/guidances/concepts/developer_testing.xmi
index ba4c47a..7844033 100644
--- a/libraries/EPF_Practices_Library/core.tech.common.base/guidances/concepts/developer_testing.xmi
+++ b/libraries/EPF_Practices_Library/core.tech.common.base/guidances/concepts/developer_testing.xmi
@@ -1,9 +1,9 @@
 <?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="-EOoqKeF2SEXao6XhNXBD-w"
-    name=",_ADwlAJRtEdyrdaw_xGakyw" guid="-EOoqKeF2SEXao6XhNXBD-w" changeDate="2008-08-11T09:09:21.312-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="-EOoqKeF2SEXao6XhNXBD-w"
+    name=",_ADwlAJRtEdyrdaw_xGakyw" guid="-EOoqKeF2SEXao6XhNXBD-w" changeDate="2008-08-12T17:15:16.733-0700"
     version="7.2.0">
   <mainDescription>&lt;p>&#xD;
     Developer testing is the act of regression testing source code by developers. This is sometimes called &quot;unit regression&#xD;
@@ -64,59 +64,5 @@
         It is minimally cohesive. The test represents one step toward your overall goal. The test should address one and&#xD;
         one only issue.&#xD;
     &lt;/li>&#xD;
-&lt;/ul>&#xD;
-&lt;h3>&#xD;
-    Approaches for Test Setup&#xD;
-&lt;/h3>&#xD;
-&lt;p>&#xD;
-    To successfully run a test, the system must be in a known state. To do this you will need objects or components in&#xD;
-    memory, rows in the database, etc. that you will test against. The easiest approach is to hardcode the required data&#xD;
-    and the setup code within the test itself. The primary advantage is that all the information that you need about the&#xD;
-    test is in one place and that the test is potentially self-sufficient.&#xD;
-&lt;/p>&#xD;
-&lt;p>&#xD;
-    Another approach is to define an external data set which is loaded into memory or into the database at the beginning of&#xD;
-    the test run. There are several advantages to this approach:&#xD;
-&lt;/p>&#xD;
-&lt;ul>&#xD;
-    &lt;li>&#xD;
-        It decouples the test data from the test.&#xD;
-    &lt;/li>&#xD;
-    &lt;li>&#xD;
-        More than one test can use the same data set.&#xD;
-    &lt;/li>&#xD;
-    &lt;li>&#xD;
-        It is easy to modify and/or multiply the test data.&#xD;
-    &lt;/li>&#xD;
-&lt;/ul>&#xD;
-&lt;p>&#xD;
-    There are some disadvantages to this approach:&#xD;
-&lt;/p>&#xD;
-&lt;ul>&#xD;
-    &lt;li>&#xD;
-        Increased complexity for maintaining the external data&#xD;
-    &lt;/li>&#xD;
-    &lt;li>&#xD;
-        Potential coupling between test cases. When they share a common test data bed it becomes very easy to write tests&#xD;
-        that depend on other tests running first, thereby coupling them together.&#xD;
-    &lt;/li>&#xD;
-&lt;/ul>&#xD;
-&lt;h3>&#xD;
-    Coding for Testability&#xD;
-&lt;/h3>&#xD;
-&lt;p>&#xD;
-    Add&amp;nbsp;&lt;a class=&quot;elementLink&quot;&#xD;
-    href=&quot;./../../../core.tech.common.base/guidances/termdefinitions/code_instrumentation_3060875F.html&quot;&#xD;
-    guid=&quot;_lzAWkK9eEdyltJ0KgEd9WQ&quot;>code instrumentation&lt;/a> for testing and debugging. Pay special attention to the&#xD;
-    implementation of the observation/control points, such as critical functions or objects, as these aspects might need&#xD;
-    special support that has to be implemented in the iunder test.&#xD;
-&lt;/p>&#xD;
-&lt;h3>&#xD;
-    Reviewing Tests&#xD;
-&lt;/h3>&#xD;
-&lt;p>&#xD;
-    If a test will be long-lived, ask a person with less inside knowledge of the implementation element to run it and check&#xD;
-    if there is enough support information. Review it with other people within the development team and other interested&#xD;
-    parties as needed.&#xD;
-&lt;/p></mainDescription>
+&lt;/ul></mainDescription>
 </org.eclipse.epf.uma:ContentDescription>
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 0bcfa74..6e4e80e 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
@@ -27,6 +27,9 @@
     either proceed to the next change or fix the last change. Expect to spend some effort making that rapid feedback&#xD;
     possible.&#xD;
 &lt;/p>&#xD;
+&lt;h3>&#xD;
+    Write and maintain&amp;nbsp;tests&#xD;
+&lt;/h3>&#xD;
 &lt;h4>&#xD;
     Automate your tests&#xD;
 &lt;/h4>&#xD;
@@ -311,6 +314,60 @@
 &lt;p>&#xD;
     Typically, tests are put in the same package as the class they test. They are given protected or friend access.&#xD;
 &lt;/p>&#xD;
+&lt;h4>&#xD;
+    Approaches for Test Setup&#xD;
+&lt;/h4>&#xD;
+&lt;p>&#xD;
+    To successfully run a test, the system must be in a known state. To do this you will need objects or components in&#xD;
+    memory, rows in the database, etc. that you will test against. The easiest approach is to hardcode the required data&#xD;
+    and the setup code within the test itself. The primary advantage is that all the information that you need about the&#xD;
+    test is in one place and that the test is potentially self-sufficient.&#xD;
+&lt;/p>&#xD;
+&lt;p>&#xD;
+    Another approach is to define an external data set which is loaded into memory or into the database at the beginning of&#xD;
+    the test run. There are several advantages to this approach:&#xD;
+&lt;/p>&#xD;
+&lt;ul>&#xD;
+    &lt;li>&#xD;
+        It decouples the test data from the test.&#xD;
+    &lt;/li>&#xD;
+    &lt;li>&#xD;
+        More than one test can use the same data set.&#xD;
+    &lt;/li>&#xD;
+    &lt;li>&#xD;
+        It is easy to modify and/or multiply the test data.&#xD;
+    &lt;/li>&#xD;
+&lt;/ul>&#xD;
+&lt;p>&#xD;
+    There are some disadvantages to this approach:&#xD;
+&lt;/p>&#xD;
+&lt;ul>&#xD;
+    &lt;li>&#xD;
+        Increased complexity for maintaining the external data&#xD;
+    &lt;/li>&#xD;
+    &lt;li>&#xD;
+        Potential coupling between test cases. When they share a common test data bed it becomes very easy to write tests&#xD;
+        that depend on other tests running first, thereby coupling them together.&#xD;
+    &lt;/li>&#xD;
+&lt;/ul>&#xD;
+&lt;h4>&#xD;
+    Coding for Testability&#xD;
+&lt;/h4>&#xD;
+&lt;p>&#xD;
+    Add&amp;nbsp;&lt;a class=&quot;elementLink&quot;&#xD;
+    href=&quot;./../../../core.tech.common.base/guidances/termdefinitions/code_instrumentation_3060875F.html&quot;&#xD;
+    guid=&quot;_lzAWkK9eEdyltJ0KgEd9WQ&quot;>code instrumentation&lt;/a> for testing and debugging. Pay special attention to the&#xD;
+    implementation of the observation/control points, such as critical functions or objects, as these aspects might need&#xD;
+    special support that has to be implemented in the iunder test.&#xD;
+&lt;/p>&#xD;
+&lt;h4>&#xD;
+    Reviewing Tests&#xD;
+&lt;/h4>&#xD;
+&lt;p>&#xD;
+    If a test will be long-lived, ask a person with less inside knowledge of the implementation element to run it and check&#xD;
+    if there is enough support information. Review it with other people within the development team and other interested&#xD;
+    parties as needed.&#xD;
+&lt;/p>&#xD;
 &lt;h3>&#xD;
     &lt;a id=&quot;TestDesignMistakes&quot; name=&quot;TestDesignMistakes&quot;>&lt;/a>Characteristic Test Design Mistakes&#xD;
 &lt;/h3>&#xD;