diff --git a/m/login/impl/src/main/java/org/rapidpm/vaadin/component/login/LoginView.java b/m/login/impl/src/main/java/org/rapidpm/vaadin/component/login/LoginView.java
index 57dc370..5e26f15 100644
--- a/m/login/impl/src/main/java/org/rapidpm/vaadin/component/login/LoginView.java
+++ b/m/login/impl/src/main/java/org/rapidpm/vaadin/component/login/LoginView.java
@@ -15,6 +15,21 @@
  */
 package org.rapidpm.vaadin.component.login;
 
+import static java.util.Optional.ofNullable;
+import static org.rapidpm.vaadin.addons.framework.ComponentIDGenerator.buttonID;
+import static org.rapidpm.vaadin.addons.framework.ComponentIDGenerator.caption;
+import static org.rapidpm.vaadin.addons.framework.ComponentIDGenerator.passwordID;
+import static org.rapidpm.vaadin.addons.framework.ComponentIDGenerator.placeholder;
+import static org.rapidpm.vaadin.addons.framework.ComponentIDGenerator.textfieldID;
+import static org.rapidpm.vaadin.addons.framework.GenericIDGenerator.genericID;
+import java.util.function.Consumer;
+import org.rapidpm.dependencies.core.logger.HasLogger;
+import org.rapidpm.vaadin.api.fluent.builder.button.ButtonBuilder;
+import org.rapidpm.vaadin.api.fluent.builder.checkbox.CheckboxBuilder;
+import org.rapidpm.vaadin.api.fluent.builder.layout.horizontal.HorizontalLayoutBuilder;
+import org.rapidpm.vaadin.api.fluent.builder.layout.vertical.VerticalLayoutBuilder;
+import org.rapidpm.vaadin.api.fluent.builder.passwordfield.PasswordFieldBuilder;
+import org.rapidpm.vaadin.api.fluent.builder.textfield.TextFieldBuilder;
 import com.vaadin.flow.component.ClickEvent;
 import com.vaadin.flow.component.Component;
 import com.vaadin.flow.component.ComponentEventListener;
@@ -28,18 +43,6 @@
 import com.vaadin.flow.component.textfield.PasswordField;
 import com.vaadin.flow.component.textfield.TextField;
 import com.vaadin.flow.shared.Registration;
-import org.rapidpm.dependencies.core.logger.HasLogger;
-import org.rapidpm.vaadin.api.fluent.builder.button.ButtonBuilder;
-import org.rapidpm.vaadin.api.fluent.builder.checkbox.CheckboxBuilder;
-import org.rapidpm.vaadin.api.fluent.builder.layout.horizontal.HorizontalLayoutBuilder;
-import org.rapidpm.vaadin.api.fluent.builder.layout.vertical.VerticalLayoutBuilder;
-import org.rapidpm.vaadin.api.fluent.builder.passwordfield.PasswordFieldBuilder;
-import org.rapidpm.vaadin.api.fluent.builder.textfield.TextFieldBuilder;
-
-import java.util.function.Consumer;
-
-import static java.util.Optional.ofNullable;
-import static org.rapidpm.vaadin.addons.framework.ComponentIDGenerator.*;
 
 public abstract class LoginView extends Composite<HorizontalLayout> implements HasLogger {
 
diff --git a/pom.xml b/pom.xml
index 967691c..7ac681c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
   <parent>
     <groupId>org.rapidpm</groupId>
     <artifactId>rapidpm-dependencies</artifactId>
-    <version>04.00.07-RPM</version>
+    <version>04.00.10-RPM</version>
   </parent>
 
   <groupId>org.rapidpm.vaadin</groupId>
@@ -94,10 +94,11 @@
     <webdriverextensions-maven-plugin.version>3.1.3</webdriverextensions-maven-plugin.version>
 
     <!--RapidPM-->
-    <rapidpm-dependencies.version>04.00.07-RPM</rapidpm-dependencies.version>
+    <rapidpm-dependencies.version>04.00.10-RPM</rapidpm-dependencies.version>
     <rapidpm-functional-reactive.version>00.07.06-RPM</rapidpm-functional-reactive.version>
-    <rapidpm-vaadin-testbench-ng.version>00.07.06-RPM</rapidpm-vaadin-testbench-ng.version>
+    <rapidpm-vaadin-testbench-ng.version>01.00.01-RPM</rapidpm-vaadin-testbench-ng.version>
     <rapidpm-vaadin-components.version>00.07.07-RPM-SNAPSHOT</rapidpm-vaadin-components.version>
+    <rapidpm-junit-servlet-container-extendsion.version>01.00.02-RPM</rapidpm-junit-servlet-container-extendsion.version>
     <!--Vaadin-->
     <vaadin.version>11.0.1</vaadin.version>
     <meecrowave.version>1.2.4</meecrowave.version>
@@ -125,26 +126,32 @@
       </dependency>
       <dependency>
         <groupId>org.rapidpm</groupId>
-        <artifactId>testbench-ng-bom</artifactId>
+        <artifactId>rapidpm-vaadin-testbench-ng-bom</artifactId>
         <version>${rapidpm-vaadin-testbench-ng.version}</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
       <dependency>
         <groupId>org.rapidpm</groupId>
-        <artifactId>testbench-ng-bom-vaadin-vXX</artifactId>
+        <artifactId>rapidpm-vaadin-testbench-ng-bom-vXX</artifactId>
         <version>${rapidpm-vaadin-testbench-ng.version}</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
+      <dependency>
+      	<groupId>org.rapidpm</groupId>
+      	<artifactId>rapidpm-junit5-ext-servlet-container-bom</artifactId>
+      	<version>${rapidpm-junit-servlet-container-extendsion.version}</version>
+        <scope>import</scope>
+        <type>pom</type>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
   <dependencies>
     <dependency>
       <groupId>org.rapidpm</groupId>
-      <artifactId>rapidpm-dependencies-core-logger</artifactId>
-      <version>${rapidpm-dependencies.version}</version>
+      <artifactId>rapidpm-logger-adapter</artifactId>      
     </dependency>
 
     <dependency>
@@ -155,7 +162,7 @@
 
     <dependency>
       <groupId>org.rapidpm</groupId>
-      <artifactId>testbench-ng-m-framework-vXX</artifactId>
+      <artifactId>rapidpm-vaadin-testbench-ng-m-framework-v10</artifactId>
     </dependency>
 
     <!--Infrastructure-->
@@ -198,17 +205,17 @@
     <!--TDD-->
     <dependency>
       <groupId>org.rapidpm</groupId>
-      <artifactId>testbench-ng-m-container-init-meecrowave</artifactId>
+      <artifactId>rapidpm-junit5-ext-servlet-container-impl-meecrowave</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.rapidpm</groupId>
-      <artifactId>testbench-ng-m-pageobject-vaadin-generic</artifactId>
+      <artifactId>rapidpm-vaadin-testbench-ng-m-pageobject-vaadin-generic</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.rapidpm</groupId>
-      <artifactId>testbench-ng-m-pageobject-vaadin-vXX-tb</artifactId>
+      <artifactId>rapidpm-vaadin-testbench-ng-m-pageobject-vaadin-v10-tb</artifactId>
       <scope>test</scope>
     </dependency>