diff --git a/application/src/test/java/org/thingsboard/server/edge/BaseWidgetEdgeTest.java b/application/src/test/java/org/thingsboard/server/edge/BaseWidgetEdgeTest.java
index 6dc4d50ed2..297cd8ca82 100644
--- a/application/src/test/java/org/thingsboard/server/edge/BaseWidgetEdgeTest.java
+++ b/application/src/test/java/org/thingsboard/server/edge/BaseWidgetEdgeTest.java
@@ -42,10 +42,10 @@ abstract public class BaseWidgetEdgeTest extends AbstractEdgeTest {
         Assert.assertTrue(latestMessage instanceof WidgetsBundleUpdateMsg);
         WidgetsBundleUpdateMsg widgetsBundleUpdateMsg = (WidgetsBundleUpdateMsg) latestMessage;
         Assert.assertEquals(UpdateMsgType.ENTITY_CREATED_RPC_MESSAGE, widgetsBundleUpdateMsg.getMsgType());
-        Assert.assertEquals(widgetsBundleUpdateMsg.getIdMSB(), savedWidgetsBundle.getUuidId().getMostSignificantBits());
-        Assert.assertEquals(widgetsBundleUpdateMsg.getIdLSB(), savedWidgetsBundle.getUuidId().getLeastSignificantBits());
-        Assert.assertEquals(widgetsBundleUpdateMsg.getAlias(), savedWidgetsBundle.getAlias());
-        Assert.assertEquals(widgetsBundleUpdateMsg.getTitle(), savedWidgetsBundle.getTitle());
+        Assert.assertEquals(savedWidgetsBundle.getUuidId().getMostSignificantBits(), widgetsBundleUpdateMsg.getIdMSB());
+        Assert.assertEquals(savedWidgetsBundle.getUuidId().getLeastSignificantBits(), widgetsBundleUpdateMsg.getIdLSB());
+        Assert.assertEquals(savedWidgetsBundle.getAlias(), widgetsBundleUpdateMsg.getAlias());
+        Assert.assertEquals(savedWidgetsBundle.getTitle(), widgetsBundleUpdateMsg.getTitle());
         testAutoGeneratedCodeByProtobuf(widgetsBundleUpdateMsg);
 
         // create widget type
@@ -62,14 +62,33 @@ abstract public class BaseWidgetEdgeTest extends AbstractEdgeTest {
         Assert.assertTrue(latestMessage instanceof WidgetTypeUpdateMsg);
         WidgetTypeUpdateMsg widgetTypeUpdateMsg = (WidgetTypeUpdateMsg) latestMessage;
         Assert.assertEquals(UpdateMsgType.ENTITY_CREATED_RPC_MESSAGE, widgetTypeUpdateMsg.getMsgType());
-        Assert.assertEquals(widgetTypeUpdateMsg.getIdMSB(), savedWidgetType.getUuidId().getMostSignificantBits());
-        Assert.assertEquals(widgetTypeUpdateMsg.getIdLSB(), savedWidgetType.getUuidId().getLeastSignificantBits());
-        Assert.assertEquals(widgetTypeUpdateMsg.getAlias(), savedWidgetType.getAlias());
-        Assert.assertEquals(widgetTypeUpdateMsg.getName(), savedWidgetType.getName());
+        Assert.assertEquals(savedWidgetType.getUuidId().getMostSignificantBits(), widgetTypeUpdateMsg.getIdMSB());
+        Assert.assertEquals(savedWidgetType.getUuidId().getLeastSignificantBits(), widgetTypeUpdateMsg.getIdLSB());
+        Assert.assertEquals(savedWidgetType.getAlias(), widgetTypeUpdateMsg.getAlias());
+        Assert.assertEquals(savedWidgetType.getName(), widgetTypeUpdateMsg.getName());
         Assert.assertEquals(JacksonUtil.toJsonNode(widgetTypeUpdateMsg.getDescriptorJson()), savedWidgetType.getDescriptor());
 
-        // @TODO: update widget bundle
-        // @TODO: update widget type
+        // update widget bundle
+        edgeImitator.expectMessageAmount(1);
+        savedWidgetsBundle.setTitle("Test Widget Bundle - Updated");
+        savedWidgetsBundle = doPost("/api/widgetsBundle", savedWidgetsBundle, WidgetsBundle.class);
+        Assert.assertTrue(edgeImitator.waitForMessages());
+        latestMessage = edgeImitator.getLatestMessage();
+        Assert.assertTrue(latestMessage instanceof WidgetsBundleUpdateMsg);
+        widgetsBundleUpdateMsg = (WidgetsBundleUpdateMsg) latestMessage;
+        Assert.assertEquals(UpdateMsgType.ENTITY_UPDATED_RPC_MESSAGE, widgetsBundleUpdateMsg.getMsgType());
+        Assert.assertEquals(savedWidgetsBundle.getTitle(), widgetsBundleUpdateMsg.getTitle());
+
+        // update widget type
+        edgeImitator.expectMessageAmount(1);
+        savedWidgetType.setName("Test Widget Type - Updated");
+        savedWidgetType = doPost("/api/widgetType", savedWidgetType, WidgetType.class);
+        Assert.assertTrue(edgeImitator.waitForMessages());
+        latestMessage = edgeImitator.getLatestMessage();
+        Assert.assertTrue(latestMessage instanceof WidgetTypeUpdateMsg);
+        widgetTypeUpdateMsg = (WidgetTypeUpdateMsg) latestMessage;
+        Assert.assertEquals(UpdateMsgType.ENTITY_UPDATED_RPC_MESSAGE, widgetTypeUpdateMsg.getMsgType());
+        Assert.assertEquals(savedWidgetType.getName(), widgetTypeUpdateMsg.getName());
 
         // delete widget type
         edgeImitator.expectMessageAmount(1);
@@ -80,8 +99,8 @@ abstract public class BaseWidgetEdgeTest extends AbstractEdgeTest {
         Assert.assertTrue(latestMessage instanceof WidgetTypeUpdateMsg);
         widgetTypeUpdateMsg = (WidgetTypeUpdateMsg) latestMessage;
         Assert.assertEquals(UpdateMsgType.ENTITY_DELETED_RPC_MESSAGE, widgetTypeUpdateMsg.getMsgType());
-        Assert.assertEquals(widgetTypeUpdateMsg.getIdMSB(), savedWidgetType.getUuidId().getMostSignificantBits());
-        Assert.assertEquals(widgetTypeUpdateMsg.getIdLSB(), savedWidgetType.getUuidId().getLeastSignificantBits());
+        Assert.assertEquals(savedWidgetType.getUuidId().getMostSignificantBits(), widgetTypeUpdateMsg.getIdMSB());
+        Assert.assertEquals(savedWidgetType.getUuidId().getLeastSignificantBits(), widgetTypeUpdateMsg.getIdLSB());
 
         // delete widget bundle
         edgeImitator.expectMessageAmount(1);
@@ -92,8 +111,8 @@ abstract public class BaseWidgetEdgeTest extends AbstractEdgeTest {
         Assert.assertTrue(latestMessage instanceof WidgetsBundleUpdateMsg);
         widgetsBundleUpdateMsg = (WidgetsBundleUpdateMsg) latestMessage;
         Assert.assertEquals(UpdateMsgType.ENTITY_DELETED_RPC_MESSAGE, widgetsBundleUpdateMsg.getMsgType());
-        Assert.assertEquals(widgetsBundleUpdateMsg.getIdMSB(), savedWidgetsBundle.getUuidId().getMostSignificantBits());
-        Assert.assertEquals(widgetsBundleUpdateMsg.getIdLSB(), savedWidgetsBundle.getUuidId().getLeastSignificantBits());
+        Assert.assertEquals(savedWidgetsBundle.getUuidId().getMostSignificantBits(), widgetsBundleUpdateMsg.getIdMSB());
+        Assert.assertEquals(savedWidgetsBundle.getUuidId().getLeastSignificantBits(), widgetsBundleUpdateMsg.getIdLSB());
     }
 
 }