diff --git a/TestON/drivers/common/cli/onosdriver.py b/TestON/drivers/common/cli/onosdriver.py
index 8c4d2fa..8d95cfc 100644
--- a/TestON/drivers/common/cli/onosdriver.py
+++ b/TestON/drivers/common/cli/onosdriver.py
@@ -2137,10 +2137,10 @@
     def getOnosIPfromCell(self):
         '''
             Returns the ONOS node names and their IP addresses as defined in the cell and applied to shell environment
-			Example output return: ['10.128.40.41','10.128.40.42','10.128.40.43']. This will work even if the Mininet is
-			not part of the cell definition and also if there are multiple mininets, just by using static hostname  
-			in TOPO file.
-        ''' 
+            Example output return: ['10.128.40.41','10.128.40.42','10.128.40.43']. This will work even if the Mininet is
+            not part of the cell definition and also if there are multiple mininets, just by using static hostname  
+            in TOPO file.
+        '''
         import re
         try:
             # Clean handle by sending empty and expecting $
diff --git a/TestON/tests/OnosCHO/OnosCHO.params b/TestON/tests/OnosCHO/OnosCHO.params
index a630a2c..49f3422 100644
--- a/TestON/tests/OnosCHO/OnosCHO.params
+++ b/TestON/tests/OnosCHO/OnosCHO.params
@@ -15,68 +15,68 @@
     <testcases>1,20,3,40,5,60</testcases>
     <ENV>
         <cellName>choTest3</cellName>
-		<debugWait>300</debugWait>
     </ENV>
-    <GIT>         
+    <GIT>
         #autoPull 'on' or 'off'
         <autoPull>off</autoPull>
         <branch>master</branch>
     </GIT>
+
     <TOPO1>
-	<topo>~/mininet/custom/topoAtt.py</topo>
-	<numSwitches>25</numSwitches>
-	<numHosts>25</numHosts>
-	<numLinks>114</numLinks>
-	<numPaths>1</numPaths>
+        <topo>~/mininet/custom/topoAtt.py</topo>
+        <numSwitches>25</numSwitches>
+        <numHosts>25</numHosts>
+        <numLinks>114</numLinks>
+        <numPaths>1</numPaths>
     </TOPO1>
-    
-	<TOPO2>
-	<topo>~/mininet/custom/topoChordal.py</topo>
-	<numSwitches>25</numSwitches>
-	<numHosts>25</numHosts>
-	<numLinks>600</numLinks>
-	<numPaths>1</numPaths>
+
+    <TOPO2>
+        <topo>~/mininet/custom/topoChordal.py</topo>
+        <numSwitches>25</numSwitches>
+        <numHosts>25</numHosts>
+        <numLinks>600</numLinks>
+        <numPaths>1</numPaths>
     </TOPO2>
-    
-	<TOPO3>
-	<topo>~/mininet/custom/topoSpine.py</topo>
-	<numSwitches>78</numSwitches>
-	<numHosts>68</numHosts>
-	<numLinks>284</numLinks>
-	<numPaths>1</numPaths>
+
+    <TOPO3>
+        <topo>~/mininet/custom/topoSpine.py</topo>
+        <numSwitches>78</numSwitches>
+        <numHosts>68</numHosts>
+        <numLinks>284</numLinks>
+        <numPaths>1</numPaths>
     </TOPO3>
-    
-	<CTRL>
-    <numCtrl>3</numCtrl>
-    <ip1>OC1</ip1>
-    <port1>6633</port1>
-    <ip2>OC2</ip2>
-    <port2>6633</port2>
-    <ip3>OC3</ip3>
-    <port3>6633</port3>
+
+    <CTRL>
+        <numCtrl>3</numCtrl>
+        <ip1>OC1</ip1>
+        <port1>6633</port1>
+        <ip2>OC2</ip2>
+        <port2>6633</port2>
+        <ip3>OC3</ip3>
+        <port3>6633</port3>
     </CTRL>
-    
-	<HOSTS>
-	<startMAC>00:00:00:00:00:01</startMAC>
-	<endMAC>00:00:00:00:00:19</endMAC>
+
+    <HOSTS>
+        <startMAC>00:00:00:00:00:01</startMAC>
+        <endMAC>00:00:00:00:00:19</endMAC>
     </HOSTS>
-    
-	<ATTCORELINKS>
-	<toggleLinks>1</toggleLinks>
-	
-	<linkS3a>s3</linkS3a>
-	<linkS3b>s1,s4,s7,s10,s16,s17,s18,s21,s22</linkS3b>
-	#######s1,s4,s7,s10,s16,s17,s18,s21,s22########
-	
-	<linkS14a>s14</linkS14a>
-	<linkS14b>s6,s9,s10,s11,s12,s13,s16,s17,s23</linkS14b>
-	########s6,s9,s10,s11,s12,s13,s16,s17,s18,s23########
-	
-	<linkS18a>s18</linkS18a>
-	<linkS18b>s14,s16,s17,s19,s20,s21,s22,s23</linkS18b>
-	#######s3,s14,s16,s17,s19,s20,s21,s22,s23########
+
+    <ATTCORELINKS>
+        <toggleLinks>1</toggleLinks>
+
+        <linkS3a>s3</linkS3a>
+        <linkS3b>s1,s4,s7,s10,s16,s17,s18,s21,s22</linkS3b>
+        #######s1,s4,s7,s10,s16,s17,s18,s21,s22########
+
+        <linkS14a>s14</linkS14a>
+        <linkS14b>s6,s9,s10,s11,s12,s13,s16,s17,s23</linkS14b>
+        ########s6,s9,s10,s11,s12,s13,s16,s17,s18,s23########
+
+        <linkS18a>s18</linkS18a>
+        <linkS18b>s14,s16,s17,s19,s20,s21,s22,s23</linkS18b>
+        #######s3,s14,s16,s17,s19,s20,s21,s22,s23########
     </ATTCORELINKS>
-    
+
     <SPINECORELINKS>
         <linkS9>s9</linkS9>
         <linkS9top>s1,s3,s5,s7</linkS9top>
@@ -91,4 +91,4 @@
         <SwitchDiscovery>10</SwitchDiscovery>
     </timers>
 
-</PARAMS>
+</PARAMS>
\ No newline at end of file
diff --git a/TestON/tests/OnosCHO/OnosCHO.topo b/TestON/tests/OnosCHO/OnosCHO.topo
index 46c738f..76205b0 100644
--- a/TestON/tests/OnosCHO/OnosCHO.topo
+++ b/TestON/tests/OnosCHO/OnosCHO.topo
@@ -5,8 +5,8 @@
             <host>localhost</host>
             <user>admin</user>
             <password></password>
-            <type>OnosDriver</type>
-            <connect_order>1</connect_order>
+			<type>OnosDriver</type>
+			<connect_order>1</connect_order>
             <COMPONENTS>
                 <home>~/ONOS</home>
             </COMPONENTS>
@@ -21,7 +21,7 @@
             <COMPONENTS> </COMPONENTS>
         </ONOScli1>
 
-		<ONOScli2>
+        <ONOScli2>
             <host>localhost</host>
             <user>admin</user>
             <password></password>
@@ -30,15 +30,15 @@
             <COMPONENTS> </COMPONENTS>
         </ONOScli2>
 
-		<ONOScli3>
+        <ONOScli3>
             <host>localhost</host>
             <user>admin</user>
             <password></password>
             <type>OnosCliDriver</type>
             <connect_order>4</connect_order>
             <COMPONENTS> </COMPONENTS>
-		</ONOScli3>
-	
+        </ONOScli3>
+
         <Mininet1>
             <host>chONOS-MN</host>
             <user>admin</user>
@@ -49,4 +49,4 @@
         </Mininet1>
 
     </COMPONENT>
-</TOPOLOGY>
+</TOPOLOGY>
\ No newline at end of file