diff --git a/application/src/main/resources/thingsboard.yml b/application/src/main/resources/thingsboard.yml
index c935154b6e..deb28ffd99 100644
--- a/application/src/main/resources/thingsboard.yml
+++ b/application/src/main/resources/thingsboard.yml
@@ -429,7 +429,7 @@ spring:
     database-platform: "${SPRING_JPA_DATABASE_PLATFORM:org.hibernate.dialect.PostgreSQLDialect}"
   datasource:
     driverClassName: "${SPRING_DRIVER_CLASS_NAME:org.postgresql.Driver}"
-    url: "${SPRING_DATASOURCE_URL:jdbc:postgresql://localhost:5432/thingsboard_ce_3_2}"
+    url: "${SPRING_DATASOURCE_URL:jdbc:postgresql://localhost:5432/thingsboard}"
     username: "${SPRING_DATASOURCE_USERNAME:postgres}"
     password: "${SPRING_DATASOURCE_PASSWORD:postgres}"
     hikari:
diff --git a/application/src/test/java/org/thingsboard/server/mqtt/attributes/updates/AbstractMqttAttributesUpdatesIntegrationTest.java b/application/src/test/java/org/thingsboard/server/mqtt/attributes/updates/AbstractMqttAttributesUpdatesIntegrationTest.java
index c40c2f2914..d2febdf357 100644
--- a/application/src/test/java/org/thingsboard/server/mqtt/attributes/updates/AbstractMqttAttributesUpdatesIntegrationTest.java
+++ b/application/src/test/java/org/thingsboard/server/mqtt/attributes/updates/AbstractMqttAttributesUpdatesIntegrationTest.java
@@ -65,15 +65,15 @@ public abstract class AbstractMqttAttributesUpdatesIntegrationTest extends Abstr
         processAfterTest();
     }
 
-//    @Test
-//    public void testSubscribeToAttributesUpdatesFromTheServer() throws Exception {
-//        processTestSubscribeToAttributesUpdates();
-//    }
-//
-//    @Test
-//    public void testSubscribeToAttributesUpdatesFromTheServerGateway() throws Exception {
-//        processGatewayTestSubscribeToAttributesUpdates();
-//    }
+    @Test
+    public void testSubscribeToAttributesUpdatesFromTheServer() throws Exception {
+        processTestSubscribeToAttributesUpdates();
+    }
+
+    @Test
+    public void testSubscribeToAttributesUpdatesFromTheServerGateway() throws Exception {
+        processGatewayTestSubscribeToAttributesUpdates();
+    }
 
     protected void processTestSubscribeToAttributesUpdates() throws Exception {
 
diff --git a/application/src/test/java/org/thingsboard/server/mqtt/attributes/updates/AbstractMqttAttributesUpdatesJsonIntegrationTest.java b/application/src/test/java/org/thingsboard/server/mqtt/attributes/updates/AbstractMqttAttributesUpdatesJsonIntegrationTest.java
index 4f5a5f9369..58379e4016 100644
--- a/application/src/test/java/org/thingsboard/server/mqtt/attributes/updates/AbstractMqttAttributesUpdatesJsonIntegrationTest.java
+++ b/application/src/test/java/org/thingsboard/server/mqtt/attributes/updates/AbstractMqttAttributesUpdatesJsonIntegrationTest.java
@@ -39,13 +39,13 @@ public abstract class AbstractMqttAttributesUpdatesJsonIntegrationTest extends A
         processAfterTest();
     }
 
-//    @Test
-//    public void testSubscribeToAttributesUpdatesFromTheServer() throws Exception {
-//        processTestSubscribeToAttributesUpdates();
-//    }
-//
-//    @Test
-//    public void testSubscribeToAttributesUpdatesFromTheServerGateway() throws Exception {
-//        processGatewayTestSubscribeToAttributesUpdates();
-//    }
+    @Test
+    public void testSubscribeToAttributesUpdatesFromTheServer() throws Exception {
+        processTestSubscribeToAttributesUpdates();
+    }
+
+    @Test
+    public void testSubscribeToAttributesUpdatesFromTheServerGateway() throws Exception {
+        processGatewayTestSubscribeToAttributesUpdates();
+    }
 }
