diff --git a/driver/src/test/java/cz/muni/pa165/driver/rest/DriverInitControllerTest.java b/driver/src/test/java/cz/muni/pa165/driver/rest/DriverInitControllerTest.java
deleted file mode 100644
index 1cf26d819fdf90fff4946145a8f85bbe465a6eb4..0000000000000000000000000000000000000000
--- a/driver/src/test/java/cz/muni/pa165/driver/rest/DriverInitControllerTest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package cz.muni.pa165.driver.rest;
-
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
-
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
-import org.springframework.boot.test.context.SpringBootTest;
-
-@SpringBootTest
-@AutoConfigureMockMvc
-class DriverInitControllerTest {
-
-//  @Autowired
-//  private MockMvc mockMvc;
-//
-//  @Autowired
-//  private ObjectMapper objectMapper;
-//
-//  @Autowired
-//  private DriverInitService driverInitService;
-//
-//  @Test
-//  void driverAddTest() throws Exception {
-//
-//    Driver driver = getDriver();
-//    Driver driverService = driverInitService.addDriver(driver);
-//
-//    String response = mockMvc.perform(post("/driver/add")
-//            .contentType(MediaType.APPLICATION_JSON)
-//            .content(objectMapper.writeValueAsString(driver)))
-//        .andExpect(status().isOk())
-//        .andReturn(). ().getContentAsString();
-//    Driver driverController = objectMapper.readValue(response, Driver.class);
-//    assertingDriver(driverService, driverController);
-//  }
-//
-//  @Test
-//  void driverRemoveTest() throws Exception {
-//
-//    Driver driver = getDriver();
-//    Driver driverService = driverInitService.removeDriver(driver.getId());
-//
-//    String response = mockMvc.perform(delete("/driver/remove").queryParam("driverId",
-//            String.valueOf(driver.getId())))
-//        .andExpect(status().isOk())
-//        .andReturn().getResponse().getContentAsString();
-//    Driver driverController = objectMapper.readValue(response, Driver.class);
-//    assertingDriver(driverService, driverController);
-//  }
-//
-//  private void assertingDriver(Driver driverService, Driver driverController) {
-//    Assertions.assertAll(
-//        () -> Assertions.assertEquals(driverService.getId(), driverController.getId()),
-//        () -> Assertions.assertEquals(driverService.getName(), driverController.getName()),
-//        () -> Assertions.assertEquals(driverService.getCharacteristics(),
-//            driverController.getCharacteristics()),
-//        () -> Assertions.assertEquals(driverService.getNationality(),
-//            driverController.getNationality()),
-//        () -> Assertions.assertEquals(driverService.isMain(), driverController.isMain()),
-//        () -> Assertions.assertEquals(driverService.getSurname(), driverController.getSurname())
-//    );
-//  }
-//
-//  private Driver getDriver() {
-//    Driver driver = new Driver();
-//    driver.setId(2L);
-//    driver.setMain(false);
-//    driver.setSurname("surname");
-//    driver.setName("name");
-//    driver.setCharacteristics(Set.of(Characteristic.INTELLIGENCE));
-//    driver.setNationality("nationality");
-//    return driver;
-//  }
-}
diff --git a/driver/src/test/java/cz/muni/pa165/driver/rest/DriverRepositoryTest.java b/driver/src/test/java/cz/muni/pa165/driver/rest/DriverRepositoryTest.java
index 46bc52e1ef2dfa055834059de0e50212df075bbb..eaa1bc32f3cf4f2ca0f509c833c9672ee0bf648d 100644
--- a/driver/src/test/java/cz/muni/pa165/driver/rest/DriverRepositoryTest.java
+++ b/driver/src/test/java/cz/muni/pa165/driver/rest/DriverRepositoryTest.java
@@ -35,4 +35,70 @@ class DriverRepositoryTest {
     Assertions.assertEquals(entityManager.find(Driver.class, 1L).getId(), 1);
   }
 
