diff --git a/TestON/Documentation/TestON_Document/TestON.tests-module.html b/TestON/Documentation/TestON_Document/TestON.tests-module.html
index 50b77b7..973e469 100644
--- a/TestON/Documentation/TestON_Document/TestON.tests-module.html
+++ b/TestON/Documentation/TestON_Document/TestON.tests-module.html
@@ -30,7 +30,12 @@
       <th>&nbsp;&nbsp;&nbsp;<a
         href="help.html">Help</a>&nbsp;&nbsp;&nbsp;</th>
 
-      <th class="navbar" width="100%"></th>
+  <!-- Project homepage -->
+      <th class="navbar" align="right" width="100%">
+        <table border="0" cellpadding="0" cellspacing="0">
+          <tr><th class="navbar" align="center"
+            >TestON</th>
+          </tr></table></th>
   </tr>
 </table>
 <table width="100%" cellpadding="0" cellspacing="0">
@@ -75,45 +80,139 @@
 </tr>
   <tr><td class="summary">
   <ul class="nomargin">
-    <li> <strong class="uidlink"><a href="TestON.tests.DpctlTest-module.html">TestON.tests.DpctlTest</a></strong>
+    <li> <strong class="uidlink"><a href="TestON.tests.CHOtest-module.html">TestON.tests.CHOtest</a></strong>
     <ul>
-    <li> <strong class="uidlink"><a href="TestON.tests.DpctlTest.DpctlTest-module.html">TestON.tests.DpctlTest.DpctlTest</a></strong>    </li>
+    <li> <strong class="uidlink"><a href="TestON.tests.CHOtest.CHOtest-module.html">TestON.tests.CHOtest.CHOtest</a></strong>    </li>
     </ul>
     </li>
-    <li> <strong class="uidlink"><a href="TestON.tests.FvtTest-module.html">TestON.tests.FvtTest</a></strong>
+    <li> <strong class="uidlink"><a href="TestON.tests.FUNCintent-module.html">TestON.tests.FUNCintent</a></strong>
     <ul>
-    <li> <strong class="uidlink"><a href="TestON.tests.FvtTest.FvtTest-module.html">TestON.tests.FvtTest.FvtTest</a></strong>    </li>
+    <li> <strong class="uidlink"><a href="TestON.tests.FUNCintent.FUNCintent-module.html">TestON.tests.FUNCintent.FUNCintent</a></strong>    </li>
     </ul>
     </li>
-    <li> <strong class="uidlink"><a href="TestON.tests.HPSwitchTest-module.html">TestON.tests.HPSwitchTest</a></strong>
+    <li> <strong class="uidlink"><a href="TestON.tests.HAclusterRestart-module.html">TestON.tests.HAclusterRestart</a></strong>
     <ul>
-    <li> <strong class="uidlink"><a href="TestON.tests.HPSwitchTest.HPSwitchTest-module.html">TestON.tests.HPSwitchTest.HPSwitchTest</a></strong>    </li>
+    <li> <strong class="uidlink"><a href="TestON.tests.HAclusterRestart.HAclusterRestart-module.html">TestON.tests.HAclusterRestart.HAclusterRestart</a></strong>: <em class="summary">Description: This test is to determine if ONOS can handle
+    all of it's nodes restarting</em>    </li>
+    <li> <strong class="uidlink"><a href="TestON.tests.HAclusterRestart.dependencies-module.html">TestON.tests.HAclusterRestart.dependencies</a></strong>
+    <ul>
+    <li> <strong class="uidlink"><a href="TestON.tests.HAclusterRestart.dependencies.Counters-module.html">TestON.tests.HAclusterRestart.dependencies.Counters</a></strong>    </li>
+    <li> <strong class="uidlink"><a href="TestON.tests.HAclusterRestart.dependencies.obelisk-module.html">TestON.tests.HAclusterRestart.dependencies.obelisk</a></strong>    </li>
     </ul>
     </li>
-    <li> <strong class="uidlink"><a href="TestON.tests.MininetTest-module.html">TestON.tests.MininetTest</a></strong>
-    <ul>
-    <li> <strong class="uidlink"><a href="TestON.tests.MininetTest.MininetTest-module.html">TestON.tests.MininetTest.MininetTest</a></strong>: <em class="summary">Created on 29-Oct-2012</em>    </li>
     </ul>
     </li>
-    <li> <strong class="uidlink"><a href="TestON.tests.PoxTest-module.html">TestON.tests.PoxTest</a></strong>
+    <li> <strong class="uidlink"><a href="TestON.tests.HAminorityRestart-module.html">TestON.tests.HAminorityRestart</a></strong>
     <ul>
