diff --git a/TestON/drivers/common/cli/onosclidriver.py b/TestON/drivers/common/cli/onosclidriver.py
index 0190154..ba63b82 100755
--- a/TestON/drivers/common/cli/onosclidriver.py
+++ b/TestON/drivers/common/cli/onosclidriver.py
@@ -3461,6 +3461,7 @@
             if state == "ACTIVE" or state == "INSTALLED":
                 return state
             elif state is None:
+                main.log.warn( "{} app not found", appName )
                 return "UNINSTALLED"
             elif state:
                 main.log.error( "Unexpected state from 'onos:apps': " +
diff --git a/TestON/tests/HA/HAclusterRestart/HAclusterRestart.params b/TestON/tests/HA/HAclusterRestart/HAclusterRestart.params
index c55b26c..8ba346c 100644
--- a/TestON/tests/HA/HAclusterRestart/HAclusterRestart.params
+++ b/TestON/tests/HA/HAclusterRestart/HAclusterRestart.params
@@ -25,9 +25,6 @@
             <useFlowObjectives>false</useFlowObjectives>
             <defaultFlowObjectiveCompiler>org.onosproject.net.intent.impl.compiler.LinkCollectionIntentObjectiveCompiler</defaultFlowObjectiveCompiler>
         </org.onosproject.net.intent.impl.compiler.IntentConfigurableRegistrator>
-        <org.onosproject.store.flow.impl.DistributedFlowRuleStore>
-            <backupCount>3</backupCount>
-        </org.onosproject.store.flow.impl.DistributedFlowRuleStore>
     </ONOS_Configuration>
     <ENV>
         <cellName>HA</cellName>
diff --git a/TestON/tests/HA/HAcontinuousStopNodes/HAcontinuousStopNodes.params b/TestON/tests/HA/HAcontinuousStopNodes/HAcontinuousStopNodes.params
index 9d590be..f1520f7 100644
--- a/TestON/tests/HA/HAcontinuousStopNodes/HAcontinuousStopNodes.params
+++ b/TestON/tests/HA/HAcontinuousStopNodes/HAcontinuousStopNodes.params
@@ -27,9 +27,6 @@
             <useFlowObjectives>false</useFlowObjectives>
             <defaultFlowObjectiveCompiler>org.onosproject.net.intent.impl.compiler.LinkCollectionIntentObjectiveCompiler</defaultFlowObjectiveCompiler>
         </org.onosproject.net.intent.impl.compiler.IntentConfigurableRegistrator>
-        <org.onosproject.store.flow.impl.DistributedFlowRuleStore>
-            <backupCount>3</backupCount>
-        </org.onosproject.store.flow.impl.DistributedFlowRuleStore>
     </ONOS_Configuration>
     <ENV>
         <cellName>HA</cellName>
diff --git a/TestON/tests/HA/HAfullNetPartition/HAfullNetPartition.params b/TestON/tests/HA/HAfullNetPartition/HAfullNetPartition.params
index 93b3e02..3a8b60f 100644
--- a/TestON/tests/HA/HAfullNetPartition/HAfullNetPartition.params
+++ b/TestON/tests/HA/HAfullNetPartition/HAfullNetPartition.params
@@ -27,9 +27,6 @@
             <useFlowObjectives>false</useFlowObjectives>
             <defaultFlowObjectiveCompiler>org.onosproject.net.intent.impl.compiler.LinkCollectionIntentObjectiveCompiler</defaultFlowObjectiveCompiler>
         </org.onosproject.net.intent.impl.compiler.IntentConfigurableRegistrator>
-        <org.onosproject.store.flow.impl.DistributedFlowRuleStore>
-            <backupCount>3</backupCount>
-        </org.onosproject.store.flow.impl.DistributedFlowRuleStore>
     </ONOS_Configuration>
     <ENV>
         <cellName>HA</cellName>
diff --git a/TestON/tests/HA/HAkillNodes/HAkillNodes.params b/TestON/tests/HA/HAkillNodes/HAkillNodes.params
index ebffe50..d8f3d31 100644
--- a/TestON/tests/HA/HAkillNodes/HAkillNodes.params
+++ b/TestON/tests/HA/HAkillNodes/HAkillNodes.params
@@ -27,9 +27,6 @@
             <useFlowObjectives>false</useFlowObjectives>
             <defaultFlowObjectiveCompiler>org.onosproject.net.intent.impl.compiler.LinkCollectionIntentObjectiveCompiler</defaultFlowObjectiveCompiler>
         </org.onosproject.net.intent.impl.compiler.IntentConfigurableRegistrator>
-        <org.onosproject.store.flow.impl.DistributedFlowRuleStore>
-            <backupCount>3</backupCount>
-        </org.onosproject.store.flow.impl.DistributedFlowRuleStore>
     </ONOS_Configuration>
     <ENV>
         <cellName>HA</cellName>
diff --git a/TestON/tests/HA/HAsanity/HAsanity.params b/TestON/tests/HA/HAsanity/HAsanity.params
index ace6b77..5c298ec 100644
--- a/TestON/tests/HA/HAsanity/HAsanity.params
+++ b/TestON/tests/HA/HAsanity/HAsanity.params
@@ -26,9 +26,6 @@
             <useFlowObjectives>false</useFlowObjectives>
             <defaultFlowObjectiveCompiler>org.onosproject.net.intent.impl.compiler.LinkCollectionIntentObjectiveCompiler</defaultFlowObjectiveCompiler>
         </org.onosproject.net.intent.impl.compiler.IntentConfigurableRegistrator>
-        <org.onosproject.store.flow.impl.DistributedFlowRuleStore>
-            <backupCount>3</backupCount>
-        </org.onosproject.store.flow.impl.DistributedFlowRuleStore>
     </ONOS_Configuration>
     <ENV>
         <cellName>HA</cellName>
diff --git a/TestON/tests/HA/HAscaling/HAscaling.params b/TestON/tests/HA/HAscaling/HAscaling.params
index 6bcb87d..9fd1760 100644
--- a/TestON/tests/HA/HAscaling/HAscaling.params
+++ b/TestON/tests/HA/HAscaling/HAscaling.params
@@ -30,9 +30,6 @@
             <useFlowObjectives>false</useFlowObjectives>
             <defaultFlowObjectiveCompiler>org.onosproject.net.intent.impl.compiler.LinkCollectionIntentObjectiveCompiler</defaultFlowObjectiveCompiler>
         </org.onosproject.net.intent.impl.compiler.IntentConfigurableRegistrator>
-        <org.onosproject.store.flow.impl.DistributedFlowRuleStore>
-            <backupCount>3</backupCount>
-        </org.onosproject.store.flow.impl.DistributedFlowRuleStore>
     </ONOS_Configuration>
     <ENV>
         <cellName>HA</cellName>
diff --git a/TestON/tests/HA/HAsingleInstanceRestart/HAsingleInstanceRestart.params b/TestON/tests/HA/HAsingleInstanceRestart/HAsingleInstanceRestart.params
index 65ec6c6..67a655a 100644
--- a/TestON/tests/HA/HAsingleInstanceRestart/HAsingleInstanceRestart.params
+++ b/TestON/tests/HA/HAsingleInstanceRestart/HAsingleInstanceRestart.params
@@ -24,9 +24,6 @@
             <useFlowObjectives>false</useFlowObjectives>
             <defaultFlowObjectiveCompiler>org.onosproject.net.intent.impl.compiler.LinkCollectionIntentObjectiveCompiler</defaultFlowObjectiveCompiler>
         </org.onosproject.net.intent.impl.compiler.IntentConfigurableRegistrator>
-        <org.onosproject.store.flow.impl.DistributedFlowRuleStore>
-            <backupCount>3</backupCount>
-        </org.onosproject.store.flow.impl.DistributedFlowRuleStore>
     </ONOS_Configuration>
     <ENV>
         <cellName>HA</cellName>
diff --git a/TestON/tests/HA/HAsingleInstanceRestart/HAsingleInstanceRestart.py b/TestON/tests/HA/HAsingleInstanceRestart/HAsingleInstanceRestart.py
index 13a4913..53cccb3 100644
--- a/TestON/tests/HA/HAsingleInstanceRestart/HAsingleInstanceRestart.py
+++ b/TestON/tests/HA/HAsingleInstanceRestart/HAsingleInstanceRestart.py
@@ -313,6 +313,9 @@
             onpass="Hosts are correct",
             onfail="Hosts are incorrect" )
 
