diff --git a/core/src/test/java/cz/muni/pa165/data/repository/CarComponentRepositoryTest.java b/core/src/test/java/cz/muni/pa165/data/repository/CarComponentRepositoryTest.java
index c1645222c98ff3ad085681e714fa35ec31b1281d..96b28771687ffb510fcc7bf0bcfe8443948d6bf5 100644
--- a/core/src/test/java/cz/muni/pa165/data/repository/CarComponentRepositoryTest.java
+++ b/core/src/test/java/cz/muni/pa165/data/repository/CarComponentRepositoryTest.java
@@ -90,7 +90,7 @@ class CarComponentRepositoryTest {
 
     @Test
     void delete() {
-        CarComponent carComponentToDelete = new CarComponent();
+        CarComponent carComponentToDelete = new CarComponent(ComponentTypeEnum.CHASSIS, 180.0, "Dummy information", null);
         entityManager.persist(carComponentToDelete);
 
         carComponentRepository.delete(carComponentToDelete);
diff --git a/core/src/test/java/cz/muni/pa165/data/repository/CarRepositoryTest.java b/core/src/test/java/cz/muni/pa165/data/repository/CarRepositoryTest.java
index 2299d16714be4a0103a2d5bfe37052b5c6386936..39e5822e2a524b17005465e1f7867e4815c597db 100644
--- a/core/src/test/java/cz/muni/pa165/data/repository/CarRepositoryTest.java
+++ b/core/src/test/java/cz/muni/pa165/data/repository/CarRepositoryTest.java
@@ -12,6 +12,8 @@ import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
+import java.time.LocalDate;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
@@ -35,13 +37,12 @@ public class CarRepositoryTest {
 
     @BeforeEach
     void setUp() {
-        Driver driver = new Driver();
-        driver.setName("driver");
+        car = new Car();
 
-        CarComponent carComponent = new CarComponent();
-        carComponent.setComponentType(ComponentTypeEnum.CHASSIS);
+        Driver driver = new Driver("John", "Doe", 180, LocalDate.of(1990, 1, 1), "Czech", car, new HashSet<>());
+
+        CarComponent carComponent = new CarComponent(ComponentTypeEnum.CHASSIS, 180.0, "Dummy information", car);
 
-        car = new Car();
         car.setDriver(driver);
         car.setComponents(Set.of(carComponent));
 
@@ -81,9 +82,12 @@ public class CarRepositoryTest {
 
     @Test
     void delete() {
-        carRepository.delete(car);
+        Car carToDelete = new Car();
+        entityManager.persist(carToDelete);
 
-        Optional<Car> carFetched = carRepository.findById(car.getId());
+        carRepository.delete(carToDelete);
+
+        Optional<Car> carFetched = carRepository.findById(carToDelete.getId());
 
         assertTrue(carFetched.isEmpty());
     }
diff --git a/core/src/test/java/cz/muni/pa165/data/repository/DepartmentRepositoryTest.java b/core/src/test/java/cz/muni/pa165/data/repository/DepartmentRepositoryTest.java
index b9f1469ec7f137bb10474a2940f00080c13b4b70..6d52812b583b677df98fd7e2180aaf17a54df6e9 100644
--- a/core/src/test/java/cz/muni/pa165/data/repository/DepartmentRepositoryTest.java
+++ b/core/src/test/java/cz/muni/pa165/data/repository/DepartmentRepositoryTest.java
@@ -27,7 +27,7 @@ class DepartmentRepositoryTest {
 
     private final Department department = new Department("dep1", new HashSet<>());
     private final Department emptyDepartment = new Department("dep2", new HashSet<>());
-    private final Engineer engineer = new Engineer();
+    private final Engineer engineer = new Engineer("John", "Doe", null);
 
     @BeforeEach
     void setUp() {
diff --git a/core/src/test/java/cz/muni/pa165/data/repository/EngineerRepositoryTest.java b/core/src/test/java/cz/muni/pa165/data/repository/EngineerRepositoryTest.java
index e0d65f4dfffa208a22b3c0c203a08ce13fa1d68c..cb3c7840139a675945083241d8b24ffd143c22d5 100644
--- a/core/src/test/java/cz/muni/pa165/data/repository/EngineerRepositoryTest.java
+++ b/core/src/test/java/cz/muni/pa165/data/repository/EngineerRepositoryTest.java
@@ -26,7 +26,7 @@ class EngineerRepositoryTest {
     private EntityManager entityManager;
 
     private final Department department = new Department("dep1", new HashSet<>());
-    private final Engineer engineer = new Engineer();
+    private final Engineer engineer = new Engineer("Samantha", "Lee", null);
     private final Engineer engineer2 = new Engineer("John", "Doe", department);
 
     @BeforeEach