Using main.stop() as a breakpoint when a case fails and minor refactoring

Change-Id: Ic27e4cfb881809927f7214ca70a52c1601367f5e
diff --git a/TestON/tests/CHOtest/CHOtest.params b/TestON/tests/CHOtest/CHOtest.params
index 1efb9bd..d301af7 100644
--- a/TestON/tests/CHOtest/CHOtest.params
+++ b/TestON/tests/CHOtest/CHOtest.params
@@ -93,4 +93,9 @@
         <CheckIntentDelay>5</CheckIntentDelay>
     </timers>
 
+    <TEST>
+        <fail_switch>True</fail_switch>
+        <email>False</email>
+    </TEST>
+
 </PARAMS>