diff --git a/services/basket-producer/build.gradle b/services/basket-producer/build.gradle
index 150e4e3..31f1c28 100644
--- a/services/basket-producer/build.gradle
+++ b/services/basket-producer/build.gradle
@@ -21,6 +21,7 @@ configurations {
 
 repositories {
 	mavenCentral()
+	maven { url 'https://repo.spring.io/milestone' }
 }
 
 ext {
@@ -36,11 +37,11 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-validation'
 	implementation 'org.springframework.boot:spring-boot-starter-web'
 	implementation 'org.springframework.boot:spring-boot-starter-webflux'
-	implementation("org.springframework.boot:spring-boot-starter-validation")
-	implementation 'org.liquibase:liquibase-core'
-	implementation("net.javacrumbs.shedlock:shedlock-spring:6.0.2")
-	implementation("net.javacrumbs.shedlock:shedlock-provider-jdbc-template:6.0.2")
+	implementation "org.springframework.boot:spring-boot-starter-validation"
 	implementation 'org.springframework.kafka:spring-kafka'
+	implementation 'org.liquibase:liquibase-core'
+	implementation "net.javacrumbs.shedlock:shedlock-spring:6.0.2"
+	implementation "net.javacrumbs.shedlock:shedlock-provider-jdbc-template:6.0.2"
 	implementation 'org.springframework.boot:spring-boot-testcontainers'
 	implementation 'org.testcontainers:junit-jupiter'
 	implementation 'org.testcontainers:postgresql'
@@ -51,6 +52,7 @@ dependencies {
 	runtimeOnly 'org.postgresql:postgresql'
 	runtimeOnly 'org.postgresql:r2dbc-postgresql'
 	annotationProcessor 'org.projectlombok:lombok'
+//	testImplementation 'io.projectreactor.tools:blockhound:1.0.10.RELEASE'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testImplementation 'io.projectreactor:reactor-test'
 	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
diff --git a/services/basket-producer/src/test/java/lrskyum/sbdemo/business/domain/FetchCustomerBasketRepositoryTest.java b/services/basket-producer/src/test/java/lrskyum/sbdemo/business/domain/QueryCustomerBasketRepositoryTest.java
similarity index 95%
rename from services/basket-producer/src/test/java/lrskyum/sbdemo/business/domain/FetchCustomerBasketRepositoryTest.java
rename to services/basket-producer/src/test/java/lrskyum/sbdemo/business/domain/QueryCustomerBasketRepositoryTest.java
index d66277f..a7c079c 100644
--- a/services/basket-producer/src/test/java/lrskyum/sbdemo/business/domain/FetchCustomerBasketRepositoryTest.java
+++ b/services/basket-producer/src/test/java/lrskyum/sbdemo/business/domain/QueryCustomerBasketRepositoryTest.java
@@ -17,7 +17,7 @@
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @ExtendWith(SpringExtension.class)
 @ActiveProfiles("tempdb")
-class CustomerBasketRepositoryTest {
+class QueryCustomerBasketRepositoryTest {
 
     @Autowired
     private BasketRepository basketRepository;
@@ -32,7 +32,7 @@ void shouldInitializeDatabase_withTenOrders() {
         // Assert
         StepVerifier.create(orders.collectList())
                 .expectSubscription()
-                .assertNext(list -> assertThat(list.size()).isGreaterThanOrEqualTo(10)) // Check size
+                .assertNext(list -> assertThat(list.size()).isGreaterThanOrEqualTo(10))
                 .expectComplete()
                 .verify();
     }
diff --git a/services/basket-producer/src/test/java/lrskyum/sbdemo/ui/QueryBasketControllerTest.java b/services/basket-producer/src/test/java/lrskyum/sbdemo/ui/QueryBasketControllerTest.java
index 83423be..b4925ba 100644
--- a/services/basket-producer/src/test/java/lrskyum/sbdemo/ui/QueryBasketControllerTest.java
+++ b/services/basket-producer/src/test/java/lrskyum/sbdemo/ui/QueryBasketControllerTest.java
@@ -50,9 +50,9 @@ public void shouldGetInitialOrders_withTenOrders() {
                     assertNotNull(basket);
                     assertFalse(basket.isEmpty(), "Expected at least 10 elements, but found " + basket.size());
 
-                    basket.forEach(order -> {
-                        assertNotNull(order.getBasketStatus());
-                        assertNotNull(order.getBasketDateUtc());
+                    basket.forEach(b -> {
+                        assertNotNull(b.getBasketStatus());
+                        assertNotNull(b.getBasketDateUtc());
                     });
                 });
     }