+  @Test
+  void testUpdate() {
+    Driver driver = Driver.builder()
+        .name("Name")
+        .surname("Surname")
+        .nationality("Nationality")
+        .characteristics(Map.of()).build();
+
+    Driver savedDriver = driverRepository.save(driver);
+
+    savedDriver.setName("Updated name");
+    savedDriver.setSurname("Updated surname");
+    savedDriver.setNationality("Updated nat");
+
+    driverRepository.save(savedDriver);
+
+    var updatedDriver = driverRepository.findById(savedDriver.getId()).orElseThrow();
+    Assertions.assertNotEquals(DriverTestUtil.getDaoDriver(), updatedDriver);
+    var original = DriverTestUtil.getDaoDriver();
+    Assertions.assertAll(
+        () -> Assertions.assertNotEquals(original.getName(), updatedDriver.getName()),
+        () -> Assertions.assertNotEquals(original.getSurname(), updatedDriver.getSurname()),
+        () -> Assertions.assertNotEquals(original.getNationality(), updatedDriver.getNationality())
+    );
+  }
+
+  @Test
+  void testNonExistingFind() {
+    Assertions.assertThrows(Exception.class, () -> driverRepository.findById(-1L).orElseThrow());
+  }
+
+  @Test
+  void testDelete() {
+    Driver driver = Driver.builder()
+        .name("Name")
+        .surname("Surname")
+        .nationality("Nationality")
+        .characteristics(Map.of()).build();
+
+    Driver savedDriver = driverRepository.save(driver);
+    driverRepository.delete(savedDriver);
+
+    Assertions.assertThrows(Exception.class, () -> driverRepository
+        .findById(savedDriver.getId()).orElseThrow());
+  }
+
+  @Test
+  void testFindAll() {
+    Driver driver = Driver.builder()
+        .name("Name")
+        .surname("Surname")
+        .nationality("Nationality")
+        .characteristics(Map.of()).build();
+
+    Driver driver2 = Driver.builder()
+        .name("Name")
+        .surname("Surname")
+        .nationality("Nationality")
+        .characteristics(Map.of()).build();
+
+    driverRepository.save(driver);
+    driverRepository.save(driver2);
+
+    var savedDrivers = driverRepository.findAll();
+    Assertions.assertEquals(2, savedDrivers.size());
+  }
 }
diff --git a/driver/src/test/java/cz/muni/pa165/driver/rest/DriverServiceTest.java b/driver/src/test/java/cz/muni/pa165/driver/rest/DriverServiceTest.java
index 7a19a54a6721827922231d3a76e3d0472e114c90..cfb6dca20f453cbdbe0ee260737817f0012e9505 100644
--- a/driver/src/test/java/cz/muni/pa165/driver/rest/DriverServiceTest.java
+++ b/driver/src/test/java/cz/muni/pa165/driver/rest/DriverServiceTest.java
@@ -1,5 +1,6 @@
 package cz.muni.pa165.driver.rest;
 
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.doNothing;
@@ -46,17 +47,17 @@ public class DriverServiceTest {
   private DriverRepository driverRepository;
 
   @Test
-  void driverAddByIdTest() throws Exception {
-    var driverUpdateDto = DriverTestUtil.getAddDriver();
+  void driverAddTest() throws Exception {
+    var driverAddDto = DriverTestUtil.getAddDriver();
     Driver driverDao = DriverTestUtil.getDaoDriver();
-    given(driverRepository.save(driverDao)).willReturn(
+    given(driverRepository.save(any(Driver.class))).willReturn(
         driverDao);
     given(driverRepository.findById(anyLong())).willReturn(
         Optional.of(driverDao));
 
     String response = mockMvc.perform(post("/driver/add")
             .contentType(MediaType.APPLICATION_JSON)
-            .content(objectMapper.writeValueAsString(driverUpdateDto)))
+            .content(objectMapper.writeValueAsString(driverAddDto)))
         .andExpect(status().isOk())
         .andReturn().getResponse().getContentAsString();
     var driverResponseDto = objectMapper.readValue(response, DriverResponseDto.class);