diff --git a/persistence-modules/spring-jdbc-batch/src/main/java/com/baeldung/spring/jdbc/batch/service/ProductService.java b/persistence-modules/spring-jdbc-batch/src/main/java/com/baeldung/spring/jdbc/batch/service/ProductService.java
index 6a3758c07a..6d8808c21b 100644
--- a/persistence-modules/spring-jdbc-batch/src/main/java/com/baeldung/spring/jdbc/batch/service/ProductService.java
+++ b/persistence-modules/spring-jdbc-batch/src/main/java/com/baeldung/spring/jdbc/batch/service/ProductService.java
@@ -31,7 +31,7 @@ public class ProductService {
         return clock.millis() - startTime;
     }
 
-    protected List<Product> generate(int count) {
+    private List<Product> generate(int count) {
         final String[] titles = { "car", "plane", "house", "yacht" };
         final BigDecimal[] prices = {
           new BigDecimal("12483.12"),
@@ -44,7 +44,7 @@ public class ProductService {
 
         for (int i = 0; i < count; i++) {
             Product product = new Product();
-            product.setCreatedTs(LocalDateTime.now());
+            product.setCreatedTs(LocalDateTime.now(clock));
             product.setPrice(prices[random.nextInt(4)]);
             product.setTitle(titles[random.nextInt(4)]);
             products.add(product);
diff --git a/persistence-modules/spring-jdbc-batch/src/test/java/com/baeldung/spring/jdbc/batch/service/ProductServiceUnitTest.java b/persistence-modules/spring-jdbc-batch/src/test/java/com/baeldung/spring/jdbc/batch/service/ProductServiceUnitTest.java
index b242eaa335..43719e986d 100644
--- a/persistence-modules/spring-jdbc-batch/src/test/java/com/baeldung/spring/jdbc/batch/service/ProductServiceUnitTest.java
+++ b/persistence-modules/spring-jdbc-batch/src/test/java/com/baeldung/spring/jdbc/batch/service/ProductServiceUnitTest.java
@@ -1,13 +1,30 @@
 package com.baeldung.spring.jdbc.batch.service;
 
+import com.baeldung.spring.jdbc.batch.model.Product;
 import com.baeldung.spring.jdbc.batch.repo.ProductRepository;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
 
+import java.math.BigDecimal;
 import java.time.Clock;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.util.List;
 import java.util.Random;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.tuple;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
 class ProductServiceUnitTest {
 
     @Mock
@@ -19,8 +36,34 @@ class ProductServiceUnitTest {
     @InjectMocks
     ProductService productService;
 
-    @Test
-    void testWhenThen() {
+    @Captor
+    ArgumentCaptor<List<Product>> proArgumentCaptor;
 
+
+    @Test
+    void testWhenCreateProductsThenShouldSaveAndReturnElapsedTime() {
+        when(random.nextInt(4))
+          .thenReturn(1, 3, 2, 0);
+        when(clock.instant())
+          .thenReturn(Instant.parse("2022-04-09T10:15:30.00Z"));
+        when(clock.millis())
+          .thenReturn(100L,500L);
+        when(clock.getZone())
+          .thenReturn(ZoneId.systemDefault());
+
+        long actualElapsedTime = productService.createProducts(2);
+
+        assertThat(actualElapsedTime)
+          .isEqualTo(400L);
+        verify(productRepository,times(1))
+          .saveAll(proArgumentCaptor.capture());
+
+        assertThat(proArgumentCaptor.getValue())
+          .hasSize(2)
+          .extracting("title","createdTs","price")
+          .containsExactly(
+            tuple("yacht", LocalDateTime.parse("2022-04-09T12:15:30"), new BigDecimal("8539.99")),
+            tuple("car", LocalDateTime.parse("2022-04-09T12:15:30"), new BigDecimal("88894"))
+          );
     }
 }
\ No newline at end of file