diff --git a/plugins/TestingList.java b/plugins/TestingList.java
index 114cd27..3308045 100644
--- a/plugins/TestingList.java
+++ b/plugins/TestingList.java
@@ -123,20 +123,15 @@ 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++) {
-                for (int col = 0; col <= jTable1.getColumnCount() - 1; col++) {
-                    if (deviceName.equals(jTable1.getValueAt(row, col))) {
-                        rowD = row;
-                        break;
-                    }
+                if (deviceName.equals(jTable1.getValueAt(row, COL_DEVICENAME))) {
+                    rowD = row;
+                    break;
                 }
             }
-            if (rowD > 0) {
+            if (rowD >= 0) {
                 //search for test name in table
-                for (int col = 0; col <= jTable1.getColumnCount() - 1; col++) {
-                    if (testName.equals(jTable1.getValueAt(rowD, col))) {
-                        colT = col;
-                        break;
-                    }
+                if (testName.equals(jTable1.getValueAt(rowD, COL_TESTNAME))) {
+                    colT = COL_TESTNAME;
                 }
             }
             String iconSource = "/icons/button_help-16px.png";