diff --git a/pom.xml b/pom.xml
index 9f438cf..bcbea42 100644
--- a/pom.xml
+++ b/pom.xml
@@ -130,6 +130,12 @@
             <artifactId>json-migration-helper</artifactId>
             <version>0.9.0</version>
         </dependency>
+        <dependency>
+              <groupId>org.ow2.asm</groupId>
+              <artifactId>asm</artifactId>
+              <version>9.8</version>
+              <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
@@ -174,7 +180,7 @@
 		<dependency>
 			<groupId>com.flowingcode.vaadin.test</groupId>
 			<artifactId>testbench-rpc</artifactId>
-			<version>1.0.0</version>
+			<version>1.4.0-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -506,31 +512,9 @@
 			<properties>
 				<maven.compiler.source>21</maven.compiler.source>
 				<maven.compiler.target>21</maven.compiler.target>
-				<vaadin.version>25.0.0-beta2</vaadin.version>
+				<vaadin.version>25.0.0</vaadin.version>
 				<jetty.version>11.0.26</jetty.version>
 			</properties>
-			<repositories>
-					<repository>
-							<id>vaadin-prerelease</id>
-							<url>https://maven.vaadin.com/vaadin-prereleases</url>
-					</repository>
-					<repository>
-						<id>FlowingCode Snapshots</id>
-						<url>https://maven.flowingcode.com/snapshots</url>
-						<snapshots>
-							<enabled>true</enabled>
-						</snapshots>
-						<releases>
-							<enabled>false</enabled>
-						</releases>
-					</repository>
-			</repositories>
-			<pluginRepositories>
-					<pluginRepository>
-							<id>vaadin-prerelease</id>
-							<url>https://maven.vaadin.com/vaadin-prereleases</url>
-					</pluginRepository>
-			</pluginRepositories>
 			<dependencies>
 				<dependency>
 					<groupId>com.flowingcode.vaadin.addons.demo</groupId>
@@ -538,6 +522,11 @@
 					<version>5.0.0</version>
 					<scope>test</scope>
 				</dependency>
+				<dependency>
+					<groupId>com.vaadin</groupId>
+					<artifactId>vaadin-dev</artifactId>
+					<optional>true</optional>
+				</dependency>
 			</dependencies>
 		</profile>
 		
diff --git a/src/test/java/com/flowingcode/vaadin/addons/chipfield/integration/IntegrationView.java b/src/test/java/com/flowingcode/vaadin/addons/chipfield/integration/IntegrationView.java
index 24451fd..a700417 100644
--- a/src/test/java/com/flowingcode/vaadin/addons/chipfield/integration/IntegrationView.java
+++ b/src/test/java/com/flowingcode/vaadin/addons/chipfield/integration/IntegrationView.java
@@ -20,17 +20,17 @@
 package com.flowingcode.vaadin.addons.chipfield.integration;
 
 import com.flowingcode.vaadin.addons.chipfield.ChipField;
+import com.flowingcode.vaadin.jsonmigration.InstrumentedRoute;
 import com.flowingcode.vaadin.testbench.rpc.JsonArrayList;
 import com.vaadin.flow.component.ClientCallable;
 import com.vaadin.flow.component.html.Div;
-import com.vaadin.flow.router.Route;
 import elemental.json.Json;
 import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 
-@Route("it")
+@InstrumentedRoute("it")
 public class IntegrationView extends Div implements IntegrationViewCallables {
 
   public ChipField<String> field;
@@ -166,7 +166,7 @@ public void addItemCreatedListener() {
   @Override
   @ClientCallable
   public JsonArrayList<String> getLastValueChange() {
-    return JsonArrayList.fromStringArray(lastValueChange);
+    return JsonArrayList.fromStrings(lastValueChange);
   }
 
   @Override
diff --git a/src/test/java/com/flowingcode/vaadin/addons/chipfield/integration/ViewInitializerImpl.java b/src/test/java/com/flowingcode/vaadin/addons/chipfield/integration/ViewInitializerImpl.java
new file mode 100644
index 0000000..7342e17
--- /dev/null
+++ b/src/test/java/com/flowingcode/vaadin/addons/chipfield/integration/ViewInitializerImpl.java
@@ -0,0 +1,33 @@
+/*-
+ * #%L
+ * RPC for Vaadin TestBench
+ * %%
+ * Copyright (C) 2021 - 2025 Flowing Code
+ * %%
+ * Licensed 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.
+ * #L%
+ */
+package com.flowingcode.vaadin.addons.chipfield.integration;
+
+import com.flowingcode.vaadin.jsonmigration.InstrumentationViewInitializer;
+import com.vaadin.flow.server.ServiceInitEvent;
+
+@SuppressWarnings("serial")
+public class ViewInitializerImpl extends InstrumentationViewInitializer {
+
+  @Override
+  public void serviceInit(ServiceInitEvent event) {
+    registerInstrumentedRoute(IntegrationView.class);
+  }
+
+}
diff --git a/src/test/resources/META-INF/services/com.vaadin.flow.server.VaadinServiceInitListener b/src/test/resources/META-INF/services/com.vaadin.flow.server.VaadinServiceInitListener
new file mode 100644
index 0000000..b974866
--- /dev/null
+++ b/src/test/resources/META-INF/services/com.vaadin.flow.server.VaadinServiceInitListener
@@ -0,0 +1 @@
+com.flowingcode.vaadin.addons.chipfield.integration.ViewInitializerImpl