diff --git a/src/main/java/org/folio/service/routinglists/RoutingListsStorageService.java b/src/main/java/org/folio/service/routinglists/RoutingListsStorageService.java
index f59be40b0..458418841 100644
--- a/src/main/java/org/folio/service/routinglists/RoutingListsStorageService.java
+++ b/src/main/java/org/folio/service/routinglists/RoutingListsStorageService.java
@@ -79,7 +79,7 @@ private void validateRoutingList(RoutingList routingList, RequestContext request
     List<Error> combinedErrors = RoutingListValidatorUtil.validateRoutingList(routingLists, poLine);
     if (CollectionUtils.isNotEmpty(combinedErrors)) {
       Errors errors = new Errors().withErrors(combinedErrors).withTotalRecords(combinedErrors.size());
-      logger.error("Validation error : " + JsonObject.mapFrom(errors).encodePrettily());
+      logger.error("Validation error: {}", JsonObject.mapFrom(errors).encodePrettily());
       throw new HttpException(RestConstants.VALIDATION_ERROR, errors);
     }
   }
diff --git a/src/main/java/org/folio/service/routinglists/validators/RoutingListValidatorUtil.java b/src/main/java/org/folio/service/routinglists/validators/RoutingListValidatorUtil.java
index 0287512dd..051b80bdf 100644
--- a/src/main/java/org/folio/service/routinglists/validators/RoutingListValidatorUtil.java
+++ b/src/main/java/org/folio/service/routinglists/validators/RoutingListValidatorUtil.java
@@ -9,8 +9,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import static java.util.stream.Collectors.toList;
-
 public class RoutingListValidatorUtil {
 
   public static List<Error> validateRoutingList(RoutingListCollection rListExisting, PoLine poLine) {
@@ -20,7 +18,7 @@ public static List<Error> validateRoutingList(RoutingListCollection rListExistin
     } else if (isRoutingListsLimitReached(rListExisting, poLine)) {
       errors.add(ErrorCodes.ROUTING_LIST_LIMIT_REACHED_FOR_PO_LINE);
     }
-    return errors.stream().map(ErrorCodes::toError).collect(toList());
+    return errors.stream().map(ErrorCodes::toError).toList();
   }
 
   private static boolean isPoLineFormatValid(PoLine poLine) {
diff --git a/src/test/java/org/folio/service/routinglists/RoutingListServiceTest.java b/src/test/java/org/folio/service/routinglists/RoutingListServiceTest.java
new file mode 100644
index 000000000..817b82f32
--- /dev/null
+++ b/src/test/java/org/folio/service/routinglists/RoutingListServiceTest.java
@@ -0,0 +1,96 @@
+package org.folio.service.routinglists;
+
+import io.vertx.core.Future;
+import io.vertx.junit5.VertxExtension;
+import org.folio.rest.core.RestClient;
+import org.folio.rest.core.exceptions.HttpException;
+import org.folio.rest.core.models.RequestEntry;
+import org.folio.rest.jaxrs.model.PoLine;
+import org.folio.rest.jaxrs.model.RoutingList;
+import org.folio.rest.jaxrs.model.RoutingListCollection;
+import org.folio.service.orders.PurchaseOrderLineService;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.folio.TestUtils.getLocationPhysicalCopies;
+import static org.folio.TestUtils.getMinimalContentPoLine;
+import static org.folio.TestUtils.getMockAsJson;
+import static org.folio.rest.impl.MockServer.ROUTING_LISTS_MOCK_DATA_PATH;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+
+@ExtendWith(VertxExtension.class)
+public class RoutingListServiceTest {
+
+  private static final String ROUTING_LIST_SAMPLE = ROUTING_LISTS_MOCK_DATA_PATH + "routing-list.json";
+
+  private static final String PO_LINE_UUID = "0009662b-8b80-4001-b704-ca10971f222d";
+
+  private PoLine samplePoLine;
+  private RoutingList sampleRoutingList;
+
+  @Mock
+  private RestClient restClient;
+
+  @Mock
+  private PurchaseOrderLineService poLineService;
+
+  private RoutingListsStorageService routingListService;
+
+  @BeforeEach
+  void before() {
+    sampleRoutingList = getMockAsJson(ROUTING_LIST_SAMPLE).mapTo(RoutingList.class);
+    samplePoLine = getMinimalContentPoLine()
+      .withId(PO_LINE_UUID)
+      .withOrderFormat(PoLine.OrderFormat.PHYSICAL_RESOURCE)
+      .withLocations(getLocationPhysicalCopies(1));
+
+    routingListService = spy(new RoutingListsStorageService(poLineService, restClient));
+  }
+
+  @Test
+  void testCreateRoutingList() {
+    doReturn(getRoutingListCollection(1)).when(restClient).get(any(RequestEntry.class), RoutingList.class, any());
+    doReturn(Future.succeededFuture(samplePoLine)).when(poLineService).getOrderLineById(any(), any());
+    doReturn(Future.succeededFuture(List.of())).when(routingListService).getRoutingLists(any(), any(), any(), any());
+
+    routingListService.createRoutingList(sampleRoutingList, null);
+  }
+
+  @Test
+  void testCreateRoutingListWithPOLineLimitReached() {
+    doReturn(getRoutingListCollection(1)).when(restClient).get(any(RequestEntry.class), RoutingList.class, any());
+    doReturn(Future.succeededFuture(samplePoLine)).when(poLineService).getOrderLineById(any(), any());
+    doReturn(Future.succeededFuture(List.of(sampleRoutingList))).when(routingListService).getRoutingLists(any(), any(), any(), any());
+
+    assertThrows(HttpException.class, () -> routingListService.createRoutingList(sampleRoutingList, null));
+  }
+
+  @Test
+  void testCreateRoutingListWithPOLineInvalidOrderFormat() {
+    samplePoLine.setOrderFormat(PoLine.OrderFormat.ELECTRONIC_RESOURCE);
+    doReturn(getRoutingListCollection(0)).when(restClient).get(any(RequestEntry.class), RoutingList.class, any());
+    doReturn(Future.succeededFuture(samplePoLine)).when(poLineService).getOrderLineById(any(), any());
+    doReturn(Future.succeededFuture(List.of())).when(routingListService).getRoutingLists(any(), any(), any(), any());
+
+    assertThrows(HttpException.class, () -> routingListService.createRoutingList(sampleRoutingList, null));
+  }
+
+  private RoutingListCollection getRoutingListCollection(int n) {
+    List<RoutingList> lists = new ArrayList<>();
+    for (int i = 0; i < n; i++) {
+      lists.add(sampleRoutingList);
+    }
+    return new RoutingListCollection()
+      .withRoutingLists(lists)
+      .withTotalRecords(n);
+  }
+
+}
diff --git a/src/test/java/org/folio/service/routinglists/RoutingListValidatorTest.java b/src/test/java/org/folio/service/routinglists/validators/RoutingListValidatorTest.java
similarity index 98%
rename from src/test/java/org/folio/service/routinglists/RoutingListValidatorTest.java
rename to src/test/java/org/folio/service/routinglists/validators/RoutingListValidatorTest.java
index 7afbc8029..43f3c2b75 100644
--- a/src/test/java/org/folio/service/routinglists/RoutingListValidatorTest.java
+++ b/src/test/java/org/folio/service/routinglists/validators/RoutingListValidatorTest.java
@@ -1,4 +1,4 @@
-package org.folio.service.routinglists;
+package org.folio.service.routinglists.validators;
 
 import org.folio.rest.jaxrs.model.Error;
 import org.folio.rest.jaxrs.model.PoLine;