diff --git a/plugins/TestingList.java b/plugins/TestingList.java
index 9a0f2e3..e773fd0 100644
--- a/plugins/TestingList.java
+++ b/plugins/TestingList.java
@@ -314,17 +314,12 @@ public class TestingList extends Panel {
             int rowD = -1, colT = -1;
             //search for device name in table
             for (int row = 0; row <= jTable1.getRowCount() - 1; row++) {
-                if (deviceName.equals(jTable1.getValueAt(row, COL_DEVICENAME))) {
+                if (deviceName.equals(jTable1.getValueAt(row, COL_DEVICENAME)) &&
+                        testName.equals(jTable1.getValueAt(rowD, COL_TESTNAME))) {
                     rowD = row;
                     break;
                 }
             }
-            if (rowD >= 0) {
-                //search for test name in table
-                if (testName.equals(jTable1.getValueAt(rowD, COL_TESTNAME))) {
-                    colT = COL_TESTNAME;
-                }
-            }
             String iconSource = "/icons/button_help-16px.png";
             switch (status) {
                 case "Success":
@@ -436,7 +431,7 @@ public class TestingList extends Panel {
                     try{
                         args.put("DEVICE", sDeviceName); 
                         //args.put("ret", ""); 
-                        args.put("status", false);                        
+                        //args.put("status", false);                        
                         run(sTestName, args);
                     } catch (Exception ex) {
                         SwingUtils.showMessage(this, "", ex.toString());