diff --git a/src-electron/sdk-gen/sdk-gen.js b/src-electron/sdk-gen/sdk-gen.js
index 721f204b9bdaef2844d08f1b0aac4e4edd8e9433..9884055fbf37ace00da7c31f728ba2a42982e885 100644
--- a/src-electron/sdk-gen/sdk-gen.js
+++ b/src-electron/sdk-gen/sdk-gen.js
@@ -35,7 +35,7 @@ function createDeviceTypeComponent(deviceType) {
     label: deviceType.label,
     description: deviceType.caption,
     package: 'Zigbee',
-    category: 'Zigbee',
+    category: 'Zigbee|Zigbee Cluster Library|Device Type',
     quality: 'production',
   }
 }
@@ -43,11 +43,10 @@ function createDeviceTypeComponent(deviceType) {
 function createClusterDefComponent(cluster) {
   return {
     id: 'zcl_cluster_' + cleanse(cluster.label) + '_def',
-    label: cluster.label + ' definition',
-    description:
-      'This component provides definition for the cluster.\n' + cluster.caption,
+    label: cluster.label,
+    description: cluster.caption,
     package: 'Zigbee',
-    category: 'Zigbee',
+    category: 'Zigbee|Zigbee Cluster Library|Configuration',
     quality: 'production',
   }
 }
@@ -55,12 +54,10 @@ function createClusterDefComponent(cluster) {
 function createClusterImpComponent(cluster) {
   return {
     id: 'zcl_cluster_' + cleanse(cluster.label) + '_imp',
-    label: cluster.label + ' implementation',
-    description:
-      'This component provides implementation for the cluster.\n' +
-      cluster.caption,
+    label: cluster.label,
+    description: cluster.caption,
     package: 'Zigbee',
-    category: 'Zigbee',
+    category: 'Zigbee|Zigbee Cluster Library|Implementation',
     quality: 'production',
   }
 }
diff --git a/test/sdk-gen.test.js b/test/sdk-gen.test.js
index 9d45d90fdf34fe2f1373dfa872e02aae87bc9682..9492956bc30cf1f1e8bd7a5179fab34a60fe7108 100644
--- a/test/sdk-gen.test.js
+++ b/test/sdk-gen.test.js
@@ -11,11 +11,13 @@ import {
   schemaFile,
   sqliteTestFile,
   appDirectory,
+  logError,
 } from '../src-electron/util/env'
 import { runSdkGeneration } from '../src-electron/sdk-gen/sdk-gen'
 import { loadZcl } from '../src-electron/zcl/zcl-loader'
 import { zclPropertiesFile } from '../src-electron/main-process/args'
 import { selectAllClusters } from '../src-electron/db/query-zcl'
+import { resolve } from 'dns'
 
 /*
  * Created Date: Friday, March 13th 2020, 7:44:12 pm
@@ -25,7 +27,6 @@ import { selectAllClusters } from '../src-electron/db/query-zcl'
  */
 
 var db
-var sid
 
 beforeAll(() => {
   var file = sqliteTestFile(4)