-    <li> <strong class="uidlink"><a href="TestON.tests.PoxTest.PoxTest-module.html">TestON.tests.PoxTest.PoxTest</a></strong>    </li>
+    <li> <strong class="uidlink"><a href="TestON.tests.HAminorityRestart.HAminorityRestart-module.html">TestON.tests.HAminorityRestart.HAminorityRestart</a></strong>: <em class="summary">Description: This test is to determine if ONOS can handle
+    a minority of it's nodes restarting</em>    </li>
+    <li> <strong class="uidlink"><a href="TestON.tests.HAminorityRestart.dependencies-module.html">TestON.tests.HAminorityRestart.dependencies</a></strong>
+    <ul>
+    <li> <strong class="uidlink"><a href="TestON.tests.HAminorityRestart.dependencies.Counters-module.html">TestON.tests.HAminorityRestart.dependencies.Counters</a></strong>    </li>
+    <li> <strong class="uidlink"><a href="TestON.tests.HAminorityRestart.dependencies.obelisk-module.html">TestON.tests.HAminorityRestart.dependencies.obelisk</a></strong>    </li>
     </ul>
     </li>
-    <li> <strong class="uidlink"><a href="TestON.tests.TicketBooking-module.html">TestON.tests.TicketBooking</a></strong>
-    <ul>
-    <li> <strong class="uidlink"><a href="TestON.tests.TicketBooking.TicketBooking-module.html">TestON.tests.TicketBooking.TicketBooking</a></strong>    </li>
     </ul>
     </li>
-    <li> <strong class="uidlink"><a href="TestON.tests.VyattaTest-module.html">TestON.tests.VyattaTest</a></strong>
+    <li> <strong class="uidlink"><a href="TestON.tests.HAsanity-module.html">TestON.tests.HAsanity</a></strong>
     <ul>
-    <li> <strong class="uidlink"><a href="TestON.tests.VyattaTest.VyattaTest-module.html">TestON.tests.VyattaTest.VyattaTest</a></strong>    </li>
+    <li> <strong class="uidlink"><a href="TestON.tests.HAsanity.HAsanity-module.html">TestON.tests.HAsanity.HAsanity</a></strong>: <em class="summary">Description: This test is to determine if the HA test setup is
+    working correctly.</em>    </li>
+    <li> <strong class="uidlink"><a href="TestON.tests.HAsanity.dependencies-module.html">TestON.tests.HAsanity.dependencies</a></strong>
+    <ul>
+    <li> <strong class="uidlink"><a href="TestON.tests.HAsanity.dependencies.Counters-module.html">TestON.tests.HAsanity.dependencies.Counters</a></strong>    </li>
+    <li> <strong class="uidlink"><a href="TestON.tests.HAsanity.dependencies.obelisk-module.html">TestON.tests.HAsanity.dependencies.obelisk</a></strong>    </li>
+    </ul>
+    </li>
+    </ul>
+    </li>
+    <li> <strong class="uidlink"><a href="TestON.tests.HAsingleInstanceRestart-module.html">TestON.tests.HAsingleInstanceRestart</a></strong>
+    <ul>
+    <li> <strong class="uidlink"><a href="TestON.tests.HAsingleInstanceRestart.HAsingleInstanceRestart-module.html">TestON.tests.HAsingleInstanceRestart.HAsingleInstanceRestart</a></strong>: <em class="summary">Description: This test is to determine if a single
+    instance ONOS 'cluster' can handle a restart</em>    </li>
+    <li> <strong class="uidlink"><a href="TestON.tests.HAsingleInstanceRestart.dependencies-module.html">TestON.tests.HAsingleInstanceRestart.dependencies</a></strong>
+    <ul>
+    <li> <strong class="uidlink"><a href="TestON.tests.HAsingleInstanceRestart.dependencies.Counters-module.html">TestON.tests.HAsingleInstanceRestart.dependencies.Counters</a></strong>    </li>
+    <li> <strong class="uidlink"><a href="TestON.tests.HAsingleInstanceRestart.dependencies.obelisk-module.html">TestON.tests.HAsingleInstanceRestart.dependencies.obelisk</a></strong>    </li>
+    </ul>
+    </li>
+    </ul>
+    </li>
+    <li> <strong class="uidlink"><a href="TestON.tests.SAMPscaleTopo-module.html">TestON.tests.SAMPscaleTopo</a></strong>
+    <ul>
+    <li> <strong class="uidlink"><a href="TestON.tests.SAMPscaleTopo.SAMPscaleTopo-module.html">TestON.tests.SAMPscaleTopo.SAMPscaleTopo</a></strong>    </li>
+    </ul>
+    </li>
+    <li> <strong class="uidlink"><a href="TestON.tests.SAMPstartTemplate-module.html">TestON.tests.SAMPstartTemplate</a></strong>
+    <ul>
+    <li> <strong class="uidlink"><a href="TestON.tests.SAMPstartTemplate.SAMPstartTemplate-module.html">TestON.tests.SAMPstartTemplate.SAMPstartTemplate</a></strong>    </li>
+    </ul>
+    </li>
+    <li> <strong class="uidlink"><a href="TestON.tests.SCPFcbench-module.html">TestON.tests.SCPFcbench</a></strong>
+    <ul>
+    <li> <strong class="uidlink"><a href="TestON.tests.SCPFcbench.SCPFcbench-module.html">TestON.tests.SCPFcbench.SCPFcbench</a></strong>    </li>
+    </ul>
+    </li>
+    <li> <strong class="uidlink"><a href="TestON.tests.SCPFflowTp1g-module.html">TestON.tests.SCPFflowTp1g</a></strong>
+    <ul>
+    <li> <strong class="uidlink"><a href="TestON.tests.SCPFflowTp1g.SCPFflowTp1g-module.html">TestON.tests.SCPFflowTp1g.SCPFflowTp1g</a></strong>    </li>
+    </ul>
+    </li>
+    <li> <strong class="uidlink"><a href="TestON.tests.SCPFintentEventTp-module.html">TestON.tests.SCPFintentEventTp</a></strong>
+    <ul>
+    <li> <strong class="uidlink"><a href="TestON.tests.SCPFintentEventTp.SCPFintentEventTp-module.html">TestON.tests.SCPFintentEventTp.SCPFintentEventTp</a></strong>    </li>
+    </ul>
+    </li>
+    <li> <strong class="uidlink"><a href="TestON.tests.SCPFintentInstallWithdrawLat-module.html">TestON.tests.SCPFintentInstallWithdrawLat</a></strong>
+    <ul>
+    <li> <strong class="uidlink"><a href="TestON.tests.SCPFintentInstallWithdrawLat.SCPFintentInstallWithdrawLat-module.html">TestON.tests.SCPFintentInstallWithdrawLat.SCPFintentInstallWithdrawLat</a></strong>    </li>
+    </ul>
+    </li>
+    <li> <strong class="uidlink"><a href="TestON.tests.SCPFintentRerouteLat-module.html">TestON.tests.SCPFintentRerouteLat</a></strong>
+    <ul>
+    <li> <strong class="uidlink"><a href="TestON.tests.SCPFintentRerouteLat.SCPFintentRerouteLat-module.html">TestON.tests.SCPFintentRerouteLat.SCPFintentRerouteLat</a></strong>    </li>
+    </ul>
+    </li>
+    <li> <strong class="uidlink"><a href="TestON.tests.SCPFportLat-module.html">TestON.tests.SCPFportLat</a></strong>
+    <ul>
+    <li> <strong class="uidlink"><a href="TestON.tests.SCPFportLat.SCPFportLat-module.html">TestON.tests.SCPFportLat.SCPFportLat</a></strong>    </li>
+    </ul>
+    </li>
+    <li> <strong class="uidlink"><a href="TestON.tests.SCPFswitchLat-module.html">TestON.tests.SCPFswitchLat</a></strong>
+    <ul>
+    <li> <strong class="uidlink"><a href="TestON.tests.SCPFswitchLat.SCPFswitchLat-module.html">TestON.tests.SCPFswitchLat.SCPFswitchLat</a></strong>    </li>
     </ul>
     </li>
   </ul></td></tr>
 </table>
 
 <br />
