diff --git a/solutions/01-connecting-to-confluent-cloud/pom.xml b/solutions/01-connecting-to-confluent-cloud/pom.xml
index 2654828..f315345 100644
--- a/solutions/01-connecting-to-confluent-cloud/pom.xml
+++ b/solutions/01-connecting-to-confluent-cloud/pom.xml
@@ -30,7 +30,7 @@ under the License.
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <flink.version>1.20.0</flink.version>
-        <confluent-plugin.version>0.129.0</confluent-plugin.version>
+        <confluent-plugin.version>1.20-42</confluent-plugin.version>
         <kafka-clients.version>3.8.0</kafka-clients.version>
         <schema-registry-client.version>7.7.0</schema-registry-client.version>
         <target.java.version>21</target.java.version>
diff --git a/solutions/02-querying-flink-tables/pom.xml b/solutions/02-querying-flink-tables/pom.xml
index 2654828..f315345 100644
--- a/solutions/02-querying-flink-tables/pom.xml
+++ b/solutions/02-querying-flink-tables/pom.xml
@@ -30,7 +30,7 @@ under the License.
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <flink.version>1.20.0</flink.version>
-        <confluent-plugin.version>0.129.0</confluent-plugin.version>
+        <confluent-plugin.version>1.20-42</confluent-plugin.version>
         <kafka-clients.version>3.8.0</kafka-clients.version>
         <schema-registry-client.version>7.7.0</schema-registry-client.version>
         <target.java.version>21</target.java.version>
diff --git a/solutions/03-building-a-streaming-pipeline/pom.xml b/solutions/03-building-a-streaming-pipeline/pom.xml
index 2654828..f315345 100644
--- a/solutions/03-building-a-streaming-pipeline/pom.xml
+++ b/solutions/03-building-a-streaming-pipeline/pom.xml
@@ -30,7 +30,7 @@ under the License.
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <flink.version>1.20.0</flink.version>
-        <confluent-plugin.version>0.129.0</confluent-plugin.version>
+        <confluent-plugin.version>1.20-42</confluent-plugin.version>
         <kafka-clients.version>3.8.0</kafka-clients.version>
         <schema-registry-client.version>7.7.0</schema-registry-client.version>
         <target.java.version>21</target.java.version>
