diff --git a/templates/CFTP-3.html.tmpl b/templates/CFTP-3.html.tmpl
index c3bdbd5..45106cc 100644
--- a/templates/CFTP-3.html.tmpl
+++ b/templates/CFTP-3.html.tmpl
@@ -229,7 +229,9 @@
         <h3 id="section_8_2"><span>8.2</span>Test Execution</h3>
         <p>Test results shall be recorded in a way that independent reviewer can compare the documented acceptance criteria against the (written or captured) test evidence and determine whether the test results meet these criteria.</p>
 
-        <p>In the case that the test execution is fully automated:</p>
+        <h4 id="section_8_2_1">Execution of Automated Test Cases</h4>
+        <p>In case test execution is automated:</p>
+
         <p>Jenkins (Technical Role) shall:</p>
         <ul>
             <li>execute the test cases</li>
@@ -238,9 +240,12 @@
             <li>stop the test execution if one of the test cases has failed</li>
             <li>report back the test execution results to the Test Management Tool</li>
         </ul>
+
         <p>As the execution is fully automated, as included in the section 3 "Roles and Responsibilities" the Tester and Test Administrator does not apply.</p>
 
-        <p>In the case that the test execution is not fully automated:</p>
+        <h4 id="section_8_2_2">Execution of Manual Test Cases</h4>
+        <p>In case test execution is manual:</p>
+
         <p>Testers shall:</p>
         <ul>
             <li>execute test cases</li>
@@ -252,7 +257,7 @@
             <li>if any deviations from the test are encountered, follow the Test Case Failure and Problem Resolution (see section 10)</li>
         </ul>
 
-        <p>If a test case is executed by more than one person (tester), it is required that each tester signs (signature or initials and date) each test step for traceability purpose.</p>
+        <p>If a test case is executed by more than one person (tester), it is required that each tester signs (signature or initials and date) each test step for traceability purposes.</p>
 
         <p>The Test Administrators shall:</p>
         <ul>
@@ -261,12 +266,13 @@
         </ul>
 
         <p>Test execution and test result review must be independent, i.e. for any individual test case the Tester and the Test Administrator must be different individuals.</p>
+        <p>The training records of all testers should be verified prior to initiating testing.</p>
+
         <table class="no-border">
             <tr>
                 <td class="content-wrappable no-border">{{{data.sections.sec8s2.content}}}</td>
             </tr>
         </table>
-        <p>The training records of all testers should be verified prior to initiating testing.</p>
     </div>
 
 
diff --git a/templates/CFTP-4.html.tmpl b/templates/CFTP-4.html.tmpl
index d264e11..a3fb5d7 100644
--- a/templates/CFTP-4.html.tmpl
+++ b/templates/CFTP-4.html.tmpl
@@ -232,7 +232,9 @@
         <h3 id="section_8_2"><span>8.2</span>Test Execution</h3>
         <p>Test results shall be recorded in a way that independent reviewer can compare the documented acceptance criteria against the (written or captured) test evidence and determine whether the test results meet these criteria.</p>
 
-        <p>In the case that the test execution is fully automated:</p>
+        <h4 id="section_8_2_1">Execution of Automated Test Cases</h4>
+        <p>In case test execution is automated:</p>
+
         <p>Jenkins (Technical Role) shall:</p>
         <ul>
             <li>execute the test cases</li>
@@ -241,9 +243,12 @@
             <li>stop the test execution if one of the test cases has failed</li>
             <li>report back the test execution results to the Test Management Tool</li>
         </ul>
+
         <p>As the execution is fully automated, as included in the section 3 "Roles and Responsibilities" the Tester and Test Administrator does not apply.</p>
 
-        <p>In the case that the test execution is not fully automated:</p>
+        <h4 id="section_8_2_2">Execution of Manual Test Cases</h4>
+        <p>In case test execution is manual:</p>
+
         <p>Testers shall:</p>
         <ul>
             <li>execute test cases</li>
@@ -255,7 +260,7 @@
             <li>if any deviations from the test are encountered, follow the Test Case Failure and Problem Resolution (see section 10)</li>
         </ul>
 
-        <p>If a test case is executed by more than one person (tester), it is required that each tester signs (signature or initials and date) each test step for traceability purpose.</p>
+        <p>If a test case is executed by more than one person (tester), it is required that each tester signs (signature or initials and date) each test step for traceability purposes.</p>
 
         <p>The Test Administrators shall:</p>
         <ul>
@@ -264,12 +269,13 @@
         </ul>
 
         <p>Test execution and test result review must be independent, i.e. for any individual test case the Tester and the Test Administrator must be different individuals.</p>
+        <p>The training records of all testers should be verified prior to initiating testing.</p>
+
         <table class="no-border">
             <tr>
                 <td class="content-wrappable no-border">{{{data.sections.sec8s2.content}}}</td>
             </tr>
         </table>
-        <p>The training records of all testers should be verified prior to initiating testing.</p>
     </div>
 
 
diff --git a/templates/CFTP-5.html.tmpl b/templates/CFTP-5.html.tmpl
index 405e213..2e85cc4 100644
--- a/templates/CFTP-5.html.tmpl
+++ b/templates/CFTP-5.html.tmpl
@@ -232,7 +232,9 @@
         <h3 id="section_8_2"><span>8.2</span>Test Execution</h3>
         <p>Test results shall be recorded in a way that independent reviewer can compare the documented acceptance criteria against the (written or captured) test evidence and determine whether the test results meet these criteria.</p>
 
-        <p>In the case that the test execution is fully automated:</p>
+        <h4 id="section_8_2_1">Execution of Automated Test Cases</h4>
+        <p>In case test execution is automated:</p>
+
         <p>Jenkins (Technical Role) shall:</p>
         <ul>
             <li>execute the test cases</li>
@@ -241,9 +243,12 @@
             <li>stop the test execution if one of the test cases has failed</li>
             <li>report back the test execution results to the Test Management Tool</li>
         </ul>
+
         <p>As the execution is fully automated, as included in the section 3 "Roles and Responsibilities" the Tester and Test Administrator does not apply.</p>
 
-        <p>In the case that the test execution is not fully automated:</p>
+        <h4 id="section_8_2_2">Execution of Manual Test Cases</h4>
+        <p>In case test execution is manual:</p>
+
         <p>Testers shall:</p>
         <ul>
             <li>execute test cases</li>
@@ -255,7 +260,7 @@
             <li>if any deviations from the test are encountered, follow the Test Case Failure and Problem Resolution (see section 10)</li>
         </ul>
 
-        <p>If a test case is executed by more than one person (tester), it is required that each tester signs (signature or initials and date) each test step for traceability purpose.</p>
+        <p>If a test case is executed by more than one person (tester), it is required that each tester signs (signature or initials and date) each test step for traceability purposes.</p>
 
         <p>The Test Administrators shall:</p>
         <ul>
@@ -264,12 +269,13 @@
         </ul>
 
         <p>Test execution and test result review must be independent, i.e. for any individual test case the Tester and the Test Administrator must be different individuals.</p>
+        <p>The training records of all testers should be verified prior to initiating testing.</p>
+
         <table class="no-border">
             <tr>
                 <td class="content-wrappable no-border">{{{data.sections.sec8s2.content}}}</td>
             </tr>
         </table>
-        <p>The training records of all testers should be verified prior to initiating testing.</p>
     </div>