diff --git a/src/main/java/click/poweronoff/satellite/repository/dto/Acquisition.java b/src/main/java/click/poweronoff/satellite/repository/dto/Acquisition.java
index 50eabd3..642e0c9 100644
--- a/src/main/java/click/poweronoff/satellite/repository/dto/Acquisition.java
+++ b/src/main/java/click/poweronoff/satellite/repository/dto/Acquisition.java
@@ -1,12 +1,10 @@
 package click.poweronoff.satellite.repository.dto;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import lombok.Builder;
 import lombok.Data;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 @Data
-@Builder
 public class Acquisition {
 
     private String beginViewingDate;
diff --git a/src/main/java/click/poweronoff/satellite/repository/dto/Features.java b/src/main/java/click/poweronoff/satellite/repository/dto/Features.java
index 878e73a..5e18658 100644
--- a/src/main/java/click/poweronoff/satellite/repository/dto/Features.java
+++ b/src/main/java/click/poweronoff/satellite/repository/dto/Features.java
@@ -2,12 +2,10 @@ package click.poweronoff.satellite.repository.dto;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Builder;
 import lombok.Data;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 @Data
-@Builder
 public class Features {
     @JsonProperty
     private Properties properties;
diff --git a/src/main/java/click/poweronoff/satellite/repository/dto/FeaturesCollection.java b/src/main/java/click/poweronoff/satellite/repository/dto/FeaturesCollection.java
index 5d1cccc..9c1bd94 100644
--- a/src/main/java/click/poweronoff/satellite/repository/dto/FeaturesCollection.java
+++ b/src/main/java/click/poweronoff/satellite/repository/dto/FeaturesCollection.java
@@ -1,12 +1,12 @@
 package click.poweronoff.satellite.repository.dto;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import lombok.Builder;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 @Data
-@Builder
 public class FeaturesCollection {
+    @JsonProperty
     private Features[] features;
 }
diff --git a/src/main/java/click/poweronoff/satellite/repository/dto/Properties.java b/src/main/java/click/poweronoff/satellite/repository/dto/Properties.java
index 6a1e690..3b8ad06 100644
--- a/src/main/java/click/poweronoff/satellite/repository/dto/Properties.java
+++ b/src/main/java/click/poweronoff/satellite/repository/dto/Properties.java
@@ -2,12 +2,10 @@ package click.poweronoff.satellite.repository.dto;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Builder;
 import lombok.Data;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 @Data
-@Builder
 public class Properties {
 
     @JsonProperty
diff --git a/src/test/java/click/poweronoff/satellite/service/DataServiceImplTest.java b/src/test/java/click/poweronoff/satellite/service/DataServiceImplTest.java
new file mode 100644
index 0000000..100bfd9
--- /dev/null
+++ b/src/test/java/click/poweronoff/satellite/service/DataServiceImplTest.java
@@ -0,0 +1,7 @@
+package click.poweronoff.satellite.service;
+
+//@RunWith(MockitoJUnitRunner.class)
+public class DataServiceImplTest {
+
+
+}
\ No newline at end of file
diff --git a/src/test/java/click/poweronoff/satellite/service/DataTransformationServiceTest.java b/src/test/java/click/poweronoff/satellite/service/DataTransformationServiceTest.java
index 611cdb3..b8ae5c6 100644
--- a/src/test/java/click/poweronoff/satellite/service/DataTransformationServiceTest.java
+++ b/src/test/java/click/poweronoff/satellite/service/DataTransformationServiceTest.java
@@ -1,3 +1,4 @@
+
 package click.poweronoff.satellite.service;
 
 import click.poweronoff.satellite.domain.Feature;
@@ -42,18 +43,23 @@ public class DataTransformationServiceTest {
 
     private FeaturesCollection[] createTestFeaturesCollection() {
 
-        Features[] features = new Features[]{Features.builder().properties(Properties.builder()
-                .id(ID)
-                .timestamp(Long.toString(TIMESTAMP))
-                .quicklook(new String(Base64.getEncoder().encode("satellite".getBytes())))
-                .acquisition(Acquisition.builder()
-                        .beginViewingDate(Long.toString(BEGIN_VIEWING_DATE))
-                        .endViewingDate(Long.toString(END_VIEWING_DATE))
-                        .missionName(MISSION_NAME)
-                        .build())
-                .build())
-                .build()};
+        Acquisition acquisition = new Acquisition();
+        acquisition.setBeginViewingDate(Long.toString(BEGIN_VIEWING_DATE));
+        acquisition.setEndViewingDate(Long.toString(END_VIEWING_DATE));
+        acquisition.setMissionName(MISSION_NAME);
 
-        return new FeaturesCollection[]{FeaturesCollection.builder().features(features).build()};
+        Properties properties = new Properties();
+        properties.setId(ID);
+        properties.setQuicklook(new String(Base64.getEncoder().encode("satellite".getBytes())));
+        properties.setTimestamp(Long.toString(TIMESTAMP));
+        properties.setAcquisition(acquisition);
+
+        Features features = new Features();
+        features.setProperties(properties);
+
+        FeaturesCollection featuresCollection = new FeaturesCollection();
+        featuresCollection.setFeatures(new Features[]{features});
+
+        return new FeaturesCollection[]{featuresCollection};
     }
-}
\ No newline at end of file
+}