+        ONOSMastership, rolesResult, consistentMastership = main.HA.checkTheRole()
+        mastershipState = ONOSMastership[ 0 ]
+
     def CASE6( self, main ):
         """
         The Failure case.
@@ -386,7 +389,7 @@
         main.HA.checkRoleNotNull()
 
         main.step( "Check if switch roles are consistent across all nodes" )
-        ONOSMastership, rolesResult,consistentMastership = main.HA.checkTheRole()
+        ONOSMastership, rolesResult, consistentMastership = main.HA.checkTheRole()
         ONOSMastership = ONOSMastership[ 0 ]
         description2 = "Compare switch roles from before failure"
         main.step( description2 )
@@ -405,7 +408,8 @@
             if current == old:
                 mastershipCheck = mastershipCheck and main.TRUE
             else:
-                main.log.warn( "Mastership of switch %s changed" % switchDPID )
+                main.log.warn( "Mastership of switch %s changed; old: %s, new: %s" % ( switchDPID,
+                    old, current ) )
                 mastershipCheck = main.FALSE
         utilities.assert_equals(
             expect=main.TRUE,
diff --git a/TestON/tests/HA/HAstopNodes/HAstopNodes.params b/TestON/tests/HA/HAstopNodes/HAstopNodes.params
index ebffe50..d8f3d31 100644
--- a/TestON/tests/HA/HAstopNodes/HAstopNodes.params
+++ b/TestON/tests/HA/HAstopNodes/HAstopNodes.params
@@ -27,9 +27,6 @@
             <useFlowObjectives>false</useFlowObjectives>
             <defaultFlowObjectiveCompiler>org.onosproject.net.intent.impl.compiler.LinkCollectionIntentObjectiveCompiler</defaultFlowObjectiveCompiler>
         </org.onosproject.net.intent.impl.compiler.IntentConfigurableRegistrator>
-        <org.onosproject.store.flow.impl.DistributedFlowRuleStore>
-            <backupCount>3</backupCount>
-        </org.onosproject.store.flow.impl.DistributedFlowRuleStore>
     </ONOS_Configuration>
     <ENV>
         <cellName>HA</cellName>
diff --git a/TestON/tests/HA/HAswapNodes/HAswapNodes.params b/TestON/tests/HA/HAswapNodes/HAswapNodes.params
index d557c1e..cf395cb 100644
--- a/TestON/tests/HA/HAswapNodes/HAswapNodes.params
+++ b/TestON/tests/HA/HAswapNodes/HAswapNodes.params
@@ -29,9 +29,6 @@
             <useFlowObjectives>false</useFlowObjectives>
             <defaultFlowObjectiveCompiler>org.onosproject.net.intent.impl.compiler.LinkCollectionIntentObjectiveCompiler</defaultFlowObjectiveCompiler>
         </org.onosproject.net.intent.impl.compiler.IntentConfigurableRegistrator>
-        <org.onosproject.store.flow.impl.DistributedFlowRuleStore>
-            <backupCount>3</backupCount>
-        </org.onosproject.store.flow.impl.DistributedFlowRuleStore>
     </ONOS_Configuration>
     <ENV>
         <cellName>HA</cellName>
diff --git a/TestON/tests/HA/dependencies/HA.py b/TestON/tests/HA/dependencies/HA.py
index 6750775..3d18eaa 100644
--- a/TestON/tests/HA/dependencies/HA.py
+++ b/TestON/tests/HA/dependencies/HA.py
@@ -870,6 +870,7 @@
                     state = intent.get( 'state', None )
                     if "INSTALLED" not in state:
                         installedCheck = False
+                        main.log.debug( "Failed intent: " + str( intent ) )
                     intentId = intent.get( 'id', None )
                     intentStates.append( ( intentId, state ) )
             except ( ValueError, TypeError ):