diff --git a/solutions/03-building-a-streaming-pipeline/src/test/java/marketplace/OrderServiceIntegrationTest.java b/solutions/03-building-a-streaming-pipeline/src/test/java/marketplace/OrderServiceIntegrationTest.java
index 6e9e87f..7dfbd7f 100644
--- a/solutions/03-building-a-streaming-pipeline/src/test/java/marketplace/OrderServiceIntegrationTest.java
+++ b/solutions/03-building-a-streaming-pipeline/src/test/java/marketplace/OrderServiceIntegrationTest.java
@@ -167,7 +167,7 @@ public void createFreeShippingTable_shouldCreateTheTable() {
         TableResult result = orderService.createFreeShippingTable();
 
         String status = result.collect().next().getFieldAs(0);
-        assertEquals("Table '"+orderQualifiedForFreeShippingShortTableName+"' created", status);
+        assertEquals("Command completed successfully.", status);
 
         env.useCatalog("flink-table-api-java");
         env.useDatabase("marketplace");
diff --git a/solutions/04-windowing/pom.xml b/solutions/04-windowing/pom.xml
index 2654828..f315345 100644
--- a/solutions/04-windowing/pom.xml
+++ b/solutions/04-windowing/pom.xml
@@ -30,7 +30,7 @@ under the License.
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <flink.version>1.20.0</flink.version>
-        <confluent-plugin.version>0.129.0</confluent-plugin.version>
+        <confluent-plugin.version>1.20-42</confluent-plugin.version>
         <kafka-clients.version>3.8.0</kafka-clients.version>
         <schema-registry-client.version>7.7.0</schema-registry-client.version>
         <target.java.version>21</target.java.version>
diff --git a/solutions/04-windowing/src/test/java/marketplace/OrderServiceIntegrationTest.java b/solutions/04-windowing/src/test/java/marketplace/OrderServiceIntegrationTest.java
index e8c4467..adab90a 100644
--- a/solutions/04-windowing/src/test/java/marketplace/OrderServiceIntegrationTest.java
+++ b/solutions/04-windowing/src/test/java/marketplace/OrderServiceIntegrationTest.java
@@ -170,7 +170,7 @@ public void createFreeShippingTable_shouldCreateTheTable() {
         TableResult result = orderService.createFreeShippingTable();
 
         String status = result.collect().next().getFieldAs(0);
-        assertEquals("Table '"+orderQualifiedForFreeShippingShortTableName+"' created", status);
+        assertEquals("Command completed successfully.", status);
 
         env.useCatalog("flink-table-api-java");
         env.useDatabase("marketplace");
@@ -263,7 +263,7 @@ public void createOrdersForPeriodTable_shouldCreateTheTable() {
         TableResult result = orderService.createOrdersForPeriodTable();
 
         String status = result.collect().next().getFieldAs(0);
-        assertEquals("Table '"+customerOrdersForPeriodShortTableName+"' created", status);
+        assertEquals("Command completed successfully.", status);
 
         env.useCatalog("flink-table-api-java");
         env.useDatabase("marketplace");
diff --git a/solutions/05-joins/pom.xml b/solutions/05-joins/pom.xml
index 2654828..f315345 100644
--- a/solutions/05-joins/pom.xml
+++ b/solutions/05-joins/pom.xml
@@ -30,7 +30,7 @@ under the License.
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <flink.version>1.20.0</flink.version>
-        <confluent-plugin.version>0.129.0</confluent-plugin.version>
+        <confluent-plugin.version>1.20-42</confluent-plugin.version>
         <kafka-clients.version>3.8.0</kafka-clients.version>
         <schema-registry-client.version>7.7.0</schema-registry-client.version>
         <target.java.version>21</target.java.version>
diff --git a/solutions/05-joins/src/test/java/marketplace/ClickServiceIntegrationTest.java b/solutions/05-joins/src/test/java/marketplace/ClickServiceIntegrationTest.java
index fb691ae..8d98e51 100644
--- a/solutions/05-joins/src/test/java/marketplace/ClickServiceIntegrationTest.java
+++ b/solutions/05-joins/src/test/java/marketplace/ClickServiceIntegrationTest.java
@@ -81,7 +81,7 @@ public void createOrderPlacedAfterClickTable_shouldCreateTheTable() {
         TableResult result = clickService.createOrderPlacedAfterClickTable();
 
         String status = result.collect().next().getFieldAs(0);
-        assertEquals("Table '"+orderPlacedAfterClickShortTableName+"' created", status);
+        assertEquals("Command completed successfully.", status);
 
         env.useCatalog("flink-table-api-java");
         env.useDatabase("marketplace");
diff --git a/solutions/05-joins/src/test/java/marketplace/OrderServiceIntegrationTest.java b/solutions/05-joins/src/test/java/marketplace/OrderServiceIntegrationTest.java
index e8c4467..adab90a 100644
--- a/solutions/05-joins/src/test/java/marketplace/OrderServiceIntegrationTest.java
+++ b/solutions/05-joins/src/test/java/marketplace/OrderServiceIntegrationTest.java
@@ -170,7 +170,7 @@ public void createFreeShippingTable_shouldCreateTheTable() {
         TableResult result = orderService.createFreeShippingTable();
 
         String status = result.collect().next().getFieldAs(0);
-        assertEquals("Table '"+orderQualifiedForFreeShippingShortTableName+"' created", status);
+        assertEquals("Command completed successfully.", status);
 
         env.useCatalog("flink-table-api-java");
         env.useDatabase("marketplace");
@@ -263,7 +263,7 @@ public void createOrdersForPeriodTable_shouldCreateTheTable() {
         TableResult result = orderService.createOrdersForPeriodTable();
 
         String status = result.collect().next().getFieldAs(0);
-        assertEquals("Table '"+customerOrdersForPeriodShortTableName+"' created", status);
+        assertEquals("Command completed successfully.", status);
 
         env.useCatalog("flink-table-api-java");
         env.useDatabase("marketplace");
diff --git a/staging/01-connecting-to-confluent-cloud/pom.xml b/staging/01-connecting-to-confluent-cloud/pom.xml
index 2654828..f315345 100644
--- a/staging/01-connecting-to-confluent-cloud/pom.xml
+++ b/staging/01-connecting-to-confluent-cloud/pom.xml
@@ -30,7 +30,7 @@ under the License.
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <flink.version>1.20.0</flink.version>
-        <confluent-plugin.version>0.129.0</confluent-plugin.version>
+        <confluent-plugin.version>1.20-42</confluent-plugin.version>
         <kafka-clients.version>3.8.0</kafka-clients.version>
         <schema-registry-client.version>7.7.0</schema-registry-client.version>
         <target.java.version>21</target.java.version>
diff --git a/staging/03-building-a-streaming-pipeline/src/test/java/marketplace/OrderServiceIntegrationTest.java b/staging/03-building-a-streaming-pipeline/src/test/java/marketplace/OrderServiceIntegrationTest.java
index 6e9e87f..7dfbd7f 100644
--- a/staging/03-building-a-streaming-pipeline/src/test/java/marketplace/OrderServiceIntegrationTest.java
+++ b/staging/03-building-a-streaming-pipeline/src/test/java/marketplace/OrderServiceIntegrationTest.java
@@ -167,7 +167,7 @@ public void createFreeShippingTable_shouldCreateTheTable() {
         TableResult result = orderService.createFreeShippingTable();
 
         String status = result.collect().next().getFieldAs(0);
-        assertEquals("Table '"+orderQualifiedForFreeShippingShortTableName+"' created", status);
+        assertEquals("Command completed successfully.", status);
 
         env.useCatalog("flink-table-api-java");
         env.useDatabase("marketplace");
diff --git a/staging/04-windowing/src/test/java/marketplace/OrderServiceIntegrationTest.java b/staging/04-windowing/src/test/java/marketplace/OrderServiceIntegrationTest.java
index e8c4467..adab90a 100644
--- a/staging/04-windowing/src/test/java/marketplace/OrderServiceIntegrationTest.java
+++ b/staging/04-windowing/src/test/java/marketplace/OrderServiceIntegrationTest.java
@@ -170,7 +170,7 @@ public void createFreeShippingTable_shouldCreateTheTable() {
         TableResult result = orderService.createFreeShippingTable();
 
         String status = result.collect().next().getFieldAs(0);
-        assertEquals("Table '"+orderQualifiedForFreeShippingShortTableName+"' created", status);
+        assertEquals("Command completed successfully.", status);
 
         env.useCatalog("flink-table-api-java");
         env.useDatabase("marketplace");
@@ -263,7 +263,7 @@ public void createOrdersForPeriodTable_shouldCreateTheTable() {
         TableResult result = orderService.createOrdersForPeriodTable();
 
         String status = result.collect().next().getFieldAs(0);
-        assertEquals("Table '"+customerOrdersForPeriodShortTableName+"' created", status);
+        assertEquals("Command completed successfully.", status);
 
         env.useCatalog("flink-table-api-java");
         env.useDatabase("marketplace");
diff --git a/staging/05-joins/pom.xml b/staging/05-joins/pom.xml
deleted file mode 100644
index d0bde22..0000000
--- a/staging/05-joins/pom.xml
+++ /dev/null
@@ -1,258 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>marketplace</groupId>
-    <artifactId>flink-table-api-marketplace</artifactId>
-    <version>0.1</version>
-    <packaging>jar</packaging>
-
-    <name>Flink Table API Marketplace on Confluent Cloud</name>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <flink.version>1.20.0</flink.version>
-        <confluent-plugin.version>0.92.0</confluent-plugin.version>
-        <kafka-clients.version>3.8.0</kafka-clients.version>
-        <schema-registry-client.version>7.7.0</schema-registry-client.version>
-        <target.java.version>21</target.java.version>
-        <maven.compiler.source>${target.java.version}</maven.compiler.source>
-        <maven.compiler.target>${target.java.version}</maven.compiler.target>
-        <log4j.version>2.17.1</log4j.version>
-    </properties>
-
-    <repositories>
-        <repository>
-            <id>plugins</id>
-            <url>file://${project.basedir}/../plugins</url>
-        </repository>
-        <repository>
-            <id>solution.plugins</id>
-            <url>file://${project.basedir}/../../plugins</url>
-        </repository>
-        <repository>
-            <id>apache.snapshots</id>
-            <name>Apache Development Snapshot Repository</name>
-            <url>https://repository.apache.org/content/repositories/snapshots/</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>confluent</id>
-            <url>https://packages.confluent.io/maven/</url>
-        </repository>
-    </repositories>
-
-    <dependencies>
-        <!-- Apache Flink dependencies -->
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-table-api-java</artifactId>
-            <version>${flink.version}</version>
-        </dependency>
-
-        <!-- Confluent Flink plugin -->
-        <dependency>
-            <groupId>io.confluent.flink</groupId>
-            <artifactId>confluent-table-planner</artifactId>
-            <version>${confluent-plugin.version}</version>
-        </dependency>
-
-        <!-- Add logging framework, to produce console output when running in the IDE. -->
-        <!-- These dependencies are excluded from the application JAR by default. -->
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
-            <version>${log4j.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-api</artifactId>
-            <version>${log4j.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-core</artifactId>
-            <version>${log4j.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.kafka</groupId>
-            <artifactId>kafka-clients</artifactId>
-            <version>${kafka-clients.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.confluent</groupId>
-            <artifactId>kafka-schema-registry-client</artifactId>
-            <version>${schema-registry-client.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.9.2</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.platform</groupId>
-            <artifactId>junit-platform-runner</artifactId>
-            <version>1.9.2</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <version>5.12.0</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <plugins>
-
-            <!-- Java Compiler -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
-                <configuration>
-                    <source>${target.java.version}</source>
-                    <target>${target.java.version}</target>
-                </configuration>
-            </plugin>
-
-            <!-- We use the maven-shade plugin to create a fat jar that contains all necessary dependencies. -->
-            <!-- Change the value of <mainClass>...</mainClass> if your program entry point changes. -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>3.1.1</version>
-                <executions>
-                    <!-- Run shade goal on package phase -->
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <artifactSet>
-                                <excludes>
-                                    <exclude>org.apache.flink:flink-shaded-force-shading</exclude>
-                                    <exclude>com.google.code.findbugs:jsr305</exclude>
-                                </excludes>
-                            </artifactSet>
-                            <filters>
-                                <filter>
-                                    <!-- Do not copy the signatures in the META-INF folder.
-                                    Otherwise, this might cause SecurityExceptions when using the JAR. -->
-                                    <artifact>*:*</artifact>
-                                    <excludes>
-                                        <exclude>META-INF/*.SF</exclude>
-                                        <exclude>META-INF/*.DSA</exclude>
-                                        <exclude>META-INF/*.RSA</exclude>
-                                    </excludes>
-                                </filter>
-                            </filters>
-                            <transformers>
-                                <transformer
-                                        implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
-                                <transformer
-                                        implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                    <mainClass>marketplace.Marketplace</mainClass>
-                                </transformer>
-                            </transformers>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.2</version>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.junit.platform</groupId>
-                        <artifactId>junit-platform-surefire-provider</artifactId>
-                        <version>1.2.0</version>
-                    </dependency>
-                </dependencies>
-                <configuration>
-                    <additionalClasspathElements>
-                        <additionalClasspathElement>src/test/java/</additionalClasspathElement>
-                    </additionalClasspathElements>
-                    <argLine>-XX:+EnableDynamicAgentLoading</argLine>
-                </configuration>
-            </plugin>
-        </plugins>
-
-        <pluginManagement>
-            <plugins>
-
-                <!-- This improves the out-of-the-box experience in Eclipse by resolving some warnings. -->
-                <plugin>
-                    <groupId>org.eclipse.m2e</groupId>
-                    <artifactId>lifecycle-mapping</artifactId>
-                    <version>1.0.0</version>
-                    <configuration>
-                        <lifecycleMappingMetadata>
-                            <pluginExecutions>
-                                <pluginExecution>
-                                    <pluginExecutionFilter>
-                                        <groupId>org.apache.maven.plugins</groupId>
-                                        <artifactId>maven-shade-plugin</artifactId>
-                                        <versionRange>[3.1.1,)</versionRange>
-                                        <goals>
-                                            <goal>shade</goal>
-                                        </goals>
-                                    </pluginExecutionFilter>
-                                    <action>
-                                        <ignore/>
-                                    </action>
-                                </pluginExecution>
-                                <pluginExecution>
-                                    <pluginExecutionFilter>
-                                        <groupId>org.apache.maven.plugins</groupId>
-                                        <artifactId>maven-compiler-plugin</artifactId>
-                                        <versionRange>[3.1,)</versionRange>
-                                        <goals>
-                                            <goal>testCompile</goal>
-                                            <goal>compile</goal>
-                                        </goals>
-                                    </pluginExecutionFilter>
-                                    <action>
-                                        <ignore/>
-                                    </action>
-                                </pluginExecution>
-                            </pluginExecutions>
-                        </lifecycleMappingMetadata>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-</project>
diff --git a/staging/05-joins/src/test/java/marketplace/ClickServiceIntegrationTest.java b/staging/05-joins/src/test/java/marketplace/ClickServiceIntegrationTest.java
index fb691ae..8d98e51 100644
--- a/staging/05-joins/src/test/java/marketplace/ClickServiceIntegrationTest.java
+++ b/staging/05-joins/src/test/java/marketplace/ClickServiceIntegrationTest.java
@@ -81,7 +81,7 @@ public void createOrderPlacedAfterClickTable_shouldCreateTheTable() {
         TableResult result = clickService.createOrderPlacedAfterClickTable();
 
         String status = result.collect().next().getFieldAs(0);
-        assertEquals("Table '"+orderPlacedAfterClickShortTableName+"' created", status);
+        assertEquals("Command completed successfully.", status);
 
         env.useCatalog("flink-table-api-java");
         env.useDatabase("marketplace");
diff --git a/staging/05-joins/src/test/java/marketplace/ClickServiceTest.java b/staging/05-joins/src/test/java/marketplace/ClickServiceTest.java
index fb6d809..f7ddcfb 100644
--- a/staging/05-joins/src/test/java/marketplace/ClickServiceTest.java
+++ b/staging/05-joins/src/test/java/marketplace/ClickServiceTest.java
@@ -3,6 +3,7 @@
 import org.apache.flink.table.api.*;
 import org.apache.flink.table.expressions.Expression;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
 
@@ -16,6 +17,7 @@
 import static org.mockito.Mockito.*;
 import static org.mockito.Mockito.verify;
 
+@Tag("UnitTest")
 class ClickServiceTest {
     private ClickService service;
     private TableEnvironment mockEnv;