diff --git a/TestON/drivers/common/clidriver.py b/TestON/drivers/common/clidriver.py
index 2951ec3..78d0ebb 100644
--- a/TestON/drivers/common/clidriver.py
+++ b/TestON/drivers/common/clidriver.py
@@ -1007,12 +1007,19 @@
                         "--field-selector=spec.nodeName=%s" % nodeName if nodeName else "" )
             main.log.info( self.name + ": sending: " + repr( cmdStr ) )
             self.handle.sendline( cmdStr )
-            i = self.handle.expect( [ "not found", "error", "The connection to the server", self.prompt ] )
-            if i == 3:
+            i = self.handle.expect( [ "not found", "error", "The connection to the server", "Unable to find", "No resources found", self.prompt ] )
+            if i == 4:
+                # Command worked, but returned no pods
+                output = self.handle.before + self.handle.after
+                main.log.warn( self.name + ": " + output )
+                return []
+            elif i == 5:
+                # Command returned pods
                 output = self.handle.before + self.handle.after
                 names = output.split( '\r\n' )[1].split()
                 return names
             else:
+                # Some error occured
                 main.log.error( self.name + ": Error executing command" )
                 main.log.debug( self.name + ": " + self.handle.before + str( self.handle.after ) )
                 return main.FALSE
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.params.tofino b/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.params.tofino
index 04818d4..5b204a0 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.params.tofino
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.params.tofino
@@ -29,7 +29,7 @@
     <persistent_setup>True</persistent_setup>
 
     <kubernetes>
-        <appName>onos-tost-onos-classic</appName>
+        <appName>onos-classic</appName>
         <namespace>tost</namespace>
     </kubernetes>
 
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/SRRouting.params.tofino b/TestON/tests/USECASE/SegmentRouting/SRRouting/SRRouting.params.tofino
index e999afb..e47a43b 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/SRRouting.params.tofino
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/SRRouting.params.tofino
@@ -29,7 +29,7 @@
     <persistent_setup>True</persistent_setup>
 
     <kubernetes>
-        <appName>onos-tost-onos-classic</appName>
+        <appName>onos-classic</appName>
         <namespace>tost</namespace>
     </kubernetes>
 
diff --git a/TestON/tests/USECASE/SegmentRouting/SRStaging/SRONLReboot/SRONLReboot.params b/TestON/tests/USECASE/SegmentRouting/SRStaging/SRONLReboot/SRONLReboot.params
index 2b3aaf2..bc7af77 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRStaging/SRONLReboot/SRONLReboot.params
+++ b/TestON/tests/USECASE/SegmentRouting/SRStaging/SRONLReboot/SRONLReboot.params
@@ -29,7 +29,7 @@
     <persistent_setup>True</persistent_setup>
 
     <kubernetes>
-        <appName>onos-tost-onos-classic</appName>
+        <appName>onos-classic</appName>
         <namespace>tost</namespace>
     </kubernetes>
 
diff --git a/TestON/tests/USECASE/SegmentRouting/SRStaging/SRStaging.params b/TestON/tests/USECASE/SegmentRouting/SRStaging/SRStaging.params
index 3bb151a..1126205 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRStaging/SRStaging.params
+++ b/TestON/tests/USECASE/SegmentRouting/SRStaging/SRStaging.params
@@ -29,7 +29,7 @@
     <persistent_setup>True</persistent_setup>
 
     <kubernetes>
-        <appName>onos-tost-onos-classic</appName>
+        <appName>onos-classic</appName>
         <namespace>tost</namespace>
     </kubernetes>
 
diff --git a/TestON/tests/USECASE/SegmentRouting/SRStaging/SReNBLeafSpinePortstateFailure/SReNBLeafSpinePortstateFailure.params b/TestON/tests/USECASE/SegmentRouting/SRStaging/SReNBLeafSpinePortstateFailure/SReNBLeafSpinePortstateFailure.params
index 45121d5..9e88746 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRStaging/SReNBLeafSpinePortstateFailure/SReNBLeafSpinePortstateFailure.params
+++ b/TestON/tests/USECASE/SegmentRouting/SRStaging/SReNBLeafSpinePortstateFailure/SReNBLeafSpinePortstateFailure.params
@@ -29,7 +29,7 @@
     <persistent_setup>True</persistent_setup>
 
     <kubernetes>
-        <appName>onos-tost-onos-classic</appName>
+        <appName>onos-classic</appName>
         <namespace>tost</namespace>
     </kubernetes>
 
diff --git a/TestON/tests/USECASE/SegmentRouting/SRStaging/SRrollingRestart/SRrollingRestart.params b/TestON/tests/USECASE/SegmentRouting/SRStaging/SRrollingRestart/SRrollingRestart.params
index d963ef6..4a0b538 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRStaging/SRrollingRestart/SRrollingRestart.params
+++ b/TestON/tests/USECASE/SegmentRouting/SRStaging/SRrollingRestart/SRrollingRestart.params
@@ -29,7 +29,7 @@
     <persistent_setup>True</persistent_setup>
 
     <kubernetes>
-        <appName>onos-tost-onos-classic</appName>
+        <appName>onos-classic</appName>
         <namespace>tost</namespace>
     </kubernetes>
 
diff --git a/TestON/tests/USECASE/SegmentRouting/SRStaging/SRstratumRestart/SRstratumRestart.params b/TestON/tests/USECASE/SegmentRouting/SRStaging/SRstratumRestart/SRstratumRestart.params
index bb1f15a..9db4ffe 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRStaging/SRstratumRestart/SRstratumRestart.params
+++ b/TestON/tests/USECASE/SegmentRouting/SRStaging/SRstratumRestart/SRstratumRestart.params
@@ -29,7 +29,7 @@
     <persistent_setup>True</persistent_setup>
 
     <kubernetes>
-        <appName>onos-tost-onos-classic</appName>
+        <appName>onos-classic</appName>
         <namespace>tost</namespace>
     </kubernetes>
 
diff --git a/TestON/tests/USECASE/SegmentRouting/SRStaging/SRupstreamLeafSpinePortstateFailure/SRupstreamLeafSpinePortstateFailure.params b/TestON/tests/USECASE/SegmentRouting/SRStaging/SRupstreamLeafSpinePortstateFailure/SRupstreamLeafSpinePortstateFailure.params
index 8466472..a4f7976 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRStaging/SRupstreamLeafSpinePortstateFailure/SRupstreamLeafSpinePortstateFailure.params
+++ b/TestON/tests/USECASE/SegmentRouting/SRStaging/SRupstreamLeafSpinePortstateFailure/SRupstreamLeafSpinePortstateFailure.params
@@ -29,7 +29,7 @@
     <persistent_setup>True</persistent_setup>
 
     <kubernetes>
-        <appName>onos-tost-onos-classic</appName>
+        <appName>onos-classic</appName>
         <namespace>tost</namespace>
     </kubernetes>