+<!-- ==================== VARIABLES ==================== -->
+<a name="section-Variables"></a>
+<table class="summary" border="1" cellpadding="3"
+       cellspacing="0" width="100%" bgcolor="white">
+<tr bgcolor="#70b0f0" class="table-header">
+  <td colspan="2" class="table-header">
+    <table border="0" cellpadding="0" cellspacing="0" width="100%">
+      <tr valign="top">
+        <td align="left"><span class="table-header">Variables</span></td>
+        <td align="right" valign="top"
+         ><span class="options">[<a href="#section-Variables"
+         class="privatelink" onclick="toggle_private();"
+         >hide private</a>]</span></td>
+      </tr>
+    </table>
+  </td>
+</tr>
+<tr>
+    <td width="15%" align="right" valign="top" class="summary">
+      <span class="summary-type">&nbsp;</span>
+    </td><td class="summary">
+        <a name="__package__"></a><span class="summary-name">__package__</span> = <code title="None">None</code><br />
+      hash(x)
+    </td>
+  </tr>
+</table>
 <!-- ==================== NAVIGATION BAR ==================== -->
 <table class="navbar" border="0" width="100%" cellpadding="0"
        bgcolor="#a0c0ff" cellspacing="0">
@@ -134,13 +233,18 @@
       <th>&nbsp;&nbsp;&nbsp;<a
         href="help.html">Help</a>&nbsp;&nbsp;&nbsp;</th>
 
-      <th class="navbar" width="100%"></th>
+  <!-- Project homepage -->
+      <th class="navbar" align="right" width="100%">
+        <table border="0" cellpadding="0" cellspacing="0">
+          <tr><th class="navbar" align="center"
+            >TestON</th>
+          </tr></table></th>
   </tr>
 </table>
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Mon Mar 11 12:56:26 2013
+    Generated by Epydoc 3.0.1 on Mon Aug 10 11:12:34 2015
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"