diff --git a/application/src/test/java/org/thingsboard/server/mqtt/attributes/updates/AbstractMqttAttributesUpdatesProtoIntegrationTest.java b/application/src/test/java/org/thingsboard/server/mqtt/attributes/updates/AbstractMqttAttributesUpdatesProtoIntegrationTest.java
index 16ccc789ee..faf8e1ce4d 100644
--- a/application/src/test/java/org/thingsboard/server/mqtt/attributes/updates/AbstractMqttAttributesUpdatesProtoIntegrationTest.java
+++ b/application/src/test/java/org/thingsboard/server/mqtt/attributes/updates/AbstractMqttAttributesUpdatesProtoIntegrationTest.java
@@ -19,7 +19,6 @@ import com.google.protobuf.InvalidProtocolBufferException;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.thingsboard.server.common.data.TransportPayloadType;
 import org.thingsboard.server.common.data.device.profile.MqttTopics;
diff --git a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/DeviceSessionCtx.java b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/DeviceSessionCtx.java
index 79147c0935..6ecea5a77c 100644
--- a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/DeviceSessionCtx.java
+++ b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/DeviceSessionCtx.java
@@ -80,7 +80,9 @@ public class DeviceSessionCtx extends MqttDeviceAwareSessionContext {
         return telemetryTopicFilter.filter(topicName);
     }
 
-    public boolean isDeviceAttributesTopic(String topicName) { return attributesTopicFilter.filter(topicName); }
+    public boolean isDeviceAttributesTopic(String topicName) {
+        return attributesTopicFilter.filter(topicName);
+    }
 
     public MqttTransportAdaptor getPayloadAdaptor() {
         return payloadType.equals(TransportPayloadType.JSON) ? context.getJsonMqttAdaptor() : context.getProtoMqttAdaptor();
diff --git a/application/src/test/java/org/thingsboard/server/mqtt/proto/DynamicProtoTest.java b/common/transport/mqtt/src/test/java/org/thingsboard/server/transport/mqtt/util/MqttDynamicProtoSchemaTest.java
similarity index 99%
rename from application/src/test/java/org/thingsboard/server/mqtt/proto/DynamicProtoTest.java
rename to common/transport/mqtt/src/test/java/org/thingsboard/server/transport/mqtt/util/MqttDynamicProtoSchemaTest.java
index a5b79310ec..47726ff610 100644
--- a/application/src/test/java/org/thingsboard/server/mqtt/proto/DynamicProtoTest.java
+++ b/common/transport/mqtt/src/test/java/org/thingsboard/server/transport/mqtt/util/MqttDynamicProtoSchemaTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.thingsboard.server.mqtt.proto;
+package org.thingsboard.server.transport.mqtt.util;
 
 import com.github.os72.protobuf.dynamic.DynamicSchema;
 import com.google.protobuf.Descriptors;
@@ -22,7 +22,6 @@ import com.google.protobuf.InvalidProtocolBufferException;
 import com.google.protobuf.util.JsonFormat;
 import com.squareup.wire.schema.internal.parser.ProtoFileElement;
 import com.squareup.wire.schema.internal.parser.ProtoParser;
-import lombok.extern.slf4j.Slf4j;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -38,9 +37,8 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.thingsboard.server.common.data.device.profile.MqttProtoDeviceProfileTransportConfiguration.LOCATION;
 
-@Slf4j
 @RunWith(MockitoJUnitRunner.class)
-public class DynamicProtoTest {
+public class MqttDynamicProtoSchemaTest {
 
     private static final String PROTO_SCHEMA_WITH_NESTED_MSG_TYPES = "syntax = \"proto3\";\n" +
             "\n" +