diff --git a/application/src/test/java/org/thingsboard/server/controller/CalculatedFieldControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/CalculatedFieldControllerTest.java
index 3f505c78ef..67e7bc64bd 100644
--- a/application/src/test/java/org/thingsboard/server/controller/CalculatedFieldControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/CalculatedFieldControllerTest.java
@@ -22,7 +22,8 @@ import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.common.data.User;
 import org.thingsboard.server.common.data.cf.CalculatedField;
-import org.thingsboard.server.common.data.cf.CalculatedFieldConfig;
+import org.thingsboard.server.common.data.cf.CalculatedFieldConfiguration;
+import org.thingsboard.server.common.data.cf.SimpleCalculatedFieldConfiguration;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.security.Authority;
@@ -123,25 +124,25 @@ public class CalculatedFieldControllerTest extends AbstractControllerTest {
     private CalculatedField getCalculatedField(DeviceId deviceId) {
         CalculatedField calculatedField = new CalculatedField();
         calculatedField.setEntityId(deviceId);
-        calculatedField.setType("Simple");
+        calculatedField.setType("SIMPLE");
         calculatedField.setName("Test Calculated Field");
         calculatedField.setConfigurationVersion(1);
-//        calculatedField.setConfiguration(getCalculatedFieldConfig(null));
+        calculatedField.setConfiguration(getCalculatedFieldConfig(null));
         calculatedField.setVersion(1L);
         return calculatedField;
     }
 
-    private CalculatedFieldConfig getCalculatedFieldConfig(EntityId referencedEntityId) {
-        CalculatedFieldConfig config = new CalculatedFieldConfig();
+    private CalculatedFieldConfiguration getCalculatedFieldConfig(EntityId referencedEntityId) {
+        SimpleCalculatedFieldConfiguration config = new SimpleCalculatedFieldConfiguration();
 
-        CalculatedFieldConfig.Argument argument = new CalculatedFieldConfig.Argument();
+        SimpleCalculatedFieldConfiguration.Argument argument = new SimpleCalculatedFieldConfiguration.Argument();
         argument.setEntityId(referencedEntityId);
         argument.setType("TIME_SERIES");
         argument.setKey("temperature");
 
         config.setArguments(Map.of("T", argument));
 
-        CalculatedFieldConfig.Output output = new CalculatedFieldConfig.Output();
+        SimpleCalculatedFieldConfiguration.Output output = new SimpleCalculatedFieldConfiguration.Output();
         output.setType("TIME_SERIES");
         output.setExpression("T - (100 - H) / 5");
 
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/CalculatedFieldServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/CalculatedFieldServiceTest.java
index de6836900d..a94eb83fa3 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/CalculatedFieldServiceTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/CalculatedFieldServiceTest.java
@@ -25,8 +25,6 @@ import org.thingsboard.common.util.ThingsBoardExecutors;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.cf.CalculatedField;
 import org.thingsboard.server.common.data.cf.CalculatedFieldConfiguration;
-import org.thingsboard.server.common.data.cf.CalculatedFieldLink;
-import org.thingsboard.server.common.data.cf.CalculatedFieldLinkConfiguration;
 import org.thingsboard.server.common.data.cf.SimpleCalculatedFieldConfiguration;
 import org.thingsboard.server.common.data.id.CalculatedFieldId;
 import org.thingsboard.server.common.data.id.EntityId;
@@ -34,7 +32,6 @@ import org.thingsboard.server.dao.cf.CalculatedFieldService;
 import org.thingsboard.server.dao.device.DeviceService;
 import org.thingsboard.server.dao.exception.DataValidationException;
 
-import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
@@ -148,21 +145,6 @@ public class CalculatedFieldServiceTest extends AbstractServiceTest {
         return calculatedField;
     }
 
-    private CalculatedFieldLink getCalculatedFieldLink(CalculatedField calculatedField) {
-        CalculatedFieldLink calculatedFieldLink = new CalculatedFieldLink();
-        calculatedFieldLink.setTenantId(tenantId);
-        calculatedFieldLink.setEntityId(calculatedField.getEntityId());
-        calculatedFieldLink.setConfiguration(getCalculatedFieldLinkConfiguration());
-        calculatedFieldLink.setCalculatedFieldId(calculatedField.getId());
-        return calculatedFieldLink;
-    }
-
-    private CalculatedFieldLinkConfiguration getCalculatedFieldLinkConfiguration() {
-        CalculatedFieldLinkConfiguration calculatedFieldLinkConfiguration = new CalculatedFieldLinkConfiguration();
-        calculatedFieldLinkConfiguration.setTimeSeries(List.of("temperature"));
-        return calculatedFieldLinkConfiguration;
-    }
-
     private CalculatedFieldConfiguration getCalculatedFieldConfig(EntityId referencedEntityId) {
         SimpleCalculatedFieldConfiguration config = new SimpleCalculatedFieldConfiguration();