diff --git a/server/src/test/java/ru/dragonestia/picker/config/FillingNodesConfig.java b/server/src/test/java/ru/dragonestia/picker/config/FillingNodesConfig.java
index 8a29897..0205d17 100644
--- a/server/src/test/java/ru/dragonestia/picker/config/FillingNodesConfig.java
+++ b/server/src/test/java/ru/dragonestia/picker/config/FillingNodesConfig.java
@@ -3,7 +3,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.TestConfiguration;
 import org.springframework.context.annotation.Bean;
-import ru.dragonestia.picker.api.repository.response.type.type.PickingMode;
+import ru.dragonestia.picker.api.model.node.PickingMethod;
 import ru.dragonestia.picker.model.Node;
 import ru.dragonestia.picker.model.Room;
 import ru.dragonestia.picker.model.User;
@@ -51,7 +51,7 @@ public class FillingNodesConfig {
 
     @Bean
     void createSequentialFillingNode() {
-        var node = new Node("seq", PickingMode.SEQUENTIAL_FILLING, false);
+        var node = new Node("seq", PickingMethod.SEQUENTIAL_FILLING, false);
         nodeRepository.create(node);
 
         fillNode(node);
@@ -61,7 +61,7 @@ void createSequentialFillingNode() {
 
     @Bean
     void createRoundRobinNode() {
-        var node = new Node("round", PickingMode.ROUND_ROBIN, false);
+        var node = new Node("round", PickingMethod.ROUND_ROBIN, false);
         nodeRepository.create(node);
 
         fillNode(node);
@@ -71,7 +71,7 @@ void createRoundRobinNode() {
 
     @Bean
     void createLeastPickerNode() {
-        var node = new Node("least", PickingMode.LEAST_PICKED, false);
+        var node = new Node("least", PickingMethod.LEAST_PICKED, false);
         nodeRepository.create(node);
 
         fillNode(node);
diff --git a/server/src/test/java/ru/dragonestia/picker/service/NodeServiceTests.java b/server/src/test/java/ru/dragonestia/picker/service/NodeServiceTests.java
index 63ca177..fceed8b 100644
--- a/server/src/test/java/ru/dragonestia/picker/service/NodeServiceTests.java
+++ b/server/src/test/java/ru/dragonestia/picker/service/NodeServiceTests.java
@@ -5,7 +5,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import ru.dragonestia.picker.api.exception.NodeAlreadyExistException;
-import ru.dragonestia.picker.api.repository.response.type.type.PickingMode;
+import ru.dragonestia.picker.api.model.node.PickingMethod;
 import ru.dragonestia.picker.model.Node;
 
 import java.util.List;
@@ -18,7 +18,7 @@ public class NodeServiceTests {
 
     @Test
     void test_nodeCreateAndRemove() {
-        var node = new Node("test", PickingMode.SEQUENTIAL_FILLING, false);
+        var node = new Node("test", PickingMethod.SEQUENTIAL_FILLING, false);
 
         Assertions.assertDoesNotThrow(() -> nodeService.create(node));
         Assertions.assertTrue(nodeService.find(node.id()).isPresent());
@@ -34,9 +34,9 @@ void test_allNodes() {
         nodeService.all().forEach(node -> nodeService.remove(node));
 
         var nodes = List.of(
-                new Node("test1", PickingMode.SEQUENTIAL_FILLING, false),
-                new Node("test2", PickingMode.ROUND_ROBIN, false),
-                new Node("test3", PickingMode.ROUND_ROBIN, false)
+                new Node("test1", PickingMethod.SEQUENTIAL_FILLING, false),
+                new Node("test2", PickingMethod.ROUND_ROBIN, false),
+                new Node("test3", PickingMethod.ROUND_ROBIN, false)
         );
 
         nodes.forEach(node -> nodeService.create(node));
diff --git a/server/src/test/java/ru/dragonestia/picker/service/RoomServiceTests.java b/server/src/test/java/ru/dragonestia/picker/service/RoomServiceTests.java
index aa227a1..75f8f3a 100644
--- a/server/src/test/java/ru/dragonestia/picker/service/RoomServiceTests.java
+++ b/server/src/test/java/ru/dragonestia/picker/service/RoomServiceTests.java
@@ -9,7 +9,7 @@
 import ru.dragonestia.picker.api.exception.NodeNotFoundException;
 import ru.dragonestia.picker.api.exception.NotPersistedNodeException;
 import ru.dragonestia.picker.api.exception.RoomAlreadyExistException;
-import ru.dragonestia.picker.api.repository.response.type.type.PickingMode;
+import ru.dragonestia.picker.api.model.node.PickingMethod;
 import ru.dragonestia.picker.model.Node;
 import ru.dragonestia.picker.model.Room;
 import ru.dragonestia.picker.model.User;
@@ -30,7 +30,7 @@ public class RoomServiceTests {
 
     @BeforeEach
     void init() {
-        node = new Node("test-rooms", PickingMode.SEQUENTIAL_FILLING, false);
+        node = new Node("test-rooms", PickingMethod.SEQUENTIAL_FILLING, false);
 
         try {
             nodeService.create(node);
@@ -93,7 +93,7 @@ void test_pickRoom() {
         );
 
 
-        Assertions.assertEquals("test-room4", roomService.pickAvailable(node, users).getId());
+        Assertions.assertEquals("test-room4", roomService.pickAvailable(node, users).roomId());
     }
 
     @Test
@@ -105,7 +105,7 @@ void test_removeNode() {
 
     @Test
     void test_nodeDoesNotExists() {
-        var node = new Node("Bruh", PickingMode.ROUND_ROBIN, false);
+        var node = new Node("Bruh", PickingMethod.ROUND_ROBIN, false);
         var room = Room.create("test", node, SlotLimit.unlimited(), "", false);
 
         Assertions.assertThrows(NodeNotFoundException.class, () -> roomService.create(room));