diff --git a/package.json b/package.json
index a850372..a45277a 100644
--- a/package.json
+++ b/package.json
@@ -280,14 +280,30 @@
       }
     },
     "commands": [
-      {
-        "command": "ceedlingExplorer.clean",
-        "title": "Ceedling: Clean"
-      },
-      {
-        "command": "ceedlingExplorer.clobber",
-        "title": "Ceedling: Clobber"
-      }
-    ]
+        {
+          "command": "ceedlingExplorer.clean",
+          "title": "Ceedling: Clean",
+          "icon": "$(trash)"
+        },
+        {
+          "command": "ceedlingExplorer.clobber",
+          "title": "Ceedling: Clobber",
+          "icon": "$(flame)"
+        }
+    ],
+    "menus": {
+      "view/title": [
+        {
+          "command": "ceedlingExplorer.clean",
+          "when": "view == workbench.view.testing",
+          "group": "navigation"
+        },
+        {
+          "command": "ceedlingExplorer.clobber",
+          "when": "view == workbench.view.testing",
+          "group": "navigation"
+        }
+      ]
+    }
   }
 }
diff --git a/src/adapter.ts b/src/adapter.ts
index 811ea90..29600ad 100644
--- a/src/adapter.ts
+++ b/src/adapter.ts
@@ -293,9 +293,8 @@ export class CeedlingAdapter implements TestAdapter {
             // Get test executable file name without extension
             const testFileName = `${/([^/]*).c$/.exec(testToExec)![1]}`;
             // Set current test executable
-            if (this.detectTestSpecificDefines(ymlProjectData, testFileName)) {
-                this.setDebugTestExecutable(`${testFileName}/${testFileName}${ext}`);
-            }
+            this.setDebugTestExecutable(`${testFileName}/${testFileName}${ext}`);
+            this.logger.debug(`Debug Executable: ${this.getDebugTestExecutable()}`);
 
             // trigger testsuite start event
             this.testStatesEmitter.fire({