diff --git a/catalog-service/src/main/java/com/example/catalogservice/services/ProductService.java b/catalog-service/src/main/java/com/example/catalogservice/services/ProductService.java
index 9d6c4a1e..c456a91d 100644
--- a/catalog-service/src/main/java/com/example/catalogservice/services/ProductService.java
+++ b/catalog-service/src/main/java/com/example/catalogservice/services/ProductService.java
@@ -135,10 +135,10 @@ public Mono<ProductResponse> findProductById(Long id) {
                         productResponse ->
                                 getInventoryByProductCode(productResponse.code())
                                         .map(
-                                                inventoryDto -> {
-                                                    return productResponse.withInStock(
-                                                            inventoryDto.availableQuantity() > 0);
-                                                }));
+                                                inventoryDto ->
+                                                        productResponse.withInStock(
+                                                                inventoryDto.availableQuantity()
+                                                                        > 0)));
     }
 
     private Mono<InventoryResponse> getInventoryByProductCode(String code) {
diff --git a/order-service/src/main/java/com/example/orderservice/config/kafka/KafkaStreamsConfig.java b/order-service/src/main/java/com/example/orderservice/config/kafka/KafkaStreamsConfig.java
index 15cf6cf7..8b342810 100644
--- a/order-service/src/main/java/com/example/orderservice/config/kafka/KafkaStreamsConfig.java
+++ b/order-service/src/main/java/com/example/orderservice/config/kafka/KafkaStreamsConfig.java
@@ -67,7 +67,7 @@ KafkaStreamsConfiguration defaultKafkaStreamsConfig(
             KafkaConnectionDetails connectionDetails,
             KafkaProperties kafkaProperties,
             DeadLetterPublishingRecoverer deadLetterPublishingRecoverer) {
-        Map<String, Object> properties = kafkaProperties.buildStreamsProperties();
+        Map<String, Object> properties = kafkaProperties.buildStreamsProperties(null);
         properties.put(
                 ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG,
                 connectionDetails.getStreamsBootstrapServers());
diff --git a/test-em-all.sh b/test-em-all.sh
index 46cef785..871f64d4 100755
--- a/test-em-all.sh
+++ b/test-em-all.sh
@@ -142,7 +142,7 @@ function setupTestData() {
 
     # Verify that communication between catalog-service and inventory service is established
     assertCurl 200 "curl  -k http://$HOST:$PORT/catalog-service/api/catalog/productCode/$PROD_CODE_1?fetchInStock=true"
-    assertEqual $PROD_CODE_1 $(echo ${RESPONSE} | jq .code)
+    assertEqual \"${PROD_CODE_1}\" $(echo ${RESPONSE} | jq .code)
     assertEqual \"true\" $(echo ${RESPONSE} | jq .inStock)
 
     body="{\"name\": \"$CUSTOMER_NAME"