1414 files changed, 8 insertions, 8 deletions

diff --git a/build/build.xml b/build/build.xml
index 96ec975ace..c234480877 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -260,7 +260,7 @@
            	<!-- VaadinClasses and data classes are used by TestBench tests also -->
             <fileset dir="${result-classes-junit}" />
             <!-- test resources -->
-            <fileset dir="tests/testbench">
+            <fileset dir="uitest/src">
                 <include name="${vaadin-package}/tests/**/*" />
                 <!-- Pre-processed versions of these copied above -->
                 <exclude name="**/*.java" />
@@ -270,7 +270,7 @@
             </fileset>
 
         	<!-- Include files required by the DemoLauncher/DevelopmentServerLauncher -->
-            <fileset dir="tests/testbench">
+            <fileset dir="uitest/src">
         		<include name="${vaadin-package}/launcher/jetty-webdefault.xml" />
         		<include name="${vaadin-package}/launcher/keystore" />
             </fileset>
@@ -347,7 +347,7 @@
         Source directories in the project are
          * src (Vaadin core)
          * sass/src (SASS compiler)
-         * tests/testbench (TestBench test cases)
+         * uitest/src (TestBench test cases)
          * server/tests/src (Server-side JUnit test cases)
          * client/tests/src (Client-side JUnit test cases)
 
@@ -443,7 +443,7 @@
 
         <copy todir="${result-src-testbench}">
             <filterset refid="version-and-license"/>
-            <fileset dir="tests/testbench">
+            <fileset dir="uitest/src">
                 <patternset refid="preprocessable-files" />
             </fileset>
         </copy>
@@ -495,7 +495,7 @@
             </fileset>
         </copy>
         <copy todir="${result-src-testbench}">
-            <fileset dir="tests/testbench">
+            <fileset dir="uitest/src">
                 <patternset refid="non-preprocessable-files" />
             </fileset>
         </copy>
@@ -1337,7 +1337,7 @@
         <property name="package.filename" value="${result-path}/${test-war-filename}"/>
 
         <!-- Run the separate test script. -->
-        <ant antfile="tests/test.xml" target="test-package" inheritall="false" inheritrefs="true">
+        <ant antfile="uitest/test.xml" target="test-package" inheritall="false" inheritrefs="true">
             <!-- This is provided so that the test script can copy the -->
             <!-- "tests" classes after unpacking the package.          -->
             <property name="output-dir" value="${output-dir}"/>
@@ -1373,7 +1373,7 @@
         <property name="tests.war" location="${result-path}/${test-war-filename}" />
         
         <!-- Run the separate test script. -->
-        <ant antfile="tests/integration_tests.xml" target="integration-test-all" inheritall="false" inheritrefs="true">
+        <ant antfile="uitest/integration_tests.xml" target="integration-test-all" inheritall="false" inheritrefs="true">
               <!-- This is provided so that the test script can copy the -->
               <!-- "tests" classes after unpacking the package.          -->
               <property name="output-dir" value="${output-dir}"/>
diff --git a/tests/eclipse-run-selected-test.properties b/uitest/eclipse-run-selected-test.properties
index 49925925bc..49925925bc 100644
--- a/tests/eclipse-run-selected-test.properties
+++ b/uitest/eclipse-run-selected-test.properties
diff --git a/tests/integration-testscripts/GateIn-3/integration-test-GateIn-3.1.0-portlet2.html b/uitest/integration-testscripts/GateIn-3/integration-test-GateIn-3.1.0-portlet2.html
index 4bc3e6a2cf..4bc3e6a2cf 100644
--- a/tests/integration-testscripts/GateIn-3/integration-test-GateIn-3.1.0-portlet2.html
+++ b/uitest/integration-testscripts/GateIn-3/integration-test-GateIn-3.1.0-portlet2.html
diff --git a/tests/integration-testscripts/GoogleAppEngine/integration-test-GAE.html b/uitest/integration-testscripts/GoogleAppEngine/integration-test-GAE.html
index 3f5ec1ce90..3f5ec1ce90 100644
--- a/tests/integration-testscripts/GoogleAppEngine/integration-test-GAE.html
+++ b/uitest/integration-testscripts/GoogleAppEngine/integration-test-GAE.html
diff --git a/tests/integration-testscripts/Liferay-5/integration-test-liferay-5.2.3-portlet2.html b/uitest/integration-testscripts/Liferay-5/integration-test-liferay-5.2.3-portlet2.html
index 55c9d18eb8..55c9d18eb8 100644
--- a/tests/integration-testscripts/Liferay-5/integration-test-liferay-5.2.3-portlet2.html
+++ b/uitest/integration-testscripts/Liferay-5/integration-test-liferay-5.2.3-portlet2.html
diff --git a/tests/integration-testscripts/Liferay-6/Liferay6-theme.html b/uitest/integration-testscripts/Liferay-6/Liferay6-theme.html
index c61adb0dd7..c61adb0dd7 100644
--- a/tests/integration-testscripts/Liferay-6/Liferay6-theme.html
+++ b/uitest/integration-testscripts/Liferay-6/Liferay6-theme.html
diff --git a/tests/integration-testscripts/Liferay-6/integration-test-liferay-6.0.5.html b/uitest/integration-testscripts/Liferay-6/integration-test-liferay-6.0.5.html
index 88cac6cd74..88cac6cd74 100644
--- a/tests/integration-testscripts/Liferay-6/integration-test-liferay-6.0.5.html
+++ b/uitest/integration-testscripts/Liferay-6/integration-test-liferay-6.0.5.html
diff --git a/tests/integration-testscripts/Liferay-6EE/Liferay6EE-theme.html b/uitest/integration-testscripts/Liferay-6EE/Liferay6EE-theme.html
index f4772ef7ad..f4772ef7ad 100644
--- a/tests/integration-testscripts/Liferay-6EE/Liferay6EE-theme.html
+++ b/uitest/integration-testscripts/Liferay-6EE/Liferay6EE-theme.html
diff --git a/tests/integration-testscripts/Liferay-6EE/integration-test-liferay-6ee.html b/uitest/integration-testscripts/Liferay-6EE/integration-test-liferay-6ee.html
index d4ea24c797..d4ea24c797 100644
--- a/tests/integration-testscripts/Liferay-6EE/integration-test-liferay-6ee.html
+++ b/uitest/integration-testscripts/Liferay-6EE/integration-test-liferay-6ee.html
diff --git a/tests/integration-testscripts/common/integration_test.tpl b/uitest/integration-testscripts/common/integration_test.tpl
index ed97710282..ed97710282 100644
--- a/tests/integration-testscripts/common/integration_test.tpl
+++ b/uitest/integration-testscripts/common/integration_test.tpl
diff --git a/tests/integration-testscripts/eXo-3/integration-test-eXo-3.0.3-portlet2.html b/uitest/integration-testscripts/eXo-3/integration-test-eXo-3.0.3-portlet2.html
index af85dfd161..af85dfd161 100644
--- a/tests/integration-testscripts/eXo-3/integration-test-eXo-3.0.3-portlet2.html
+++ b/uitest/integration-testscripts/eXo-3/integration-test-eXo-3.0.3-portlet2.html
diff --git a/tests/integration-testscripts/weblogic-portal/integration-test-WebLogic-Portal-10.3.2-portlet2.html b/uitest/integration-testscripts/weblogic-portal/integration-test-WebLogic-Portal-10.3.2-portlet2.html
index 98256862aa..98256862aa 100644
--- a/tests/integration-testscripts/weblogic-portal/integration-test-WebLogic-Portal-10.3.2-portlet2.html
+++ b/uitest/integration-testscripts/weblogic-portal/integration-test-WebLogic-Portal-10.3.2-portlet2.html
diff --git a/tests/integration_base_files/base.xml b/uitest/integration_base_files/base.xml
index f9c2ff3d6b..f9c2ff3d6b 100644
--- a/tests/integration_base_files/base.xml
+++ b/uitest/integration_base_files/base.xml
diff --git a/tests/integration_base_files/cleanup.sh b/uitest/integration_base_files/cleanup.sh
index 42fb5a434d..42fb5a434d 100644
--- a/tests/integration_base_files/cleanup.sh
+++ b/uitest/integration_base_files/cleanup.sh
diff --git a/tests/integration_base_files/lock_age.sh b/uitest/integration_base_files/lock_age.sh
index 115a8fef79..115a8fef79 100644
--- a/tests/integration_base_files/lock_age.sh
+++ b/uitest/integration_base_files/lock_age.sh
diff --git a/tests/integration_tests.xml b/uitest/integration_tests.xml
index e8e978c1ea..e8e978c1ea 100644
--- a/tests/integration_tests.xml
+++ b/uitest/integration_tests.xml
diff --git a/tests/ivy.xml b/uitest/ivy.xml
index 6c7171166b..2b543885c6 100644
--- a/tests/ivy.xml
+++ b/uitest/ivy.xml
@@ -2,7 +2,7 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation= "http://ant.apache.org/ivy/schemas/ivy.xsd">
     
-    <info organisation="com.vaadin" module="tests"/>
+    <info organisation="com.vaadin" module="vaadin-uitests"/>
     <configurations>
    		<conf name="jetty" visibility="private" />
    		<conf name="emma" visibility="private" />
diff --git a/tests/testbench/META-INF/services/com.vaadin.terminal.gwt.server.AddonContextListener b/uitest/src/META-INF/services/com.vaadin.terminal.gwt.server.AddonContextListener
index 9b3d9eb082..9b3d9eb082 100644
--- a/tests/testbench/META-INF/services/com.vaadin.terminal.gwt.server.AddonContextListener
+++ b/uitest/src/META-INF/services/com.vaadin.terminal.gwt.server.AddonContextListener
diff --git a/tests/testbench/com/vaadin/launcher/ApplicationRunnerServlet.java b/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java
index e05979ede0..e05979ede0 100644
--- a/tests/testbench/com/vaadin/launcher/ApplicationRunnerServlet.java
+++ b/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java
diff --git a/tests/testbench/com/vaadin/launcher/DemoLauncher.java b/uitest/src/com/vaadin/launcher/DemoLauncher.java
index d858b91483..d858b91483 100644
--- a/tests/testbench/com/vaadin/launcher/DemoLauncher.java
+++ b/uitest/src/com/vaadin/launcher/DemoLauncher.java
diff --git a/tests/testbench/com/vaadin/launcher/DevelopmentServerLauncher.java b/uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java
index 6162820dac..6162820dac 100644
--- a/tests/testbench/com/vaadin/launcher/DevelopmentServerLauncher.java
+++ b/uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java
diff --git a/tests/testbench/com/vaadin/launcher/jetty-webdefault.xml b/uitest/src/com/vaadin/launcher/jetty-webdefault.xml
index 5a2465af5a..5a2465af5a 100644
--- a/tests/testbench/com/vaadin/launcher/jetty-webdefault.xml
+++ b/uitest/src/com/vaadin/launcher/jetty-webdefault.xml
diff --git a/tests/testbench/com/vaadin/launcher/keystore b/uitest/src/com/vaadin/launcher/keystore
index 1314185e2a..1314185e2a 100644
--- a/tests/testbench/com/vaadin/launcher/keystore
+++ b/uitest/src/com/vaadin/launcher/keystore
diff --git a/tests/testbench/com/vaadin/launcher/util/BrowserLauncher.java b/uitest/src/com/vaadin/launcher/util/BrowserLauncher.java
index c9b3622894..c9b3622894 100644
--- a/tests/testbench/com/vaadin/launcher/util/BrowserLauncher.java
+++ b/uitest/src/com/vaadin/launcher/util/BrowserLauncher.java
diff --git a/tests/testbench/com/vaadin/tests/Components.java b/uitest/src/com/vaadin/tests/Components.java
index 5882c5cdb1..5882c5cdb1 100644
--- a/tests/testbench/com/vaadin/tests/Components.java
+++ b/uitest/src/com/vaadin/tests/Components.java
diff --git a/tests/testbench/com/vaadin/tests/CustomLayoutDemo.java b/uitest/src/com/vaadin/tests/CustomLayoutDemo.java
index 833340f678..833340f678 100644
--- a/tests/testbench/com/vaadin/tests/CustomLayoutDemo.java
+++ b/uitest/src/com/vaadin/tests/CustomLayoutDemo.java
diff --git a/tests/testbench/com/vaadin/tests/FocusingComponents.java b/uitest/src/com/vaadin/tests/FocusingComponents.java
index f63989fafb..f63989fafb 100644
--- a/tests/testbench/com/vaadin/tests/FocusingComponents.java
+++ b/uitest/src/com/vaadin/tests/FocusingComponents.java
diff --git a/tests/testbench/com/vaadin/tests/LayoutDemo.java b/uitest/src/com/vaadin/tests/LayoutDemo.java
index a5331b94af..a5331b94af 100644
--- a/tests/testbench/com/vaadin/tests/LayoutDemo.java
+++ b/uitest/src/com/vaadin/tests/LayoutDemo.java
diff --git a/tests/testbench/com/vaadin/tests/ListenerOrder.java b/uitest/src/com/vaadin/tests/ListenerOrder.java
index ab364a8781..ab364a8781 100644
--- a/tests/testbench/com/vaadin/tests/ListenerOrder.java
+++ b/uitest/src/com/vaadin/tests/ListenerOrder.java
diff --git a/tests/testbench/com/vaadin/tests/ModalWindow.java b/uitest/src/com/vaadin/tests/ModalWindow.java
index 6153f14285..6153f14285 100644
--- a/tests/testbench/com/vaadin/tests/ModalWindow.java
+++ b/uitest/src/com/vaadin/tests/ModalWindow.java
diff --git a/tests/testbench/com/vaadin/tests/NativeWindowing.java b/uitest/src/com/vaadin/tests/NativeWindowing.java
index 2418c74db8..2418c74db8 100644
--- a/tests/testbench/com/vaadin/tests/NativeWindowing.java
+++ b/uitest/src/com/vaadin/tests/NativeWindowing.java
diff --git a/tests/testbench/com/vaadin/tests/OrderedLayoutSwapComponents.java b/uitest/src/com/vaadin/tests/OrderedLayoutSwapComponents.java
index f47078ba8c..f47078ba8c 100644
--- a/tests/testbench/com/vaadin/tests/OrderedLayoutSwapComponents.java
+++ b/uitest/src/com/vaadin/tests/OrderedLayoutSwapComponents.java
diff --git a/tests/testbench/com/vaadin/tests/Parameters.java b/uitest/src/com/vaadin/tests/Parameters.java
index b16d4ef65b..b16d4ef65b 100644
--- a/tests/testbench/com/vaadin/tests/Parameters.java
+++ b/uitest/src/com/vaadin/tests/Parameters.java
diff --git a/tests/testbench/com/vaadin/tests/PerformanceTestBasicComponentRendering.java b/uitest/src/com/vaadin/tests/PerformanceTestBasicComponentRendering.java
index 0e76617cc5..0e76617cc5 100644
--- a/tests/testbench/com/vaadin/tests/PerformanceTestBasicComponentRendering.java
+++ b/uitest/src/com/vaadin/tests/PerformanceTestBasicComponentRendering.java
diff --git a/tests/testbench/com/vaadin/tests/PerformanceTestLabelsAndOrderedLayouts.java b/uitest/src/com/vaadin/tests/PerformanceTestLabelsAndOrderedLayouts.java
index 8002059227..8002059227 100644
--- a/tests/testbench/com/vaadin/tests/PerformanceTestLabelsAndOrderedLayouts.java
+++ b/uitest/src/com/vaadin/tests/PerformanceTestLabelsAndOrderedLayouts.java
diff --git a/tests/testbench/com/vaadin/tests/PerformanceTestSubTreeCaching.java b/uitest/src/com/vaadin/tests/PerformanceTestSubTreeCaching.java
index 485843d104..485843d104 100644
--- a/tests/testbench/com/vaadin/tests/PerformanceTestSubTreeCaching.java
+++ b/uitest/src/com/vaadin/tests/PerformanceTestSubTreeCaching.java
diff --git a/tests/testbench/com/vaadin/tests/RandomLayoutStress.java b/uitest/src/com/vaadin/tests/RandomLayoutStress.java
index 0b6b0cf8ba..0b6b0cf8ba 100644
--- a/tests/testbench/com/vaadin/tests/RandomLayoutStress.java
+++ b/uitest/src/com/vaadin/tests/RandomLayoutStress.java
diff --git a/tests/testbench/com/vaadin/tests/ScrollbarStressTest.java b/uitest/src/com/vaadin/tests/ScrollbarStressTest.java
index 7436bfc539..7436bfc539 100644
--- a/tests/testbench/com/vaadin/tests/ScrollbarStressTest.java
+++ b/uitest/src/com/vaadin/tests/ScrollbarStressTest.java
diff --git a/tests/testbench/com/vaadin/tests/StressComponentsInTable.java b/uitest/src/com/vaadin/tests/StressComponentsInTable.java
index 7c4cca2b0b..7c4cca2b0b 100644
--- a/tests/testbench/com/vaadin/tests/StressComponentsInTable.java
+++ b/uitest/src/com/vaadin/tests/StressComponentsInTable.java
diff --git a/tests/testbench/com/vaadin/tests/TableChangingDatasource.java b/uitest/src/com/vaadin/tests/TableChangingDatasource.java
index e9e23be18d..e9e23be18d 100644
--- a/tests/testbench/com/vaadin/tests/TableChangingDatasource.java
+++ b/uitest/src/com/vaadin/tests/TableChangingDatasource.java
diff --git a/tests/testbench/com/vaadin/tests/TableSelectTest.java b/uitest/src/com/vaadin/tests/TableSelectTest.java
index fd4ce5d5c8..fd4ce5d5c8 100644
--- a/tests/testbench/com/vaadin/tests/TableSelectTest.java
+++ b/uitest/src/com/vaadin/tests/TableSelectTest.java
diff --git a/tests/testbench/com/vaadin/tests/TestBench.java b/uitest/src/com/vaadin/tests/TestBench.java
index 67e1180d75..67e1180d75 100644
--- a/tests/testbench/com/vaadin/tests/TestBench.java
+++ b/uitest/src/com/vaadin/tests/TestBench.java
diff --git a/tests/testbench/com/vaadin/tests/TestCaptionWrapper.java b/uitest/src/com/vaadin/tests/TestCaptionWrapper.java
index b2e09a2a6f..b2e09a2a6f 100644
--- a/tests/testbench/com/vaadin/tests/TestCaptionWrapper.java
+++ b/uitest/src/com/vaadin/tests/TestCaptionWrapper.java
diff --git a/tests/testbench/com/vaadin/tests/TestComponentAddAndRecursion.java b/uitest/src/com/vaadin/tests/TestComponentAddAndRecursion.java
index 1a93de387a..1a93de387a 100644
--- a/tests/testbench/com/vaadin/tests/TestComponentAddAndRecursion.java
+++ b/uitest/src/com/vaadin/tests/TestComponentAddAndRecursion.java
diff --git a/tests/testbench/com/vaadin/tests/TestContainerChanges.java b/uitest/src/com/vaadin/tests/TestContainerChanges.java
index 87251c0d65..87251c0d65 100644
--- a/tests/testbench/com/vaadin/tests/TestContainerChanges.java
+++ b/uitest/src/com/vaadin/tests/TestContainerChanges.java
diff --git a/tests/testbench/com/vaadin/tests/TestDateField.java b/uitest/src/com/vaadin/tests/TestDateField.java
index 5854b52b73..5854b52b73 100644
--- a/tests/testbench/com/vaadin/tests/TestDateField.java
+++ b/uitest/src/com/vaadin/tests/TestDateField.java
diff --git a/tests/testbench/com/vaadin/tests/TestForAlignments.java b/uitest/src/com/vaadin/tests/TestForAlignments.java
index 130ec89901..130ec89901 100644
--- a/tests/testbench/com/vaadin/tests/TestForAlignments.java
+++ b/uitest/src/com/vaadin/tests/TestForAlignments.java
diff --git a/tests/testbench/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java b/uitest/src/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java
index c3fa269fba..c3fa269fba 100644
--- a/tests/testbench/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java
+++ b/uitest/src/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java
diff --git a/tests/testbench/com/vaadin/tests/TestForBasicApplicationLayout.java b/uitest/src/com/vaadin/tests/TestForBasicApplicationLayout.java
index 1d28a0a1b4..1d28a0a1b4 100644
--- a/tests/testbench/com/vaadin/tests/TestForBasicApplicationLayout.java
+++ b/uitest/src/com/vaadin/tests/TestForBasicApplicationLayout.java
diff --git a/tests/testbench/com/vaadin/tests/TestForChildComponentRendering.java b/uitest/src/com/vaadin/tests/TestForChildComponentRendering.java
index da6b7ddf3e..da6b7ddf3e 100644
--- a/tests/testbench/com/vaadin/tests/TestForChildComponentRendering.java
+++ b/uitest/src/com/vaadin/tests/TestForChildComponentRendering.java
diff --git a/tests/testbench/com/vaadin/tests/TestForContainerFilterable.java b/uitest/src/com/vaadin/tests/TestForContainerFilterable.java
index eb51ba6a52..eb51ba6a52 100644
--- a/tests/testbench/com/vaadin/tests/TestForContainerFilterable.java
+++ b/uitest/src/com/vaadin/tests/TestForContainerFilterable.java
diff --git a/tests/testbench/com/vaadin/tests/TestForGridLayoutChildComponentRendering.java b/uitest/src/com/vaadin/tests/TestForGridLayoutChildComponentRendering.java
index a94198b1c8..a94198b1c8 100644
--- a/tests/testbench/com/vaadin/tests/TestForGridLayoutChildComponentRendering.java
+++ b/uitest/src/com/vaadin/tests/TestForGridLayoutChildComponentRendering.java
diff --git a/tests/testbench/com/vaadin/tests/TestForMultipleStyleNames.java b/uitest/src/com/vaadin/tests/TestForMultipleStyleNames.java
index 252a4c9c1e..252a4c9c1e 100644
--- a/tests/testbench/com/vaadin/tests/TestForMultipleStyleNames.java
+++ b/uitest/src/com/vaadin/tests/TestForMultipleStyleNames.java
diff --git a/tests/testbench/com/vaadin/tests/TestForNativeWindowing.java b/uitest/src/com/vaadin/tests/TestForNativeWindowing.java
index cef9269b53..cef9269b53 100644
--- a/tests/testbench/com/vaadin/tests/TestForNativeWindowing.java
+++ b/uitest/src/com/vaadin/tests/TestForNativeWindowing.java
diff --git a/tests/testbench/com/vaadin/tests/TestForPreconfiguredComponents.java b/uitest/src/com/vaadin/tests/TestForPreconfiguredComponents.java
index d01879f769..d01879f769 100644
--- a/tests/testbench/com/vaadin/tests/TestForPreconfiguredComponents.java
+++ b/uitest/src/com/vaadin/tests/TestForPreconfiguredComponents.java
diff --git a/tests/testbench/com/vaadin/tests/TestForRichTextEditor.java b/uitest/src/com/vaadin/tests/TestForRichTextEditor.java
index 9d4c679648..9d4c679648 100644
--- a/tests/testbench/com/vaadin/tests/TestForRichTextEditor.java
+++ b/uitest/src/com/vaadin/tests/TestForRichTextEditor.java
diff --git a/tests/testbench/com/vaadin/tests/TestForStyledUpload.java b/uitest/src/com/vaadin/tests/TestForStyledUpload.java
index 14fe7902aa..14fe7902aa 100644
--- a/tests/testbench/com/vaadin/tests/TestForStyledUpload.java
+++ b/uitest/src/com/vaadin/tests/TestForStyledUpload.java
diff --git a/tests/testbench/com/vaadin/tests/TestForTabSheet.java b/uitest/src/com/vaadin/tests/TestForTabSheet.java
index d180bd4be3..d180bd4be3 100644
--- a/tests/testbench/com/vaadin/tests/TestForTabSheet.java
+++ b/uitest/src/com/vaadin/tests/TestForTabSheet.java
diff --git a/tests/testbench/com/vaadin/tests/TestForTablesInitialColumnWidthLogicRendering.java b/uitest/src/com/vaadin/tests/TestForTablesInitialColumnWidthLogicRendering.java
index ac69cbd096..ac69cbd096 100644
--- a/tests/testbench/com/vaadin/tests/TestForTablesInitialColumnWidthLogicRendering.java
+++ b/uitest/src/com/vaadin/tests/TestForTablesInitialColumnWidthLogicRendering.java
diff --git a/tests/testbench/com/vaadin/tests/TestForTrees.java b/uitest/src/com/vaadin/tests/TestForTrees.java
index c0d8ec3845..c0d8ec3845 100644
--- a/tests/testbench/com/vaadin/tests/TestForTrees.java
+++ b/uitest/src/com/vaadin/tests/TestForTrees.java
diff --git a/tests/testbench/com/vaadin/tests/TestForUpload.java b/uitest/src/com/vaadin/tests/TestForUpload.java
index b0697d337d..b0697d337d 100644
--- a/tests/testbench/com/vaadin/tests/TestForUpload.java
+++ b/uitest/src/com/vaadin/tests/TestForUpload.java
diff --git a/tests/testbench/com/vaadin/tests/TestForWindowOpen.java b/uitest/src/com/vaadin/tests/TestForWindowOpen.java
index 253fd3aeea..253fd3aeea 100644
--- a/tests/testbench/com/vaadin/tests/TestForWindowOpen.java
+++ b/uitest/src/com/vaadin/tests/TestForWindowOpen.java
diff --git a/tests/testbench/com/vaadin/tests/TestForWindowing.java b/uitest/src/com/vaadin/tests/TestForWindowing.java
index a59323b97c..a59323b97c 100644
--- a/tests/testbench/com/vaadin/tests/TestForWindowing.java
+++ b/uitest/src/com/vaadin/tests/TestForWindowing.java
diff --git a/tests/testbench/com/vaadin/tests/TestIFrames.java b/uitest/src/com/vaadin/tests/TestIFrames.java
index e0de636f2c..e0de636f2c 100644
--- a/tests/testbench/com/vaadin/tests/TestIFrames.java
+++ b/uitest/src/com/vaadin/tests/TestIFrames.java
diff --git a/tests/testbench/com/vaadin/tests/TestMethodProperty.java b/uitest/src/com/vaadin/tests/TestMethodProperty.java
index 49a3c110fa..49a3c110fa 100644
--- a/tests/testbench/com/vaadin/tests/TestMethodProperty.java
+++ b/uitest/src/com/vaadin/tests/TestMethodProperty.java
diff --git a/tests/testbench/com/vaadin/tests/TestSelectAndDatefieldInDeepLayouts.java b/uitest/src/com/vaadin/tests/TestSelectAndDatefieldInDeepLayouts.java
index a4e8d184f4..a4e8d184f4 100644
--- a/tests/testbench/com/vaadin/tests/TestSelectAndDatefieldInDeepLayouts.java
+++ b/uitest/src/com/vaadin/tests/TestSelectAndDatefieldInDeepLayouts.java
diff --git a/tests/testbench/com/vaadin/tests/TestSetVisibleAndCaching.java b/uitest/src/com/vaadin/tests/TestSetVisibleAndCaching.java
index 6bb8bac200..6bb8bac200 100644
--- a/tests/testbench/com/vaadin/tests/TestSetVisibleAndCaching.java
+++ b/uitest/src/com/vaadin/tests/TestSetVisibleAndCaching.java
diff --git a/tests/testbench/com/vaadin/tests/TestSizeableIncomponents.java b/uitest/src/com/vaadin/tests/TestSizeableIncomponents.java
index 6121647bc1..6121647bc1 100644
--- a/tests/testbench/com/vaadin/tests/TestSizeableIncomponents.java
+++ b/uitest/src/com/vaadin/tests/TestSizeableIncomponents.java
diff --git a/tests/testbench/com/vaadin/tests/TestSplitPanel.java b/uitest/src/com/vaadin/tests/TestSplitPanel.java
index 4b0b47ed74..4b0b47ed74 100644
--- a/tests/testbench/com/vaadin/tests/TestSplitPanel.java
+++ b/uitest/src/com/vaadin/tests/TestSplitPanel.java
diff --git a/tests/testbench/com/vaadin/tests/TreeFilesystem.java b/uitest/src/com/vaadin/tests/TreeFilesystem.java
index f2a0d97b08..f2a0d97b08 100644
--- a/tests/testbench/com/vaadin/tests/TreeFilesystem.java
+++ b/uitest/src/com/vaadin/tests/TreeFilesystem.java
diff --git a/tests/testbench/com/vaadin/tests/TreeFilesystemContainer.java b/uitest/src/com/vaadin/tests/TreeFilesystemContainer.java
index 672c518ea8..672c518ea8 100644
--- a/tests/testbench/com/vaadin/tests/TreeFilesystemContainer.java
+++ b/uitest/src/com/vaadin/tests/TreeFilesystemContainer.java
diff --git a/tests/testbench/com/vaadin/tests/UpgradingSample.java b/uitest/src/com/vaadin/tests/UpgradingSample.java
index 48e2222d7e..48e2222d7e 100644
--- a/tests/testbench/com/vaadin/tests/UpgradingSample.java
+++ b/uitest/src/com/vaadin/tests/UpgradingSample.java
diff --git a/tests/testbench/com/vaadin/tests/UsingCustomNewItemHandlerInSelect.java b/uitest/src/com/vaadin/tests/UsingCustomNewItemHandlerInSelect.java
index b91fd65842..b91fd65842 100644
--- a/tests/testbench/com/vaadin/tests/UsingCustomNewItemHandlerInSelect.java
+++ b/uitest/src/com/vaadin/tests/UsingCustomNewItemHandlerInSelect.java
diff --git a/tests/testbench/com/vaadin/tests/UsingObjectsInSelect.java b/uitest/src/com/vaadin/tests/UsingObjectsInSelect.java
index c5a836b4f1..c5a836b4f1 100644
--- a/tests/testbench/com/vaadin/tests/UsingObjectsInSelect.java
+++ b/uitest/src/com/vaadin/tests/UsingObjectsInSelect.java
diff --git a/tests/testbench/com/vaadin/tests/VerifyBrowserVersion.html b/uitest/src/com/vaadin/tests/VerifyBrowserVersion.html
index 8313eceeab..8313eceeab 100644
--- a/tests/testbench/com/vaadin/tests/VerifyBrowserVersion.html
+++ b/uitest/src/com/vaadin/tests/VerifyBrowserVersion.html
diff --git a/tests/testbench/com/vaadin/tests/VerifyBrowserVersion.java b/uitest/src/com/vaadin/tests/VerifyBrowserVersion.java
index 8a07168ef7..8a07168ef7 100644
--- a/tests/testbench/com/vaadin/tests/VerifyBrowserVersion.java
+++ b/uitest/src/com/vaadin/tests/VerifyBrowserVersion.java
diff --git a/tests/testbench/com/vaadin/tests/appengine/GAESyncTest.java b/uitest/src/com/vaadin/tests/appengine/GAESyncTest.java
index a7d2b03415..a7d2b03415 100644
--- a/tests/testbench/com/vaadin/tests/appengine/GAESyncTest.java
+++ b/uitest/src/com/vaadin/tests/appengine/GAESyncTest.java
diff --git a/tests/testbench/com/vaadin/tests/appengine/img1.png b/uitest/src/com/vaadin/tests/appengine/img1.png
index d249324e0c..d249324e0c 100644
--- a/tests/testbench/com/vaadin/tests/appengine/img1.png
+++ b/uitest/src/com/vaadin/tests/appengine/img1.png
diff --git a/tests/testbench/com/vaadin/tests/application/ApplicationCloseTest.java b/uitest/src/com/vaadin/tests/application/ApplicationCloseTest.java
index 233da9722e..233da9722e 100644
--- a/tests/testbench/com/vaadin/tests/application/ApplicationCloseTest.java
+++ b/uitest/src/com/vaadin/tests/application/ApplicationCloseTest.java
diff --git a/tests/testbench/com/vaadin/tests/application/ErrorInUnloadEvent.html b/uitest/src/com/vaadin/tests/application/ErrorInUnloadEvent.html
index ee200d7f5c..ee200d7f5c 100644
--- a/tests/testbench/com/vaadin/tests/application/ErrorInUnloadEvent.html
+++ b/uitest/src/com/vaadin/tests/application/ErrorInUnloadEvent.html
diff --git a/tests/testbench/com/vaadin/tests/application/ErrorInUnloadEvent.java b/uitest/src/com/vaadin/tests/application/ErrorInUnloadEvent.java
index d7e9155ded..d7e9155ded 100644
--- a/tests/testbench/com/vaadin/tests/application/ErrorInUnloadEvent.java
+++ b/uitest/src/com/vaadin/tests/application/ErrorInUnloadEvent.java
diff --git a/tests/testbench/com/vaadin/tests/application/RefreshStatePreserve.html b/uitest/src/com/vaadin/tests/application/RefreshStatePreserve.html
index d48ab220b5..d48ab220b5 100644
--- a/tests/testbench/com/vaadin/tests/application/RefreshStatePreserve.html
+++ b/uitest/src/com/vaadin/tests/application/RefreshStatePreserve.html
diff --git a/tests/testbench/com/vaadin/tests/application/RefreshStatePreserve.java b/uitest/src/com/vaadin/tests/application/RefreshStatePreserve.java
index 3013659ed7..3013659ed7 100644
--- a/tests/testbench/com/vaadin/tests/application/RefreshStatePreserve.java
+++ b/uitest/src/com/vaadin/tests/application/RefreshStatePreserve.java
diff --git a/tests/testbench/com/vaadin/tests/application/TerminalErrorNotification.html b/uitest/src/com/vaadin/tests/application/TerminalErrorNotification.html
index f20967c8de..f20967c8de 100644
--- a/tests/testbench/com/vaadin/tests/application/TerminalErrorNotification.html
+++ b/uitest/src/com/vaadin/tests/application/TerminalErrorNotification.html
diff --git a/tests/testbench/com/vaadin/tests/application/TerminalErrorNotification.java b/uitest/src/com/vaadin/tests/application/TerminalErrorNotification.java
index 0dcf0a6fa8..0dcf0a6fa8 100644
--- a/tests/testbench/com/vaadin/tests/application/TerminalErrorNotification.java
+++ b/uitest/src/com/vaadin/tests/application/TerminalErrorNotification.java
diff --git a/tests/testbench/com/vaadin/tests/application/ThreadLocalInstances.html b/uitest/src/com/vaadin/tests/application/ThreadLocalInstances.html
index 35657c73fc..35657c73fc 100644
--- a/tests/testbench/com/vaadin/tests/application/ThreadLocalInstances.html
+++ b/uitest/src/com/vaadin/tests/application/ThreadLocalInstances.html
diff --git a/tests/testbench/com/vaadin/tests/application/ThreadLocalInstances.java b/uitest/src/com/vaadin/tests/application/ThreadLocalInstances.java
index 0e7dd1b242..0e7dd1b242 100644
--- a/tests/testbench/com/vaadin/tests/application/ThreadLocalInstances.java
+++ b/uitest/src/com/vaadin/tests/application/ThreadLocalInstances.java
diff --git a/tests/testbench/com/vaadin/tests/application/WebBrowserSizeTest.html b/uitest/src/com/vaadin/tests/application/WebBrowserSizeTest.html
index 3c59c7a953..3c59c7a953 100644
--- a/tests/testbench/com/vaadin/tests/application/WebBrowserSizeTest.html
+++ b/uitest/src/com/vaadin/tests/application/WebBrowserSizeTest.html
diff --git a/tests/testbench/com/vaadin/tests/application/WebBrowserSizeTest.java b/uitest/src/com/vaadin/tests/application/WebBrowserSizeTest.java
index 817acf20b5..817acf20b5 100644
--- a/tests/testbench/com/vaadin/tests/application/WebBrowserSizeTest.java
+++ b/uitest/src/com/vaadin/tests/application/WebBrowserSizeTest.java
diff --git a/tests/testbench/com/vaadin/tests/application/WebBrowserTest.html b/uitest/src/com/vaadin/tests/application/WebBrowserTest.html
index f04dd564bf..f04dd564bf 100644
--- a/tests/testbench/com/vaadin/tests/application/WebBrowserTest.html
+++ b/uitest/src/com/vaadin/tests/application/WebBrowserTest.html
diff --git a/tests/testbench/com/vaadin/tests/application/WebBrowserTest.java b/uitest/src/com/vaadin/tests/application/WebBrowserTest.java
index 004c8f1c91..004c8f1c91 100644
--- a/tests/testbench/com/vaadin/tests/application/WebBrowserTest.java
+++ b/uitest/src/com/vaadin/tests/application/WebBrowserTest.java
diff --git a/tests/testbench/com/vaadin/tests/applicationcontext/ChangeSessionId.html b/uitest/src/com/vaadin/tests/applicationcontext/ChangeSessionId.html
index 6d028f1fea..6d028f1fea 100644
--- a/tests/testbench/com/vaadin/tests/applicationcontext/ChangeSessionId.html
+++ b/uitest/src/com/vaadin/tests/applicationcontext/ChangeSessionId.html
diff --git a/tests/testbench/com/vaadin/tests/applicationcontext/ChangeSessionId.java b/uitest/src/com/vaadin/tests/applicationcontext/ChangeSessionId.java
index 9146cf5dea..9146cf5dea 100644
--- a/tests/testbench/com/vaadin/tests/applicationcontext/ChangeSessionId.java
+++ b/uitest/src/com/vaadin/tests/applicationcontext/ChangeSessionId.java
diff --git a/tests/testbench/com/vaadin/tests/applicationcontext/RemoveTransactionListener.java b/uitest/src/com/vaadin/tests/applicationcontext/RemoveTransactionListener.java
index f1730ed5f5..f1730ed5f5 100644
--- a/tests/testbench/com/vaadin/tests/applicationcontext/RemoveTransactionListener.java
+++ b/uitest/src/com/vaadin/tests/applicationcontext/RemoveTransactionListener.java
diff --git a/tests/testbench/com/vaadin/tests/applicationservlet/NoApplicationClass.html b/uitest/src/com/vaadin/tests/applicationservlet/NoApplicationClass.html
index 70bb8cc8f3..70bb8cc8f3 100644
--- a/tests/testbench/com/vaadin/tests/applicationservlet/NoApplicationClass.html
+++ b/uitest/src/com/vaadin/tests/applicationservlet/NoApplicationClass.html
diff --git a/tests/testbench/com/vaadin/tests/applicationservlet/NoMainWindow.java b/uitest/src/com/vaadin/tests/applicationservlet/NoMainWindow.java
index fc72b86a34..fc72b86a34 100644
--- a/tests/testbench/com/vaadin/tests/applicationservlet/NoMainWindow.java
+++ b/uitest/src/com/vaadin/tests/applicationservlet/NoMainWindow.java
diff --git a/tests/testbench/com/vaadin/tests/browserfeatures/FullHeightScrollbar.html b/uitest/src/com/vaadin/tests/browserfeatures/FullHeightScrollbar.html
index 37fee35746..37fee35746 100644
--- a/tests/testbench/com/vaadin/tests/browserfeatures/FullHeightScrollbar.html
+++ b/uitest/src/com/vaadin/tests/browserfeatures/FullHeightScrollbar.html
diff --git a/tests/testbench/com/vaadin/tests/components/AbstractComponentContainerTest.java b/uitest/src/com/vaadin/tests/components/AbstractComponentContainerTest.java
index be3b7760f2..be3b7760f2 100644
--- a/tests/testbench/com/vaadin/tests/components/AbstractComponentContainerTest.java
+++ b/uitest/src/com/vaadin/tests/components/AbstractComponentContainerTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/AbstractComponentTest.java b/uitest/src/com/vaadin/tests/components/AbstractComponentTest.java
index ece40f5b00..ece40f5b00 100644
--- a/tests/testbench/com/vaadin/tests/components/AbstractComponentTest.java
+++ b/uitest/src/com/vaadin/tests/components/AbstractComponentTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/AbstractComponentTestCase.java b/uitest/src/com/vaadin/tests/components/AbstractComponentTestCase.java
index 81ec4a9da4..81ec4a9da4 100644
--- a/tests/testbench/com/vaadin/tests/components/AbstractComponentTestCase.java
+++ b/uitest/src/com/vaadin/tests/components/AbstractComponentTestCase.java
diff --git a/tests/testbench/com/vaadin/tests/components/AbstractLayoutTest.java b/uitest/src/com/vaadin/tests/components/AbstractLayoutTest.java
index c04be3d724..c04be3d724 100644
--- a/tests/testbench/com/vaadin/tests/components/AbstractLayoutTest.java
+++ b/uitest/src/com/vaadin/tests/components/AbstractLayoutTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/AbstractOrderedLayoutTest.java b/uitest/src/com/vaadin/tests/components/AbstractOrderedLayoutTest.java
index 1d18cba952..1d18cba952 100644
--- a/tests/testbench/com/vaadin/tests/components/AbstractOrderedLayoutTest.java
+++ b/uitest/src/com/vaadin/tests/components/AbstractOrderedLayoutTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/AbstractTestApplication.java b/uitest/src/com/vaadin/tests/components/AbstractTestApplication.java
index 406158e8e1..406158e8e1 100644
--- a/tests/testbench/com/vaadin/tests/components/AbstractTestApplication.java
+++ b/uitest/src/com/vaadin/tests/components/AbstractTestApplication.java
diff --git a/tests/testbench/com/vaadin/tests/components/AbstractTestCase.java b/uitest/src/com/vaadin/tests/components/AbstractTestCase.java
index 4e2ec1d935..4e2ec1d935 100644
--- a/tests/testbench/com/vaadin/tests/components/AbstractTestCase.java
+++ b/uitest/src/com/vaadin/tests/components/AbstractTestCase.java
diff --git a/tests/testbench/com/vaadin/tests/components/AbstractTestUI.java b/uitest/src/com/vaadin/tests/components/AbstractTestUI.java
index ff235c5d9f..ff235c5d9f 100644
--- a/tests/testbench/com/vaadin/tests/components/AbstractTestUI.java
+++ b/uitest/src/com/vaadin/tests/components/AbstractTestUI.java
diff --git a/tests/testbench/com/vaadin/tests/components/AddRemoveSetStyleNamesTest.html b/uitest/src/com/vaadin/tests/components/AddRemoveSetStyleNamesTest.html
index 512140cc6d..512140cc6d 100644
--- a/tests/testbench/com/vaadin/tests/components/AddRemoveSetStyleNamesTest.html
+++ b/uitest/src/com/vaadin/tests/components/AddRemoveSetStyleNamesTest.html
diff --git a/tests/testbench/com/vaadin/tests/components/AddRemoveSetStyleNamesTest.java b/uitest/src/com/vaadin/tests/components/AddRemoveSetStyleNamesTest.java
index 926af72a2f..926af72a2f 100644
--- a/tests/testbench/com/vaadin/tests/components/AddRemoveSetStyleNamesTest.java
+++ b/uitest/src/com/vaadin/tests/components/AddRemoveSetStyleNamesTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/ComponentTestCase.java b/uitest/src/com/vaadin/tests/components/ComponentTestCase.java
index 9bb01cd56f..9bb01cd56f 100644
--- a/tests/testbench/com/vaadin/tests/components/ComponentTestCase.java
+++ b/uitest/src/com/vaadin/tests/components/ComponentTestCase.java
diff --git a/tests/testbench/com/vaadin/tests/components/CustomComponentwithUndefinedSize.java b/uitest/src/com/vaadin/tests/components/CustomComponentwithUndefinedSize.java
index 9fe13c457a..9fe13c457a 100644
--- a/tests/testbench/com/vaadin/tests/components/CustomComponentwithUndefinedSize.java
+++ b/uitest/src/com/vaadin/tests/components/CustomComponentwithUndefinedSize.java
diff --git a/tests/testbench/com/vaadin/tests/components/DisableEnableCascade.html b/uitest/src/com/vaadin/tests/components/DisableEnableCascade.html
index 029da64754..029da64754 100644
--- a/tests/testbench/com/vaadin/tests/components/DisableEnableCascade.html
+++ b/uitest/src/com/vaadin/tests/components/DisableEnableCascade.html
diff --git a/tests/testbench/com/vaadin/tests/components/DisableEnableCascade.java b/uitest/src/com/vaadin/tests/components/DisableEnableCascade.java
index cd284224a0..cd284224a0 100644
--- a/tests/testbench/com/vaadin/tests/components/DisableEnableCascade.java
+++ b/uitest/src/com/vaadin/tests/components/DisableEnableCascade.java
diff --git a/tests/testbench/com/vaadin/tests/components/DisableEnableCascadeStyles.html b/uitest/src/com/vaadin/tests/components/DisableEnableCascadeStyles.html
index ac3a4f0cb0..ac3a4f0cb0 100644
--- a/tests/testbench/com/vaadin/tests/components/DisableEnableCascadeStyles.html
+++ b/uitest/src/com/vaadin/tests/components/DisableEnableCascadeStyles.html
diff --git a/tests/testbench/com/vaadin/tests/components/DisableEnableCascadeStyles.java b/uitest/src/com/vaadin/tests/components/DisableEnableCascadeStyles.java
index 0279a92437..0279a92437 100644
--- a/tests/testbench/com/vaadin/tests/components/DisableEnableCascadeStyles.java
+++ b/uitest/src/com/vaadin/tests/components/DisableEnableCascadeStyles.java
diff --git a/tests/testbench/com/vaadin/tests/components/ErrorMessages.html b/uitest/src/com/vaadin/tests/components/ErrorMessages.html
index 5379ff59e0..5379ff59e0 100644
--- a/tests/testbench/com/vaadin/tests/components/ErrorMessages.html
+++ b/uitest/src/com/vaadin/tests/components/ErrorMessages.html
diff --git a/tests/testbench/com/vaadin/tests/components/ErrorMessages.java b/uitest/src/com/vaadin/tests/components/ErrorMessages.java
index 0e8dcc210b..0e8dcc210b 100644
--- a/tests/testbench/com/vaadin/tests/components/ErrorMessages.java
+++ b/uitest/src/com/vaadin/tests/components/ErrorMessages.java
diff --git a/tests/testbench/com/vaadin/tests/components/FocusAndBlurListeners.java b/uitest/src/com/vaadin/tests/components/FocusAndBlurListeners.java
index 7987c800f9..7987c800f9 100644
--- a/tests/testbench/com/vaadin/tests/components/FocusAndBlurListeners.java
+++ b/uitest/src/com/vaadin/tests/components/FocusAndBlurListeners.java
diff --git a/tests/testbench/com/vaadin/tests/components/FocusFromShortcutAction.java b/uitest/src/com/vaadin/tests/components/FocusFromShortcutAction.java
index cffc8ca27b..cffc8ca27b 100644
--- a/tests/testbench/com/vaadin/tests/components/FocusFromShortcutAction.java
+++ b/uitest/src/com/vaadin/tests/components/FocusFromShortcutAction.java
diff --git a/tests/testbench/com/vaadin/tests/components/HierarchicalContainerSorting.java b/uitest/src/com/vaadin/tests/components/HierarchicalContainerSorting.java
index d0638be54c..d0638be54c 100644
--- a/tests/testbench/com/vaadin/tests/components/HierarchicalContainerSorting.java
+++ b/uitest/src/com/vaadin/tests/components/HierarchicalContainerSorting.java
diff --git a/tests/testbench/com/vaadin/tests/components/LayoutAttachListenerInfo.html b/uitest/src/com/vaadin/tests/components/LayoutAttachListenerInfo.html
index 10dd21d240..10dd21d240 100644
--- a/tests/testbench/com/vaadin/tests/components/LayoutAttachListenerInfo.html
+++ b/uitest/src/com/vaadin/tests/components/LayoutAttachListenerInfo.html
diff --git a/tests/testbench/com/vaadin/tests/components/LayoutAttachListenerInfo.java b/uitest/src/com/vaadin/tests/components/LayoutAttachListenerInfo.java
index 6e54c0d9f4..6e54c0d9f4 100644
--- a/tests/testbench/com/vaadin/tests/components/LayoutAttachListenerInfo.java
+++ b/uitest/src/com/vaadin/tests/components/LayoutAttachListenerInfo.java
diff --git a/tests/testbench/com/vaadin/tests/components/LongTooltip.html b/uitest/src/com/vaadin/tests/components/LongTooltip.html
index a5055741f1..a5055741f1 100644
--- a/tests/testbench/com/vaadin/tests/components/LongTooltip.html
+++ b/uitest/src/com/vaadin/tests/components/LongTooltip.html
diff --git a/tests/testbench/com/vaadin/tests/components/LongTooltip.java b/uitest/src/com/vaadin/tests/components/LongTooltip.java
index acb498bcee..acb498bcee 100644
--- a/tests/testbench/com/vaadin/tests/components/LongTooltip.java
+++ b/uitest/src/com/vaadin/tests/components/LongTooltip.java
diff --git a/tests/testbench/com/vaadin/tests/components/MultipleDebugIds.java b/uitest/src/com/vaadin/tests/components/MultipleDebugIds.java
index 4633b4f1cd..4633b4f1cd 100644
--- a/tests/testbench/com/vaadin/tests/components/MultipleDebugIds.java
+++ b/uitest/src/com/vaadin/tests/components/MultipleDebugIds.java
diff --git a/tests/testbench/com/vaadin/tests/components/TestBase.java b/uitest/src/com/vaadin/tests/components/TestBase.java
index 19c6826977..19c6826977 100644
--- a/tests/testbench/com/vaadin/tests/components/TestBase.java
+++ b/uitest/src/com/vaadin/tests/components/TestBase.java
diff --git a/tests/testbench/com/vaadin/tests/components/TouchScrollables.java b/uitest/src/com/vaadin/tests/components/TouchScrollables.java
index 6c340804af..6c340804af 100644
--- a/tests/testbench/com/vaadin/tests/components/TouchScrollables.java
+++ b/uitest/src/com/vaadin/tests/components/TouchScrollables.java
diff --git a/tests/testbench/com/vaadin/tests/components/UnknownComponentConnectorTest.html b/uitest/src/com/vaadin/tests/components/UnknownComponentConnectorTest.html
index 20f0e8e71e..20f0e8e71e 100644
--- a/tests/testbench/com/vaadin/tests/components/UnknownComponentConnectorTest.html
+++ b/uitest/src/com/vaadin/tests/components/UnknownComponentConnectorTest.html
diff --git a/tests/testbench/com/vaadin/tests/components/UnknownComponentConnectorTest.java b/uitest/src/com/vaadin/tests/components/UnknownComponentConnectorTest.java
index 197408a533..197408a533 100644
--- a/tests/testbench/com/vaadin/tests/components/UnknownComponentConnectorTest.java
+++ b/uitest/src/com/vaadin/tests/components/UnknownComponentConnectorTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutClipping.html b/uitest/src/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutClipping.html
index ff5c890abf..ff5c890abf 100644
--- a/tests/testbench/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutClipping.html
+++ b/uitest/src/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutClipping.html
diff --git a/tests/testbench/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutClipping.java b/uitest/src/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutClipping.java
index f6bff579a3..f6bff579a3 100644
--- a/tests/testbench/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutClipping.java
+++ b/uitest/src/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutClipping.java
diff --git a/tests/testbench/com/vaadin/tests/components/absolutelayout/MoveComponentFromAbsoluteLayoutToInnerLayout.html b/uitest/src/com/vaadin/tests/components/absolutelayout/MoveComponentFromAbsoluteLayoutToInnerLayout.html
index bb74775912..bb74775912 100644
--- a/tests/testbench/com/vaadin/tests/components/absolutelayout/MoveComponentFromAbsoluteLayoutToInnerLayout.html
+++ b/uitest/src/com/vaadin/tests/components/absolutelayout/MoveComponentFromAbsoluteLayoutToInnerLayout.html
diff --git a/tests/testbench/com/vaadin/tests/components/absolutelayout/MoveComponentsFromAbsoluteLayoutToInnerLayout.java b/uitest/src/com/vaadin/tests/components/absolutelayout/MoveComponentsFromAbsoluteLayoutToInnerLayout.java
index c14cda58f1..c14cda58f1 100644
--- a/tests/testbench/com/vaadin/tests/components/absolutelayout/MoveComponentsFromAbsoluteLayoutToInnerLayout.java
+++ b/uitest/src/com/vaadin/tests/components/absolutelayout/MoveComponentsFromAbsoluteLayoutToInnerLayout.java
diff --git a/tests/testbench/com/vaadin/tests/components/abstractcomponent/AllComponentTooltipTest.java b/uitest/src/com/vaadin/tests/components/abstractcomponent/AllComponentTooltipTest.java
index d318afc34f..d318afc34f 100644
--- a/tests/testbench/com/vaadin/tests/components/abstractcomponent/AllComponentTooltipTest.java
+++ b/uitest/src/com/vaadin/tests/components/abstractcomponent/AllComponentTooltipTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/abstractcomponent/EnableState.html b/uitest/src/com/vaadin/tests/components/abstractcomponent/EnableState.html
index dacd5c5009..dacd5c5009 100644
--- a/tests/testbench/com/vaadin/tests/components/abstractcomponent/EnableState.html
+++ b/uitest/src/com/vaadin/tests/components/abstractcomponent/EnableState.html
diff --git a/tests/testbench/com/vaadin/tests/components/abstractcomponent/EnableState.java b/uitest/src/com/vaadin/tests/components/abstractcomponent/EnableState.java
index e93529fad4..e93529fad4 100644
--- a/tests/testbench/com/vaadin/tests/components/abstractcomponent/EnableState.java
+++ b/uitest/src/com/vaadin/tests/components/abstractcomponent/EnableState.java
diff --git a/tests/testbench/com/vaadin/tests/components/abstractcomponent/TooltipTests.html b/uitest/src/com/vaadin/tests/components/abstractcomponent/TooltipTests.html
index 3cea965690..3cea965690 100644
--- a/tests/testbench/com/vaadin/tests/components/abstractcomponent/TooltipTests.html
+++ b/uitest/src/com/vaadin/tests/components/abstractcomponent/TooltipTests.html
diff --git a/tests/testbench/com/vaadin/tests/components/abstractcomponent/TooltipTests.java b/uitest/src/com/vaadin/tests/components/abstractcomponent/TooltipTests.java
index 01c7ab83ae..01c7ab83ae 100644
--- a/tests/testbench/com/vaadin/tests/components/abstractcomponent/TooltipTests.java
+++ b/uitest/src/com/vaadin/tests/components/abstractcomponent/TooltipTests.java
diff --git a/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractComponentDataBindingTest.java b/uitest/src/com/vaadin/tests/components/abstractfield/AbstractComponentDataBindingTest.java
index 9b29ae1bab..9b29ae1bab 100644
--- a/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractComponentDataBindingTest.java
+++ b/uitest/src/com/vaadin/tests/components/abstractfield/AbstractComponentDataBindingTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.html b/uitest/src/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.html
index 6a47032545..6a47032545 100644
--- a/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.html
+++ b/uitest/src/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.html
diff --git a/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.java b/uitest/src/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.java
index 0aaa7c5f13..0aaa7c5f13 100644
--- a/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.java
+++ b/uitest/src/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.java
diff --git a/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.html b/uitest/src/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.html
index f99bdea946..f99bdea946 100644
--- a/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.html
+++ b/uitest/src/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.html
diff --git a/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.java b/uitest/src/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.java
index f1b96d24fd..f1b96d24fd 100644
--- a/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.java
+++ b/uitest/src/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.java
diff --git a/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractFieldTest.java b/uitest/src/com/vaadin/tests/components/abstractfield/AbstractFieldTest.java
index efba67199d..efba67199d 100644
--- a/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractFieldTest.java
+++ b/uitest/src/com/vaadin/tests/components/abstractfield/AbstractFieldTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractTextFieldTest.java b/uitest/src/com/vaadin/tests/components/abstractfield/AbstractTextFieldTest.java
index 1f407c710f..1f407c710f 100644
--- a/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractTextFieldTest.java
+++ b/uitest/src/com/vaadin/tests/components/abstractfield/AbstractTextFieldTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/abstractfield/DateFieldBackedByString.java b/uitest/src/com/vaadin/tests/components/abstractfield/DateFieldBackedByString.java
index d4b2f89522..d4b2f89522 100644
--- a/tests/testbench/com/vaadin/tests/components/abstractfield/DateFieldBackedByString.java
+++ b/uitest/src/com/vaadin/tests/components/abstractfield/DateFieldBackedByString.java
diff --git a/tests/testbench/com/vaadin/tests/components/abstractfield/DateFieldBasedOnLong.java b/uitest/src/com/vaadin/tests/components/abstractfield/DateFieldBasedOnLong.java
index aa8c7ff778..aa8c7ff778 100644
--- a/tests/testbench/com/vaadin/tests/components/abstractfield/DateFieldBasedOnLong.java
+++ b/uitest/src/com/vaadin/tests/components/abstractfield/DateFieldBasedOnLong.java
diff --git a/tests/testbench/com/vaadin/tests/components/abstractfield/DoubleInTextField.java b/uitest/src/com/vaadin/tests/components/abstractfield/DoubleInTextField.java
index 4fd81081ea..4fd81081ea 100644
--- a/tests/testbench/com/vaadin/tests/components/abstractfield/DoubleInTextField.java
+++ b/uitest/src/com/vaadin/tests/components/abstractfield/DoubleInTextField.java
diff --git a/tests/testbench/com/vaadin/tests/components/abstractfield/IntegerDoubleFieldsWithDataSource.java b/uitest/src/com/vaadin/tests/components/abstractfield/IntegerDoubleFieldsWithDataSource.java
index 01fcb02b77..01fcb02b77 100644
--- a/tests/testbench/com/vaadin/tests/components/abstractfield/IntegerDoubleFieldsWithDataSource.java
+++ b/uitest/src/com/vaadin/tests/components/abstractfield/IntegerDoubleFieldsWithDataSource.java
diff --git a/tests/testbench/com/vaadin/tests/components/abstractfield/IntegerFieldWithoutDataSource.java b/uitest/src/com/vaadin/tests/components/abstractfield/IntegerFieldWithoutDataSource.java
index 929247fc80..929247fc80 100644
--- a/tests/testbench/com/vaadin/tests/components/abstractfield/IntegerFieldWithoutDataSource.java
+++ b/uitest/src/com/vaadin/tests/components/abstractfield/IntegerFieldWithoutDataSource.java
diff --git a/tests/testbench/com/vaadin/tests/components/abstractfield/ShortcutAddAndRemove.html b/uitest/src/com/vaadin/tests/components/abstractfield/ShortcutAddAndRemove.html
index a7b8e24ae7..a7b8e24ae7 100644
--- a/tests/testbench/com/vaadin/tests/components/abstractfield/ShortcutAddAndRemove.html
+++ b/uitest/src/com/vaadin/tests/components/abstractfield/ShortcutAddAndRemove.html
diff --git a/tests/testbench/com/vaadin/tests/components/abstractfield/ShortcutAddAndRemove.java b/uitest/src/com/vaadin/tests/components/abstractfield/ShortcutAddAndRemove.java
index 309e297374..309e297374 100644
--- a/tests/testbench/com/vaadin/tests/components/abstractfield/ShortcutAddAndRemove.java
+++ b/uitest/src/com/vaadin/tests/components/abstractfield/ShortcutAddAndRemove.java
diff --git a/tests/testbench/com/vaadin/tests/components/abstractfield/TextFieldConversions.java b/uitest/src/com/vaadin/tests/components/abstractfield/TextFieldConversions.java
index 3a8275bd51..3a8275bd51 100644
--- a/tests/testbench/com/vaadin/tests/components/abstractfield/TextFieldConversions.java
+++ b/uitest/src/com/vaadin/tests/components/abstractfield/TextFieldConversions.java
diff --git a/tests/testbench/com/vaadin/tests/components/abstractfield/Vaadin6ImplicitDoubleConverter.java b/uitest/src/com/vaadin/tests/components/abstractfield/Vaadin6ImplicitDoubleConverter.java
index a9aa4d2a43..a9aa4d2a43 100644
--- a/tests/testbench/com/vaadin/tests/components/abstractfield/Vaadin6ImplicitDoubleConverter.java
+++ b/uitest/src/com/vaadin/tests/components/abstractfield/Vaadin6ImplicitDoubleConverter.java
diff --git a/tests/testbench/com/vaadin/tests/components/accordion/AccordionInactiveTabSize.html b/uitest/src/com/vaadin/tests/components/accordion/AccordionInactiveTabSize.html
index e4bb6c36be..e4bb6c36be 100644
--- a/tests/testbench/com/vaadin/tests/components/accordion/AccordionInactiveTabSize.html
+++ b/uitest/src/com/vaadin/tests/components/accordion/AccordionInactiveTabSize.html
diff --git a/tests/testbench/com/vaadin/tests/components/accordion/AccordionInactiveTabSize.java b/uitest/src/com/vaadin/tests/components/accordion/AccordionInactiveTabSize.java
index 387ec7857f..387ec7857f 100644
--- a/tests/testbench/com/vaadin/tests/components/accordion/AccordionInactiveTabSize.java
+++ b/uitest/src/com/vaadin/tests/components/accordion/AccordionInactiveTabSize.java
diff --git a/tests/testbench/com/vaadin/tests/components/accordion/AccordionTest.java b/uitest/src/com/vaadin/tests/components/accordion/AccordionTest.java
index 5c47610ae5..5c47610ae5 100644
--- a/tests/testbench/com/vaadin/tests/components/accordion/AccordionTest.java
+++ b/uitest/src/com/vaadin/tests/components/accordion/AccordionTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/accordion/RemoveTabs.html b/uitest/src/com/vaadin/tests/components/accordion/RemoveTabs.html
index ec24ade8ce..ec24ade8ce 100644
--- a/tests/testbench/com/vaadin/tests/components/accordion/RemoveTabs.html
+++ b/uitest/src/com/vaadin/tests/components/accordion/RemoveTabs.html
diff --git a/tests/testbench/com/vaadin/tests/components/accordion/RemoveTabs.java b/uitest/src/com/vaadin/tests/components/accordion/RemoveTabs.java
index d24def22dd..d24def22dd 100644
--- a/tests/testbench/com/vaadin/tests/components/accordion/RemoveTabs.java
+++ b/uitest/src/com/vaadin/tests/components/accordion/RemoveTabs.java
diff --git a/tests/testbench/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerGenerator.java b/uitest/src/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerGenerator.java
index 254779f872..254779f872 100644
--- a/tests/testbench/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerGenerator.java
+++ b/uitest/src/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerGenerator.java
diff --git a/tests/testbench/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerNullValues.html b/uitest/src/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerNullValues.html
index e40be7dc15..e40be7dc15 100644
--- a/tests/testbench/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerNullValues.html
+++ b/uitest/src/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerNullValues.html
diff --git a/tests/testbench/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerNullValues.java b/uitest/src/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerNullValues.java
index 605ab676b6..605ab676b6 100644
--- a/tests/testbench/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerNullValues.java
+++ b/uitest/src/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerNullValues.java
diff --git a/tests/testbench/com/vaadin/tests/components/beanitemcontainer/TestBeanItemContainerUsage.html b/uitest/src/com/vaadin/tests/components/beanitemcontainer/TestBeanItemContainerUsage.html
index a37e8ea662..a37e8ea662 100644
--- a/tests/testbench/com/vaadin/tests/components/beanitemcontainer/TestBeanItemContainerUsage.html
+++ b/uitest/src/com/vaadin/tests/components/beanitemcontainer/TestBeanItemContainerUsage.html
diff --git a/tests/testbench/com/vaadin/tests/components/beanitemcontainer/TestBeanItemContainerUsage.java b/uitest/src/com/vaadin/tests/components/beanitemcontainer/TestBeanItemContainerUsage.java
index 20becea974..20becea974 100644
--- a/tests/testbench/com/vaadin/tests/components/beanitemcontainer/TestBeanItemContainerUsage.java
+++ b/uitest/src/com/vaadin/tests/components/beanitemcontainer/TestBeanItemContainerUsage.java
diff --git a/tests/testbench/com/vaadin/tests/components/button/ButtonDisableOnClick.html b/uitest/src/com/vaadin/tests/components/button/ButtonDisableOnClick.html
index d39f72ef1f..d39f72ef1f 100644
--- a/tests/testbench/com/vaadin/tests/components/button/ButtonDisableOnClick.html
+++ b/uitest/src/com/vaadin/tests/components/button/ButtonDisableOnClick.html
diff --git a/tests/testbench/com/vaadin/tests/components/button/ButtonEnterWithWindowShortcut.html b/uitest/src/com/vaadin/tests/components/button/ButtonEnterWithWindowShortcut.html
index 5ec33f09fa..5ec33f09fa 100644
--- a/tests/testbench/com/vaadin/tests/components/button/ButtonEnterWithWindowShortcut.html
+++ b/uitest/src/com/vaadin/tests/components/button/ButtonEnterWithWindowShortcut.html
diff --git a/tests/testbench/com/vaadin/tests/components/button/ButtonEnterWithWindowShortcut.java b/uitest/src/com/vaadin/tests/components/button/ButtonEnterWithWindowShortcut.java
index 0d4981a441..0d4981a441 100644
--- a/tests/testbench/com/vaadin/tests/components/button/ButtonEnterWithWindowShortcut.java
+++ b/uitest/src/com/vaadin/tests/components/button/ButtonEnterWithWindowShortcut.java
diff --git a/tests/testbench/com/vaadin/tests/components/button/ButtonErrorMessage.java b/uitest/src/com/vaadin/tests/components/button/ButtonErrorMessage.java
index b27f948669..b27f948669 100644
--- a/tests/testbench/com/vaadin/tests/components/button/ButtonErrorMessage.java
+++ b/uitest/src/com/vaadin/tests/components/button/ButtonErrorMessage.java
diff --git a/tests/testbench/com/vaadin/tests/components/button/ButtonHtml.html b/uitest/src/com/vaadin/tests/components/button/ButtonHtml.html
index 2d58d0e2e1..2d58d0e2e1 100644
--- a/tests/testbench/com/vaadin/tests/components/button/ButtonHtml.html
+++ b/uitest/src/com/vaadin/tests/components/button/ButtonHtml.html
diff --git a/tests/testbench/com/vaadin/tests/components/button/ButtonHtml.java b/uitest/src/com/vaadin/tests/components/button/ButtonHtml.java
index 5cdc34e8e8..5cdc34e8e8 100644
--- a/tests/testbench/com/vaadin/tests/components/button/ButtonHtml.java
+++ b/uitest/src/com/vaadin/tests/components/button/ButtonHtml.java
diff --git a/tests/testbench/com/vaadin/tests/components/button/ButtonMouseDetails.java b/uitest/src/com/vaadin/tests/components/button/ButtonMouseDetails.java
index 1b6a81551a..1b6a81551a 100644
--- a/tests/testbench/com/vaadin/tests/components/button/ButtonMouseDetails.java
+++ b/uitest/src/com/vaadin/tests/components/button/ButtonMouseDetails.java
diff --git a/tests/testbench/com/vaadin/tests/components/button/ButtonTabIndex.java b/uitest/src/com/vaadin/tests/components/button/ButtonTabIndex.java
index e1c8b2faea..e1c8b2faea 100644
--- a/tests/testbench/com/vaadin/tests/components/button/ButtonTabIndex.java
+++ b/uitest/src/com/vaadin/tests/components/button/ButtonTabIndex.java
diff --git a/tests/testbench/com/vaadin/tests/components/button/ButtonTooltips.html b/uitest/src/com/vaadin/tests/components/button/ButtonTooltips.html
index 13fdf52c76..13fdf52c76 100644
--- a/tests/testbench/com/vaadin/tests/components/button/ButtonTooltips.html
+++ b/uitest/src/com/vaadin/tests/components/button/ButtonTooltips.html
diff --git a/tests/testbench/com/vaadin/tests/components/button/ButtonTooltips.java b/uitest/src/com/vaadin/tests/components/button/ButtonTooltips.java
index fa639918aa..fa639918aa 100644
--- a/tests/testbench/com/vaadin/tests/components/button/ButtonTooltips.java
+++ b/uitest/src/com/vaadin/tests/components/button/ButtonTooltips.java
diff --git a/tests/testbench/com/vaadin/tests/components/button/ButtonUndefinedWidth.html b/uitest/src/com/vaadin/tests/components/button/ButtonUndefinedWidth.html
index 0aaa01f05b..0aaa01f05b 100644
--- a/tests/testbench/com/vaadin/tests/components/button/ButtonUndefinedWidth.html
+++ b/uitest/src/com/vaadin/tests/components/button/ButtonUndefinedWidth.html
diff --git a/tests/testbench/com/vaadin/tests/components/button/ButtonUndefinedWidth.java b/uitest/src/com/vaadin/tests/components/button/ButtonUndefinedWidth.java
index 89b03df92a..89b03df92a 100644
--- a/tests/testbench/com/vaadin/tests/components/button/ButtonUndefinedWidth.java
+++ b/uitest/src/com/vaadin/tests/components/button/ButtonUndefinedWidth.java
diff --git a/tests/testbench/com/vaadin/tests/components/button/Buttons-chameleon.html b/uitest/src/com/vaadin/tests/components/button/Buttons-chameleon.html
index 4830c79bcf..4830c79bcf 100644
--- a/tests/testbench/com/vaadin/tests/components/button/Buttons-chameleon.html
+++ b/uitest/src/com/vaadin/tests/components/button/Buttons-chameleon.html
diff --git a/tests/testbench/com/vaadin/tests/components/button/Buttons-reindeer.html b/uitest/src/com/vaadin/tests/components/button/Buttons-reindeer.html
index 43e554bec5..43e554bec5 100644
--- a/tests/testbench/com/vaadin/tests/components/button/Buttons-reindeer.html
+++ b/uitest/src/com/vaadin/tests/components/button/Buttons-reindeer.html
diff --git a/tests/testbench/com/vaadin/tests/components/button/Buttons-runo.html b/uitest/src/com/vaadin/tests/components/button/Buttons-runo.html
index 27779f170b..27779f170b 100644
--- a/tests/testbench/com/vaadin/tests/components/button/Buttons-runo.html
+++ b/uitest/src/com/vaadin/tests/components/button/Buttons-runo.html
diff --git a/tests/testbench/com/vaadin/tests/components/button/Buttons.java b/uitest/src/com/vaadin/tests/components/button/Buttons.java
index 573c95c2b8..573c95c2b8 100644
--- a/tests/testbench/com/vaadin/tests/components/button/Buttons.java
+++ b/uitest/src/com/vaadin/tests/components/button/Buttons.java
diff --git a/tests/testbench/com/vaadin/tests/components/button/Buttons2.java b/uitest/src/com/vaadin/tests/components/button/Buttons2.java
index 7526e7dbc3..7526e7dbc3 100644
--- a/tests/testbench/com/vaadin/tests/components/button/Buttons2.java
+++ b/uitest/src/com/vaadin/tests/components/button/Buttons2.java
diff --git a/tests/testbench/com/vaadin/tests/components/button/ButtonsAndIcons-chameleon.html b/uitest/src/com/vaadin/tests/components/button/ButtonsAndIcons-chameleon.html
index 5425ebb716..5425ebb716 100644
--- a/tests/testbench/com/vaadin/tests/components/button/ButtonsAndIcons-chameleon.html
+++ b/uitest/src/com/vaadin/tests/components/button/ButtonsAndIcons-chameleon.html
diff --git a/tests/testbench/com/vaadin/tests/components/button/ButtonsAndIcons-reindeer.html b/uitest/src/com/vaadin/tests/components/button/ButtonsAndIcons-reindeer.html
index 6bee11d561..6bee11d561 100644
--- a/tests/testbench/com/vaadin/tests/components/button/ButtonsAndIcons-reindeer.html
+++ b/uitest/src/com/vaadin/tests/components/button/ButtonsAndIcons-reindeer.html
diff --git a/tests/testbench/com/vaadin/tests/components/button/ButtonsAndIcons-runo.html b/uitest/src/com/vaadin/tests/components/button/ButtonsAndIcons-runo.html
index 8084a58536..8084a58536 100644
--- a/tests/testbench/com/vaadin/tests/components/button/ButtonsAndIcons-runo.html
+++ b/uitest/src/com/vaadin/tests/components/button/ButtonsAndIcons-runo.html
diff --git a/tests/testbench/com/vaadin/tests/components/button/ButtonsAndIcons.java b/uitest/src/com/vaadin/tests/components/button/ButtonsAndIcons.java
index 4ab18e994a..4ab18e994a 100644
--- a/tests/testbench/com/vaadin/tests/components/button/ButtonsAndIcons.java
+++ b/uitest/src/com/vaadin/tests/components/button/ButtonsAndIcons.java
diff --git a/tests/testbench/com/vaadin/tests/components/button/ButtonsInHorizontalLayout.html b/uitest/src/com/vaadin/tests/components/button/ButtonsInHorizontalLayout.html
index cb3b5e66ee..cb3b5e66ee 100644
--- a/tests/testbench/com/vaadin/tests/components/button/ButtonsInHorizontalLayout.html
+++ b/uitest/src/com/vaadin/tests/components/button/ButtonsInHorizontalLayout.html
diff --git a/tests/testbench/com/vaadin/tests/components/button/ButtonsInHorizontalLayout.java b/uitest/src/com/vaadin/tests/components/button/ButtonsInHorizontalLayout.java
index 3a0afdce50..3a0afdce50 100644
--- a/tests/testbench/com/vaadin/tests/components/button/ButtonsInHorizontalLayout.java
+++ b/uitest/src/com/vaadin/tests/components/button/ButtonsInHorizontalLayout.java
diff --git a/tests/testbench/com/vaadin/tests/components/button/DisabledButtons.html b/uitest/src/com/vaadin/tests/components/button/DisabledButtons.html
index 65584fd4d0..65584fd4d0 100644
--- a/tests/testbench/com/vaadin/tests/components/button/DisabledButtons.html
+++ b/uitest/src/com/vaadin/tests/components/button/DisabledButtons.html
diff --git a/tests/testbench/com/vaadin/tests/components/button/DisabledButtons.java b/uitest/src/com/vaadin/tests/components/button/DisabledButtons.java
index 73dbd95829..73dbd95829 100644
--- a/tests/testbench/com/vaadin/tests/components/button/DisabledButtons.java
+++ b/uitest/src/com/vaadin/tests/components/button/DisabledButtons.java
diff --git a/tests/testbench/com/vaadin/tests/components/button/ShortCutListenerModification.java b/uitest/src/com/vaadin/tests/components/button/ShortCutListenerModification.java
index d0321100dd..d0321100dd 100644
--- a/tests/testbench/com/vaadin/tests/components/button/ShortCutListenerModification.java
+++ b/uitest/src/com/vaadin/tests/components/button/ShortCutListenerModification.java
diff --git a/tests/testbench/com/vaadin/tests/components/button/TooltipForDisabledButton.java b/uitest/src/com/vaadin/tests/components/button/TooltipForDisabledButton.java
index c1f1846415..c1f1846415 100644
--- a/tests/testbench/com/vaadin/tests/components/button/TooltipForDisabledButton.java
+++ b/uitest/src/com/vaadin/tests/components/button/TooltipForDisabledButton.java
diff --git a/tests/testbench/com/vaadin/tests/components/caption/EmptyCaptions.html b/uitest/src/com/vaadin/tests/components/caption/EmptyCaptions.html
index f1ede9a04b..f1ede9a04b 100644
--- a/tests/testbench/com/vaadin/tests/components/caption/EmptyCaptions.html
+++ b/uitest/src/com/vaadin/tests/components/caption/EmptyCaptions.html
diff --git a/tests/testbench/com/vaadin/tests/components/caption/EmptyCaptions.java b/uitest/src/com/vaadin/tests/components/caption/EmptyCaptions.java
index 05b8333e7d..05b8333e7d 100644
--- a/tests/testbench/com/vaadin/tests/components/caption/EmptyCaptions.java
+++ b/uitest/src/com/vaadin/tests/components/caption/EmptyCaptions.java
diff --git a/tests/testbench/com/vaadin/tests/components/caption/IconsInCaption.java b/uitest/src/com/vaadin/tests/components/caption/IconsInCaption.java
index 46539b42d7..46539b42d7 100644
--- a/tests/testbench/com/vaadin/tests/components/caption/IconsInCaption.java
+++ b/uitest/src/com/vaadin/tests/components/caption/IconsInCaption.java
diff --git a/tests/testbench/com/vaadin/tests/components/caption/LargeCaptionIcon.html b/uitest/src/com/vaadin/tests/components/caption/LargeCaptionIcon.html
index 7c94821e7f..7c94821e7f 100644
--- a/tests/testbench/com/vaadin/tests/components/caption/LargeCaptionIcon.html
+++ b/uitest/src/com/vaadin/tests/components/caption/LargeCaptionIcon.html
diff --git a/tests/testbench/com/vaadin/tests/components/caption/LargeCaptionIcon.java b/uitest/src/com/vaadin/tests/components/caption/LargeCaptionIcon.java
index d09b5c02ac..d09b5c02ac 100644
--- a/tests/testbench/com/vaadin/tests/components/caption/LargeCaptionIcon.java
+++ b/uitest/src/com/vaadin/tests/components/caption/LargeCaptionIcon.java
diff --git a/tests/testbench/com/vaadin/tests/components/checkbox/CheckBoxDisabledReadOnlyValueChange.html b/uitest/src/com/vaadin/tests/components/checkbox/CheckBoxDisabledReadOnlyValueChange.html
index ddcdc68691..ddcdc68691 100644
--- a/tests/testbench/com/vaadin/tests/components/checkbox/CheckBoxDisabledReadOnlyValueChange.html
+++ b/uitest/src/com/vaadin/tests/components/checkbox/CheckBoxDisabledReadOnlyValueChange.html
diff --git a/tests/testbench/com/vaadin/tests/components/checkbox/CheckBoxNullValue.html b/uitest/src/com/vaadin/tests/components/checkbox/CheckBoxNullValue.html
index 9717ccec78..9717ccec78 100644
--- a/tests/testbench/com/vaadin/tests/components/checkbox/CheckBoxNullValue.html
+++ b/uitest/src/com/vaadin/tests/components/checkbox/CheckBoxNullValue.html
diff --git a/tests/testbench/com/vaadin/tests/components/checkbox/CheckBoxNullValue.java b/uitest/src/com/vaadin/tests/components/checkbox/CheckBoxNullValue.java
index 22e260b442..22e260b442 100644
--- a/tests/testbench/com/vaadin/tests/components/checkbox/CheckBoxNullValue.java
+++ b/uitest/src/com/vaadin/tests/components/checkbox/CheckBoxNullValue.java
diff --git a/tests/testbench/com/vaadin/tests/components/checkbox/CheckBoxes.html b/uitest/src/com/vaadin/tests/components/checkbox/CheckBoxes.html
index 601be4e1cb..601be4e1cb 100644
--- a/tests/testbench/com/vaadin/tests/components/checkbox/CheckBoxes.html
+++ b/uitest/src/com/vaadin/tests/components/checkbox/CheckBoxes.html
diff --git a/tests/testbench/com/vaadin/tests/components/checkbox/CheckBoxes.java b/uitest/src/com/vaadin/tests/components/checkbox/CheckBoxes.java
index 24f53889b3..24f53889b3 100644
--- a/tests/testbench/com/vaadin/tests/components/checkbox/CheckBoxes.java
+++ b/uitest/src/com/vaadin/tests/components/checkbox/CheckBoxes.java
diff --git a/tests/testbench/com/vaadin/tests/components/checkbox/CheckBoxes2.java b/uitest/src/com/vaadin/tests/components/checkbox/CheckBoxes2.java
index 6734c752de..6734c752de 100644
--- a/tests/testbench/com/vaadin/tests/components/checkbox/CheckBoxes2.java
+++ b/uitest/src/com/vaadin/tests/components/checkbox/CheckBoxes2.java
diff --git a/tests/testbench/com/vaadin/tests/components/checkbox/CheckboxCaptionWrapping.html b/uitest/src/com/vaadin/tests/components/checkbox/CheckboxCaptionWrapping.html
index 26ecc95721..26ecc95721 100644
--- a/tests/testbench/com/vaadin/tests/components/checkbox/CheckboxCaptionWrapping.html
+++ b/uitest/src/com/vaadin/tests/components/checkbox/CheckboxCaptionWrapping.html
diff --git a/tests/testbench/com/vaadin/tests/components/checkbox/CheckboxCaptionWrapping.java b/uitest/src/com/vaadin/tests/components/checkbox/CheckboxCaptionWrapping.java
index 463d53a4a8..463d53a4a8 100644
--- a/tests/testbench/com/vaadin/tests/components/checkbox/CheckboxCaptionWrapping.java
+++ b/uitest/src/com/vaadin/tests/components/checkbox/CheckboxCaptionWrapping.java
diff --git a/tests/testbench/com/vaadin/tests/components/checkbox/CheckboxIcon.java b/uitest/src/com/vaadin/tests/components/checkbox/CheckboxIcon.java
index 50998a96eb..50998a96eb 100644
--- a/tests/testbench/com/vaadin/tests/components/checkbox/CheckboxIcon.java
+++ b/uitest/src/com/vaadin/tests/components/checkbox/CheckboxIcon.java
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxClosePopupRetainText.html b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxClosePopupRetainText.html
index 9248938b28..9248938b28 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxClosePopupRetainText.html
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxClosePopupRetainText.html
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcut.html b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcut.html
index 1689c7c1fc..1689c7c1fc 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcut.html
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcut.html
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcut.java b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcut.java
index 38bdf0c5fe..38bdf0c5fe 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcut.java
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcut.java
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxDataSourceChange.html b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxDataSourceChange.html
index cab8bbc996..cab8bbc996 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxDataSourceChange.html
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxDataSourceChange.html
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxDataSourceChange.java b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxDataSourceChange.java
index a475c86ca0..a475c86ca0 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxDataSourceChange.java
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxDataSourceChange.java
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxEnablesComboBox.java b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxEnablesComboBox.java
index c5e411678d..c5e411678d 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxEnablesComboBox.java
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxEnablesComboBox.java
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxFiltering.html b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxFiltering.html
index 3de221871d..3de221871d 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxFiltering.html
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxFiltering.html
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxIdenticalItems.html b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxIdenticalItems.html
index 3ad7d62a09..3ad7d62a09 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxIdenticalItems.html
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxIdenticalItems.html
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxIdenticalItems.java b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxIdenticalItems.java
index 5f33b96a73..5f33b96a73 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxIdenticalItems.java
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxIdenticalItems.java
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxInPopup.htm b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxInPopup.htm
index f943f912e4..f943f912e4 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxInPopup.htm
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxInPopup.htm
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxInPopup.java b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxInPopup.java
index 393a8ceb6b..393a8ceb6b 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxInPopup.java
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxInPopup.java
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxInPopupView.java b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxInPopupView.java
index 5a488e5dc5..5a488e5dc5 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxInPopupView.java
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxInPopupView.java
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxInvalidNullSelection.html b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxInvalidNullSelection.html
index 1459a30985..1459a30985 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxInvalidNullSelection.html
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxInvalidNullSelection.html
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxInvalidNullSelection.java b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxInvalidNullSelection.java
index 0afa1e887e..0afa1e887e 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxInvalidNullSelection.java
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxInvalidNullSelection.java
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxItemIcon.html b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxItemIcon.html
index 6e6e87bc7e..6e6e87bc7e 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxItemIcon.html
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxItemIcon.html
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxItemIcon.java b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxItemIcon.java
index 62ae652dd0..62ae652dd0 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxItemIcon.java
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxItemIcon.java
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxLargeIcons.html b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxLargeIcons.html
index fd2aceb7f2..fd2aceb7f2 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxLargeIcons.html
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxLargeIcons.html
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxLargeIcons.java b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxLargeIcons.java
index 07cd1f046c..07cd1f046c 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxLargeIcons.java
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxLargeIcons.java
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxNavigation.html b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxNavigation.html
index 03de00a6f1..03de00a6f1 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxNavigation.html
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxNavigation.html
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxNavigation.java b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxNavigation.java
index 245fc123df..245fc123df 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxNavigation.java
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxNavigation.java
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxNoTextInput.html b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxNoTextInput.html
index 2066da47c1..2066da47c1 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxNoTextInput.html
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxNoTextInput.html
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxNullItem.html b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxNullItem.html
index 3dc31f4a98..3dc31f4a98 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxNullItem.html
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxNullItem.html
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.html b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.html
index 50b95bfdc2..50b95bfdc2 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.html
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.html
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java
index 10afb05ae3..10afb05ae3 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxRemoveAllItems.html b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxRemoveAllItems.html
index eec15d0b40..eec15d0b40 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxRemoveAllItems.html
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxRemoveAllItems.html
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxSlow.java b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxSlow.java
index 0336ff423b..0336ff423b 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxSlow.java
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxSlow.java
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxSlowInFF.java b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxSlowInFF.java
index d98997d28f..d98997d28f 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxSlowInFF.java
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxSlowInFF.java
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxSuggestionOnDetach.html b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxSuggestionOnDetach.html
index ba251e5cc0..ba251e5cc0 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxSuggestionOnDetach.html
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxSuggestionOnDetach.html
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxSuggestionOnDetach.java b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxSuggestionOnDetach.java
index 24aea18314..24aea18314 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxSuggestionOnDetach.java
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxSuggestionOnDetach.java
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxTextFieldEventOrder.java b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxTextFieldEventOrder.java
index d33a858dc8..d33a858dc8 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxTextFieldEventOrder.java
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxTextFieldEventOrder.java
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxUndefinedWidthAndIcon.html b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxUndefinedWidthAndIcon.html
index ae0dfec828..ae0dfec828 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxUndefinedWidthAndIcon.html
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxUndefinedWidthAndIcon.html
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxUndefinedWidthAndIcon.java b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxUndefinedWidthAndIcon.java
index 05b52dee80..05b52dee80 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxUndefinedWidthAndIcon.java
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxUndefinedWidthAndIcon.java
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxValueInput.html b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxValueInput.html
index 2aab40f13f..2aab40f13f 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxValueInput.html
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxValueInput.html
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxValueInput.java b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxValueInput.java
index 9e1fab0cda..9e1fab0cda 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxValueInput.java
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxValueInput.java
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxValueUpdate.java b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxValueUpdate.java
index 76ee83384e..76ee83384e 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxValueUpdate.java
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxValueUpdate.java
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxes2.java b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxes2.java
index c72fdd7132..c72fdd7132 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxes2.java
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxes2.java
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboFocusBlurEvents.html b/uitest/src/com/vaadin/tests/components/combobox/ComboFocusBlurEvents.html
index 4d91ce7838..4d91ce7838 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboFocusBlurEvents.html
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboFocusBlurEvents.html
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboFocusBlurEvents.java b/uitest/src/com/vaadin/tests/components/combobox/ComboFocusBlurEvents.java
index b9c222247b..b9c222247b 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboFocusBlurEvents.java
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboFocusBlurEvents.java
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/Comboboxes.html b/uitest/src/com/vaadin/tests/components/combobox/Comboboxes.html
index 4aa84a9453..4aa84a9453 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/Comboboxes.html
+++ b/uitest/src/com/vaadin/tests/components/combobox/Comboboxes.html
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/Comboboxes.java b/uitest/src/com/vaadin/tests/components/combobox/Comboboxes.java
index 5b2608b389..5b2608b389 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/Comboboxes.java
+++ b/uitest/src/com/vaadin/tests/components/combobox/Comboboxes.java
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboxBoxErrorMessage.java b/uitest/src/com/vaadin/tests/components/combobox/ComboxBoxErrorMessage.java
index 7f0816c842..7f0816c842 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboxBoxErrorMessage.java
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboxBoxErrorMessage.java
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/GridLayoutComboBoxZoomOut.java b/uitest/src/com/vaadin/tests/components/combobox/GridLayoutComboBoxZoomOut.java
index c93da483ab..c93da483ab 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/GridLayoutComboBoxZoomOut.java
+++ b/uitest/src/com/vaadin/tests/components/combobox/GridLayoutComboBoxZoomOut.java
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/NewItemsESCPress.java b/uitest/src/com/vaadin/tests/components/combobox/NewItemsESCPress.java
index 00e9242a7a..00e9242a7a 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/NewItemsESCPress.java
+++ b/uitest/src/com/vaadin/tests/components/combobox/NewItemsESCPress.java
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/PopUpWidth.html b/uitest/src/com/vaadin/tests/components/combobox/PopUpWidth.html
index 35a6bcf29a..35a6bcf29a 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/PopUpWidth.html
+++ b/uitest/src/com/vaadin/tests/components/combobox/PopUpWidth.html
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/PopUpWidth.java b/uitest/src/com/vaadin/tests/components/combobox/PopUpWidth.java
index c73bb28c43..c73bb28c43 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/PopUpWidth.java
+++ b/uitest/src/com/vaadin/tests/components/combobox/PopUpWidth.java
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/RemovalOfSelectedIcon.html b/uitest/src/com/vaadin/tests/components/combobox/RemovalOfSelectedIcon.html
index fc3862ebb7..fc3862ebb7 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/RemovalOfSelectedIcon.html
+++ b/uitest/src/com/vaadin/tests/components/combobox/RemovalOfSelectedIcon.html
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/RemovalOfSelectedIcon.java b/uitest/src/com/vaadin/tests/components/combobox/RemovalOfSelectedIcon.java
index 1099d03786..1099d03786 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/RemovalOfSelectedIcon.java
+++ b/uitest/src/com/vaadin/tests/components/combobox/RemovalOfSelectedIcon.java
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/WidthToggleReadOnly.html b/uitest/src/com/vaadin/tests/components/combobox/WidthToggleReadOnly.html
index b661aa2bd7..b661aa2bd7 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/WidthToggleReadOnly.html
+++ b/uitest/src/com/vaadin/tests/components/combobox/WidthToggleReadOnly.html
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/WidthToggleReadOnly.java b/uitest/src/com/vaadin/tests/components/combobox/WidthToggleReadOnly.java
index 654f42e233..654f42e233 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/WidthToggleReadOnly.java
+++ b/uitest/src/com/vaadin/tests/components/combobox/WidthToggleReadOnly.java
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/fi.gif b/uitest/src/com/vaadin/tests/components/combobox/fi.gif
index 8d3a191828..8d3a191828 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/fi.gif
+++ b/uitest/src/com/vaadin/tests/components/combobox/fi.gif
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/se.gif b/uitest/src/com/vaadin/tests/components/combobox/se.gif
index 80f6285228..80f6285228 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/se.gif
+++ b/uitest/src/com/vaadin/tests/components/combobox/se.gif
diff --git a/tests/testbench/com/vaadin/tests/components/customcomponent/ClipContent.java b/uitest/src/com/vaadin/tests/components/customcomponent/ClipContent.java
index 094a63c163..094a63c163 100644
--- a/tests/testbench/com/vaadin/tests/components/customcomponent/ClipContent.java
+++ b/uitest/src/com/vaadin/tests/components/customcomponent/ClipContent.java
diff --git a/tests/testbench/com/vaadin/tests/components/customcomponent/CustomComponentGrowingContent.html b/uitest/src/com/vaadin/tests/components/customcomponent/CustomComponentGrowingContent.html
index 0a1b7212c9..0a1b7212c9 100644
--- a/tests/testbench/com/vaadin/tests/components/customcomponent/CustomComponentGrowingContent.html
+++ b/uitest/src/com/vaadin/tests/components/customcomponent/CustomComponentGrowingContent.html
diff --git a/tests/testbench/com/vaadin/tests/components/customcomponent/CustomComponentGrowingContent.java b/uitest/src/com/vaadin/tests/components/customcomponent/CustomComponentGrowingContent.java
index 4311ad1f08..4311ad1f08 100644
--- a/tests/testbench/com/vaadin/tests/components/customcomponent/CustomComponentGrowingContent.java
+++ b/uitest/src/com/vaadin/tests/components/customcomponent/CustomComponentGrowingContent.java
diff --git a/tests/testbench/com/vaadin/tests/components/customcomponent/CustomComponentSizeUpdate.java b/uitest/src/com/vaadin/tests/components/customcomponent/CustomComponentSizeUpdate.java
index 2351b02e2a..2351b02e2a 100644
--- a/tests/testbench/com/vaadin/tests/components/customcomponent/CustomComponentSizeUpdate.java
+++ b/uitest/src/com/vaadin/tests/components/customcomponent/CustomComponentSizeUpdate.java
diff --git a/tests/testbench/com/vaadin/tests/components/customcomponent/CustomLayoutUsingTemplate.html b/uitest/src/com/vaadin/tests/components/customcomponent/CustomLayoutUsingTemplate.html
index b2806afe5c..b2806afe5c 100644
--- a/tests/testbench/com/vaadin/tests/components/customcomponent/CustomLayoutUsingTemplate.html
+++ b/uitest/src/com/vaadin/tests/components/customcomponent/CustomLayoutUsingTemplate.html
diff --git a/tests/testbench/com/vaadin/tests/components/customcomponent/CustomLayoutUsingTemplate.java b/uitest/src/com/vaadin/tests/components/customcomponent/CustomLayoutUsingTemplate.java
index 28e4dfb385..28e4dfb385 100644
--- a/tests/testbench/com/vaadin/tests/components/customcomponent/CustomLayoutUsingTemplate.java
+++ b/uitest/src/com/vaadin/tests/components/customcomponent/CustomLayoutUsingTemplate.java
diff --git a/tests/testbench/com/vaadin/tests/components/customcomponent/CustomLayoutUsingTheme.html b/uitest/src/com/vaadin/tests/components/customcomponent/CustomLayoutUsingTheme.html
index 954afb2adb..954afb2adb 100644
--- a/tests/testbench/com/vaadin/tests/components/customcomponent/CustomLayoutUsingTheme.html
+++ b/uitest/src/com/vaadin/tests/components/customcomponent/CustomLayoutUsingTheme.html
diff --git a/tests/testbench/com/vaadin/tests/components/customcomponent/CustomLayoutUsingTheme.java b/uitest/src/com/vaadin/tests/components/customcomponent/CustomLayoutUsingTheme.java
index 06dd39ac38..06dd39ac38 100644
--- a/tests/testbench/com/vaadin/tests/components/customcomponent/CustomLayoutUsingTheme.java
+++ b/uitest/src/com/vaadin/tests/components/customcomponent/CustomLayoutUsingTheme.java
diff --git a/tests/testbench/com/vaadin/tests/components/customcomponent/EmbeddedInCustomComponent.html b/uitest/src/com/vaadin/tests/components/customcomponent/EmbeddedInCustomComponent.html
index 268d3074f7..268d3074f7 100644
--- a/tests/testbench/com/vaadin/tests/components/customcomponent/EmbeddedInCustomComponent.html
+++ b/uitest/src/com/vaadin/tests/components/customcomponent/EmbeddedInCustomComponent.html
diff --git a/tests/testbench/com/vaadin/tests/components/customcomponent/EmbeddedInCustomComponent.java b/uitest/src/com/vaadin/tests/components/customcomponent/EmbeddedInCustomComponent.java
index 8170f152c2..8170f152c2 100644
--- a/tests/testbench/com/vaadin/tests/components/customcomponent/EmbeddedInCustomComponent.java
+++ b/uitest/src/com/vaadin/tests/components/customcomponent/EmbeddedInCustomComponent.java
diff --git a/tests/testbench/com/vaadin/tests/components/customcomponent/template.htm b/uitest/src/com/vaadin/tests/components/customcomponent/template.htm
index fa023050da..fa023050da 100644
--- a/tests/testbench/com/vaadin/tests/components/customcomponent/template.htm
+++ b/uitest/src/com/vaadin/tests/components/customcomponent/template.htm
diff --git a/tests/testbench/com/vaadin/tests/components/customfield/AbstractNestedFormExample.java b/uitest/src/com/vaadin/tests/components/customfield/AbstractNestedFormExample.java
index 07c740a96d..07c740a96d 100644
--- a/tests/testbench/com/vaadin/tests/components/customfield/AbstractNestedFormExample.java
+++ b/uitest/src/com/vaadin/tests/components/customfield/AbstractNestedFormExample.java
diff --git a/tests/testbench/com/vaadin/tests/components/customfield/AddressField.java b/uitest/src/com/vaadin/tests/components/customfield/AddressField.java
index 2daeb7bf25..2daeb7bf25 100644
--- a/tests/testbench/com/vaadin/tests/components/customfield/AddressField.java
+++ b/uitest/src/com/vaadin/tests/components/customfield/AddressField.java
diff --git a/tests/testbench/com/vaadin/tests/components/customfield/AddressFormExample.java b/uitest/src/com/vaadin/tests/components/customfield/AddressFormExample.java
index 693b1e11b1..693b1e11b1 100644
--- a/tests/testbench/com/vaadin/tests/components/customfield/AddressFormExample.java
+++ b/uitest/src/com/vaadin/tests/components/customfield/AddressFormExample.java
diff --git a/tests/testbench/com/vaadin/tests/components/customfield/BooleanField.java b/uitest/src/com/vaadin/tests/components/customfield/BooleanField.java
index 409ecccca8..409ecccca8 100644
--- a/tests/testbench/com/vaadin/tests/components/customfield/BooleanField.java
+++ b/uitest/src/com/vaadin/tests/components/customfield/BooleanField.java
diff --git a/tests/testbench/com/vaadin/tests/components/customfield/BooleanFieldExample.html b/uitest/src/com/vaadin/tests/components/customfield/BooleanFieldExample.html
index 6b1b3e8a2d..6b1b3e8a2d 100644
--- a/tests/testbench/com/vaadin/tests/components/customfield/BooleanFieldExample.html
+++ b/uitest/src/com/vaadin/tests/components/customfield/BooleanFieldExample.html
diff --git a/tests/testbench/com/vaadin/tests/components/customfield/BooleanFieldExample.java b/uitest/src/com/vaadin/tests/components/customfield/BooleanFieldExample.java
index a52b168e84..a52b168e84 100644
--- a/tests/testbench/com/vaadin/tests/components/customfield/BooleanFieldExample.java
+++ b/uitest/src/com/vaadin/tests/components/customfield/BooleanFieldExample.java
diff --git a/tests/testbench/com/vaadin/tests/components/customfield/EmbeddedForm.java b/uitest/src/com/vaadin/tests/components/customfield/EmbeddedForm.java
index d305afde1d..d305afde1d 100644
--- a/tests/testbench/com/vaadin/tests/components/customfield/EmbeddedForm.java
+++ b/uitest/src/com/vaadin/tests/components/customfield/EmbeddedForm.java
diff --git a/tests/testbench/com/vaadin/tests/components/customfield/EmbeddedFormExample.html b/uitest/src/com/vaadin/tests/components/customfield/EmbeddedFormExample.html
index 2af441bc83..2af441bc83 100644
--- a/tests/testbench/com/vaadin/tests/components/customfield/EmbeddedFormExample.html
+++ b/uitest/src/com/vaadin/tests/components/customfield/EmbeddedFormExample.html
diff --git a/tests/testbench/com/vaadin/tests/components/customfield/EmbeddedFormExample.java b/uitest/src/com/vaadin/tests/components/customfield/EmbeddedFormExample.java
index aeb1984937..aeb1984937 100644
--- a/tests/testbench/com/vaadin/tests/components/customfield/EmbeddedFormExample.java
+++ b/uitest/src/com/vaadin/tests/components/customfield/EmbeddedFormExample.java
diff --git a/tests/testbench/com/vaadin/tests/components/customfield/NestedFormExample.html b/uitest/src/com/vaadin/tests/components/customfield/NestedFormExample.html
index f9f5783c05..f9f5783c05 100644
--- a/tests/testbench/com/vaadin/tests/components/customfield/NestedFormExample.html
+++ b/uitest/src/com/vaadin/tests/components/customfield/NestedFormExample.html
diff --git a/tests/testbench/com/vaadin/tests/components/customfield/NestedFormExample.java b/uitest/src/com/vaadin/tests/components/customfield/NestedFormExample.java
index 91fb43f4e2..91fb43f4e2 100644
--- a/tests/testbench/com/vaadin/tests/components/customfield/NestedFormExample.java
+++ b/uitest/src/com/vaadin/tests/components/customfield/NestedFormExample.java
diff --git a/tests/testbench/com/vaadin/tests/components/customfield/NestedPersonForm.java b/uitest/src/com/vaadin/tests/components/customfield/NestedPersonForm.java
index 9b40074433..9b40074433 100644
--- a/tests/testbench/com/vaadin/tests/components/customfield/NestedPersonForm.java
+++ b/uitest/src/com/vaadin/tests/components/customfield/NestedPersonForm.java
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/CommitInvalid.html b/uitest/src/com/vaadin/tests/components/datefield/CommitInvalid.html
index 8420888098..8420888098 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/CommitInvalid.html
+++ b/uitest/src/com/vaadin/tests/components/datefield/CommitInvalid.html
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/CommitInvalid.java b/uitest/src/com/vaadin/tests/components/datefield/CommitInvalid.java
index 1553594867..1553594867 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/CommitInvalid.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/CommitInvalid.java
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/CustomDateFormat.html b/uitest/src/com/vaadin/tests/components/datefield/CustomDateFormat.html
index ed92afe378..ed92afe378 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/CustomDateFormat.html
+++ b/uitest/src/com/vaadin/tests/components/datefield/CustomDateFormat.html
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/CustomDateFormat.java b/uitest/src/com/vaadin/tests/components/datefield/CustomDateFormat.java
index c2afb4cba3..c2afb4cba3 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/CustomDateFormat.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/CustomDateFormat.java
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/CustomDateFormats.html b/uitest/src/com/vaadin/tests/components/datefield/CustomDateFormats.html
index 1acdded4cb..1acdded4cb 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/CustomDateFormats.html
+++ b/uitest/src/com/vaadin/tests/components/datefield/CustomDateFormats.html
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/CustomDateFormats.java b/uitest/src/com/vaadin/tests/components/datefield/CustomDateFormats.java
index 247478256f..247478256f 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/CustomDateFormats.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/CustomDateFormats.java
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldEmptyValid.html b/uitest/src/com/vaadin/tests/components/datefield/DateFieldEmptyValid.html
index f387695b5f..f387695b5f 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldEmptyValid.html
+++ b/uitest/src/com/vaadin/tests/components/datefield/DateFieldEmptyValid.html
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldEmptyValid.java b/uitest/src/com/vaadin/tests/components/datefield/DateFieldEmptyValid.java
index 8bc9887b82..8bc9887b82 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldEmptyValid.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/DateFieldEmptyValid.java
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldInSubWindow.html b/uitest/src/com/vaadin/tests/components/datefield/DateFieldInSubWindow.html
index f2ef2123f6..f2ef2123f6 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldInSubWindow.html
+++ b/uitest/src/com/vaadin/tests/components/datefield/DateFieldInSubWindow.html
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldInSubWindow.java b/uitest/src/com/vaadin/tests/components/datefield/DateFieldInSubWindow.java
index 4cf7b98679..4cf7b98679 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldInSubWindow.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/DateFieldInSubWindow.java
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldLocale.java b/uitest/src/com/vaadin/tests/components/datefield/DateFieldLocale.java
index 5d06895d11..5d06895d11 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldLocale.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/DateFieldLocale.java
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldMinResolution.java b/uitest/src/com/vaadin/tests/components/datefield/DateFieldMinResolution.java
index 1a3b3858b8..1a3b3858b8 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldMinResolution.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/DateFieldMinResolution.java
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.html b/uitest/src/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.html
index f7541f0270..f7541f0270 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.html
+++ b/uitest/src/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.html
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.java b/uitest/src/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.java
index ac3296724b..ac3296724b 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.java
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldRangeValidation.html b/uitest/src/com/vaadin/tests/components/datefield/DateFieldRangeValidation.html
index 444f8e3bac..444f8e3bac 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldRangeValidation.html
+++ b/uitest/src/com/vaadin/tests/components/datefield/DateFieldRangeValidation.html
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldRangeValidation.java b/uitest/src/com/vaadin/tests/components/datefield/DateFieldRangeValidation.java
index c085088917..c085088917 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldRangeValidation.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/DateFieldRangeValidation.java
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldReadOnly.html b/uitest/src/com/vaadin/tests/components/datefield/DateFieldReadOnly.html
index ee19b52324..ee19b52324 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldReadOnly.html
+++ b/uitest/src/com/vaadin/tests/components/datefield/DateFieldReadOnly.html
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldReadOnly.java b/uitest/src/com/vaadin/tests/components/datefield/DateFieldReadOnly.java
index 392dbaf9c6..392dbaf9c6 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldReadOnly.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/DateFieldReadOnly.java
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldTest.java b/uitest/src/com/vaadin/tests/components/datefield/DateFieldTest.java
index c502b9597e..c502b9597e 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldTest.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/DateFieldTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldTimezone.html b/uitest/src/com/vaadin/tests/components/datefield/DateFieldTimezone.html
index be325ef2eb..be325ef2eb 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldTimezone.html
+++ b/uitest/src/com/vaadin/tests/components/datefield/DateFieldTimezone.html
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldTimezone.java b/uitest/src/com/vaadin/tests/components/datefield/DateFieldTimezone.java
index 6f31b4d80f..6f31b4d80f 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldTimezone.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/DateFieldTimezone.java
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldUnparsableDate.java b/uitest/src/com/vaadin/tests/components/datefield/DateFieldUnparsableDate.java
index bbe2423a3f..bbe2423a3f 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldUnparsableDate.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/DateFieldUnparsableDate.java
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DatePopupStyleName.html b/uitest/src/com/vaadin/tests/components/datefield/DatePopupStyleName.html
index f367fc383b..f367fc383b 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/DatePopupStyleName.html
+++ b/uitest/src/com/vaadin/tests/components/datefield/DatePopupStyleName.html
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DatePopupStyleName.java b/uitest/src/com/vaadin/tests/components/datefield/DatePopupStyleName.java
index 66de59ffde..66de59ffde 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/DatePopupStyleName.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/DatePopupStyleName.java
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DefaultHandleUnparsableDateField.java b/uitest/src/com/vaadin/tests/components/datefield/DefaultHandleUnparsableDateField.java
index b5842694f0..b5842694f0 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/DefaultHandleUnparsableDateField.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/DefaultHandleUnparsableDateField.java
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DisabledDateFieldWidth b/uitest/src/com/vaadin/tests/components/datefield/DisabledDateFieldWidth
index 48b11e1f7c..48b11e1f7c 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/DisabledDateFieldWidth
+++ b/uitest/src/com/vaadin/tests/components/datefield/DisabledDateFieldWidth
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DisabledDateFieldWidth.java b/uitest/src/com/vaadin/tests/components/datefield/DisabledDateFieldWidth.java
index 403b82a2a7..403b82a2a7 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/DisabledDateFieldWidth.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/DisabledDateFieldWidth.java
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/InlineDateFieldResolutionMsec.html b/uitest/src/com/vaadin/tests/components/datefield/InlineDateFieldResolutionMsec.html
index 4bf57177bd..4bf57177bd 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/InlineDateFieldResolutionMsec.html
+++ b/uitest/src/com/vaadin/tests/components/datefield/InlineDateFieldResolutionMsec.html
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/InlineDateFieldTest.java b/uitest/src/com/vaadin/tests/components/datefield/InlineDateFieldTest.java
index 1c8d8cfae6..1c8d8cfae6 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/InlineDateFieldTest.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/InlineDateFieldTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/InlineDateFieldValueChange.html b/uitest/src/com/vaadin/tests/components/datefield/InlineDateFieldValueChange.html
index 9e6b9ae75e..9e6b9ae75e 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/InlineDateFieldValueChange.html
+++ b/uitest/src/com/vaadin/tests/components/datefield/InlineDateFieldValueChange.html
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/InlineDateFields.java b/uitest/src/com/vaadin/tests/components/datefield/InlineDateFields.java
index ea384d5634..ea384d5634 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/InlineDateFields.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/InlineDateFields.java
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/InlineDateFieldsHiddenOnStart.html b/uitest/src/com/vaadin/tests/components/datefield/InlineDateFieldsHiddenOnStart.html
index 6b79ef419b..6b79ef419b 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/InlineDateFieldsHiddenOnStart.html
+++ b/uitest/src/com/vaadin/tests/components/datefield/InlineDateFieldsHiddenOnStart.html
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/LenientMode.java b/uitest/src/com/vaadin/tests/components/datefield/LenientMode.java
index 585395d747..585395d747 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/LenientMode.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/LenientMode.java
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/LowResolution.java b/uitest/src/com/vaadin/tests/components/datefield/LowResolution.java
index 9c2d3d7d51..9c2d3d7d51 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/LowResolution.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/LowResolution.java
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/NarrowPopupDateFieldInTable.html b/uitest/src/com/vaadin/tests/components/datefield/NarrowPopupDateFieldInTable.html
index 9852b30ae7..9852b30ae7 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/NarrowPopupDateFieldInTable.html
+++ b/uitest/src/com/vaadin/tests/components/datefield/NarrowPopupDateFieldInTable.html
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/NarrowPopupDateFieldInTable.java b/uitest/src/com/vaadin/tests/components/datefield/NarrowPopupDateFieldInTable.java
index dab47ebdd9..dab47ebdd9 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/NarrowPopupDateFieldInTable.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/NarrowPopupDateFieldInTable.java
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldDisabledReadonly.html b/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldDisabledReadonly.html
index 009ca0aaf9..009ca0aaf9 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldDisabledReadonly.html
+++ b/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldDisabledReadonly.html
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRange.html b/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRange.html
index 2783ed2aa3..2783ed2aa3 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRange.html
+++ b/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRange.html
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRange.java b/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRange.java
index a12bdfa44c..a12bdfa44c 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRange.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRange.java
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldMonth.html b/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldMonth.html
index 9111388f5a..9111388f5a 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldMonth.html
+++ b/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldMonth.html
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldPopup.html b/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldPopup.html
index 1ec418e523..1ec418e523 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldPopup.html
+++ b/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldPopup.html
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldPopup.java b/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldPopup.java
index 5a6f6517bd..5a6f6517bd 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldPopup.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldPopup.java
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldResolutions.html b/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldResolutions.html
index 8ecf9a4731..8ecf9a4731 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldResolutions.html
+++ b/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldResolutions.html
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldTest.java b/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldTest.java
index 3e8b0678a7..3e8b0678a7 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldTest.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFields.java b/uitest/src/com/vaadin/tests/components/datefield/PopupDateFields.java
index e69de5de12..e69de5de12 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFields.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/PopupDateFields.java
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/RequiredInvalidDateField.html b/uitest/src/com/vaadin/tests/components/datefield/RequiredInvalidDateField.html
index 6dc46e4eec..6dc46e4eec 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/RequiredInvalidDateField.html
+++ b/uitest/src/com/vaadin/tests/components/datefield/RequiredInvalidDateField.html
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/RequiredInvalidDateField.java b/uitest/src/com/vaadin/tests/components/datefield/RequiredInvalidDateField.java
index bd47622394..bd47622394 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/RequiredInvalidDateField.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/RequiredInvalidDateField.java
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/ShowSelectedDateAfterInvalid.html b/uitest/src/com/vaadin/tests/components/datefield/ShowSelectedDateAfterInvalid.html
index 1cd79338e9..1cd79338e9 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/ShowSelectedDateAfterInvalid.html
+++ b/uitest/src/com/vaadin/tests/components/datefield/ShowSelectedDateAfterInvalid.html
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/ShowSelectedDateAfterInvalid.java b/uitest/src/com/vaadin/tests/components/datefield/ShowSelectedDateAfterInvalid.java
index da8f45690c..da8f45690c 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/ShowSelectedDateAfterInvalid.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/ShowSelectedDateAfterInvalid.java
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/TestDatefieldYear.html b/uitest/src/com/vaadin/tests/components/datefield/TestDatefieldYear.html
index 71c246593a..71c246593a 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/TestDatefieldYear.html
+++ b/uitest/src/com/vaadin/tests/components/datefield/TestDatefieldYear.html
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/TestDatefieldYear.java b/uitest/src/com/vaadin/tests/components/datefield/TestDatefieldYear.java
index 4fa7a6811a..4fa7a6811a 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/TestDatefieldYear.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/TestDatefieldYear.java
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/TestSettingTimeOnInitiallyNullInlineDateField.html b/uitest/src/com/vaadin/tests/components/datefield/TestSettingTimeOnInitiallyNullInlineDateField.html
index 7f4cd92be2..7f4cd92be2 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/TestSettingTimeOnInitiallyNullInlineDateField.html
+++ b/uitest/src/com/vaadin/tests/components/datefield/TestSettingTimeOnInitiallyNullInlineDateField.html
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/TestSettingTimeOnInitiallyNullPopupDateField.html b/uitest/src/com/vaadin/tests/components/datefield/TestSettingTimeOnInitiallyNullPopupDateField.html
index 9fabd8b1e7..9fabd8b1e7 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/TestSettingTimeOnInitiallyNullPopupDateField.html
+++ b/uitest/src/com/vaadin/tests/components/datefield/TestSettingTimeOnInitiallyNullPopupDateField.html
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/ValueThroughProperty.html b/uitest/src/com/vaadin/tests/components/datefield/ValueThroughProperty.html
index 07b8b1b237..07b8b1b237 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/ValueThroughProperty.html
+++ b/uitest/src/com/vaadin/tests/components/datefield/ValueThroughProperty.html
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/ValueThroughProperty.java b/uitest/src/com/vaadin/tests/components/datefield/ValueThroughProperty.java
index a45d3b8ad0..a45d3b8ad0 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/ValueThroughProperty.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/ValueThroughProperty.java
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/WidthRecalculationOnEnableStateChange.html b/uitest/src/com/vaadin/tests/components/datefield/WidthRecalculationOnEnableStateChange.html
index 70441efd9f..70441efd9f 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/WidthRecalculationOnEnableStateChange.html
+++ b/uitest/src/com/vaadin/tests/components/datefield/WidthRecalculationOnEnableStateChange.html
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/WidthRecalculationOnEnableStateChange.java b/uitest/src/com/vaadin/tests/components/datefield/WidthRecalculationOnEnableStateChange.java
index b7b0f50947..b7b0f50947 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/WidthRecalculationOnEnableStateChange.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/WidthRecalculationOnEnableStateChange.java
diff --git a/tests/testbench/com/vaadin/tests/components/draganddropwrapper/DragAndDropWrapperTooltips.html b/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragAndDropWrapperTooltips.html
index 03ec163e40..03ec163e40 100644
--- a/tests/testbench/com/vaadin/tests/components/draganddropwrapper/DragAndDropWrapperTooltips.html
+++ b/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragAndDropWrapperTooltips.html
diff --git a/tests/testbench/com/vaadin/tests/components/draganddropwrapper/DragAndDropWrapperTooltips.java b/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragAndDropWrapperTooltips.java
index 22ed5e5a4a..22ed5e5a4a 100644
--- a/tests/testbench/com/vaadin/tests/components/draganddropwrapper/DragAndDropWrapperTooltips.java
+++ b/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragAndDropWrapperTooltips.java
diff --git a/tests/testbench/com/vaadin/tests/components/draganddropwrapper/DragStartModes.html b/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragStartModes.html
index 3e7a7cb0a7..3e7a7cb0a7 100644
--- a/tests/testbench/com/vaadin/tests/components/draganddropwrapper/DragStartModes.html
+++ b/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragStartModes.html
diff --git a/tests/testbench/com/vaadin/tests/components/draganddropwrapper/DragStartModes.java b/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragStartModes.java
index b143ddf2dc..b143ddf2dc 100644
--- a/tests/testbench/com/vaadin/tests/components/draganddropwrapper/DragStartModes.java
+++ b/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragStartModes.java
diff --git a/tests/testbench/com/vaadin/tests/components/draganddropwrapper/TooltipHandlingWhenNotDefined.html b/uitest/src/com/vaadin/tests/components/draganddropwrapper/TooltipHandlingWhenNotDefined.html
index c85d7e0626..c85d7e0626 100644
--- a/tests/testbench/com/vaadin/tests/components/draganddropwrapper/TooltipHandlingWhenNotDefined.html
+++ b/uitest/src/com/vaadin/tests/components/draganddropwrapper/TooltipHandlingWhenNotDefined.html
diff --git a/tests/testbench/com/vaadin/tests/components/draganddropwrapper/TooltipHandlingWhenNotDefined.java b/uitest/src/com/vaadin/tests/components/draganddropwrapper/TooltipHandlingWhenNotDefined.java
index 93f559f4e7..93f559f4e7 100644
--- a/tests/testbench/com/vaadin/tests/components/draganddropwrapper/TooltipHandlingWhenNotDefined.java
+++ b/uitest/src/com/vaadin/tests/components/draganddropwrapper/TooltipHandlingWhenNotDefined.java
diff --git a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedAltText.html b/uitest/src/com/vaadin/tests/components/embedded/EmbeddedAltText.html
index 066c55fe55..066c55fe55 100644
--- a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedAltText.html
+++ b/uitest/src/com/vaadin/tests/components/embedded/EmbeddedAltText.html
diff --git a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedAltText.java b/uitest/src/com/vaadin/tests/components/embedded/EmbeddedAltText.java
index aedfafe627..aedfafe627 100644
--- a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedAltText.java
+++ b/uitest/src/com/vaadin/tests/components/embedded/EmbeddedAltText.java
diff --git a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedApplet.html b/uitest/src/com/vaadin/tests/components/embedded/EmbeddedApplet.html
index d8fb0593d1..d8fb0593d1 100644
--- a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedApplet.html
+++ b/uitest/src/com/vaadin/tests/components/embedded/EmbeddedApplet.html
diff --git a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedApplet.java b/uitest/src/com/vaadin/tests/components/embedded/EmbeddedApplet.java
index 4b318c3890..4b318c3890 100644
--- a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedApplet.java
+++ b/uitest/src/com/vaadin/tests/components/embedded/EmbeddedApplet.java
diff --git a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinates.html b/uitest/src/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinates.html
index 2dcd1b5071..2dcd1b5071 100644
--- a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinates.html
+++ b/uitest/src/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinates.html
diff --git a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinates.java b/uitest/src/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinates.java
index 3c5801e90e..3c5801e90e 100644
--- a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinates.java
+++ b/uitest/src/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinates.java
diff --git a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedFlash.java b/uitest/src/com/vaadin/tests/components/embedded/EmbeddedFlash.java
index 38aea4a4f0..38aea4a4f0 100644
--- a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedFlash.java
+++ b/uitest/src/com/vaadin/tests/components/embedded/EmbeddedFlash.java
diff --git a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedImageRefresh.java b/uitest/src/com/vaadin/tests/components/embedded/EmbeddedImageRefresh.java
index 52454e115e..52454e115e 100644
--- a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedImageRefresh.java
+++ b/uitest/src/com/vaadin/tests/components/embedded/EmbeddedImageRefresh.java
diff --git a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedPdf.html b/uitest/src/com/vaadin/tests/components/embedded/EmbeddedPdf.html
index c550b0f5d9..c550b0f5d9 100644
--- a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedPdf.html
+++ b/uitest/src/com/vaadin/tests/components/embedded/EmbeddedPdf.html
diff --git a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedPdf.java b/uitest/src/com/vaadin/tests/components/embedded/EmbeddedPdf.java
index 025245ab64..025245ab64 100644
--- a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedPdf.java
+++ b/uitest/src/com/vaadin/tests/components/embedded/EmbeddedPdf.java
diff --git a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedTooltip.java b/uitest/src/com/vaadin/tests/components/embedded/EmbeddedTooltip.java
index aa24337013..aa24337013 100644
--- a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedTooltip.java
+++ b/uitest/src/com/vaadin/tests/components/embedded/EmbeddedTooltip.java
diff --git a/tests/testbench/com/vaadin/tests/components/embedded/FlashIsVisible.html b/uitest/src/com/vaadin/tests/components/embedded/FlashIsVisible.html
index d3debf3417..d3debf3417 100644
--- a/tests/testbench/com/vaadin/tests/components/embedded/FlashIsVisible.html
+++ b/uitest/src/com/vaadin/tests/components/embedded/FlashIsVisible.html
diff --git a/tests/testbench/com/vaadin/tests/components/embedded/FlashIsVisible.java b/uitest/src/com/vaadin/tests/components/embedded/FlashIsVisible.java
index 1724fc11b7..1724fc11b7 100644
--- a/tests/testbench/com/vaadin/tests/components/embedded/FlashIsVisible.java
+++ b/uitest/src/com/vaadin/tests/components/embedded/FlashIsVisible.java
diff --git a/tests/testbench/com/vaadin/tests/components/embedded/TestApplet.java b/uitest/src/com/vaadin/tests/components/embedded/TestApplet.java
index 3cf7cf888b..3cf7cf888b 100644
--- a/tests/testbench/com/vaadin/tests/components/embedded/TestApplet.java
+++ b/uitest/src/com/vaadin/tests/components/embedded/TestApplet.java
diff --git a/tests/testbench/com/vaadin/tests/components/embedded/test.pdf b/uitest/src/com/vaadin/tests/components/embedded/test.pdf
index e44a87e9ad..e44a87e9ad 100644
--- a/tests/testbench/com/vaadin/tests/components/embedded/test.pdf
+++ b/uitest/src/com/vaadin/tests/components/embedded/test.pdf
diff --git a/tests/testbench/com/vaadin/tests/components/embeddedbrowser/EmbeddedBrowserIsVisible.html b/uitest/src/com/vaadin/tests/components/embeddedbrowser/EmbeddedBrowserIsVisible.html
index 2d76cd48b2..2d76cd48b2 100644
--- a/tests/testbench/com/vaadin/tests/components/embeddedbrowser/EmbeddedBrowserIsVisible.html
+++ b/uitest/src/com/vaadin/tests/components/embeddedbrowser/EmbeddedBrowserIsVisible.html
diff --git a/tests/testbench/com/vaadin/tests/components/embeddedbrowser/EmbeddedBrowserIsVisible.java b/uitest/src/com/vaadin/tests/components/embeddedbrowser/EmbeddedBrowserIsVisible.java
index 2eaf712676..2eaf712676 100644
--- a/tests/testbench/com/vaadin/tests/components/embeddedbrowser/EmbeddedBrowserIsVisible.java
+++ b/uitest/src/com/vaadin/tests/components/embeddedbrowser/EmbeddedBrowserIsVisible.java
diff --git a/tests/testbench/com/vaadin/tests/components/flash/FlashIsVisible.html b/uitest/src/com/vaadin/tests/components/flash/FlashIsVisible.html
index 82834cf405..82834cf405 100644
--- a/tests/testbench/com/vaadin/tests/components/flash/FlashIsVisible.html
+++ b/uitest/src/com/vaadin/tests/components/flash/FlashIsVisible.html
diff --git a/tests/testbench/com/vaadin/tests/components/flash/FlashIsVisible.java b/uitest/src/com/vaadin/tests/components/flash/FlashIsVisible.java
index 74bb216002..74bb216002 100644
--- a/tests/testbench/com/vaadin/tests/components/flash/FlashIsVisible.java
+++ b/uitest/src/com/vaadin/tests/components/flash/FlashIsVisible.java
diff --git a/tests/testbench/com/vaadin/tests/components/flash/FlashPresentation.java b/uitest/src/com/vaadin/tests/components/flash/FlashPresentation.java
index 5c28feb7f8..5c28feb7f8 100644
--- a/tests/testbench/com/vaadin/tests/components/flash/FlashPresentation.java
+++ b/uitest/src/com/vaadin/tests/components/flash/FlashPresentation.java
diff --git a/tests/testbench/com/vaadin/tests/components/form/FormCaptionClickFocusing.html b/uitest/src/com/vaadin/tests/components/form/FormCaptionClickFocusing.html
index 14dbc6d4c8..14dbc6d4c8 100644
--- a/tests/testbench/com/vaadin/tests/components/form/FormCaptionClickFocusing.html
+++ b/uitest/src/com/vaadin/tests/components/form/FormCaptionClickFocusing.html
diff --git a/tests/testbench/com/vaadin/tests/components/form/FormCaptionClickFocusing.java b/uitest/src/com/vaadin/tests/components/form/FormCaptionClickFocusing.java
index 4afe289825..4afe289825 100644
--- a/tests/testbench/com/vaadin/tests/components/form/FormCaptionClickFocusing.java
+++ b/uitest/src/com/vaadin/tests/components/form/FormCaptionClickFocusing.java
diff --git a/tests/testbench/com/vaadin/tests/components/form/FormClearDatasourceRepaint.html b/uitest/src/com/vaadin/tests/components/form/FormClearDatasourceRepaint.html
index 200ddb547d..200ddb547d 100644
--- a/tests/testbench/com/vaadin/tests/components/form/FormClearDatasourceRepaint.html
+++ b/uitest/src/com/vaadin/tests/components/form/FormClearDatasourceRepaint.html
diff --git a/tests/testbench/com/vaadin/tests/components/form/FormClearDatasourceRepaint.java b/uitest/src/com/vaadin/tests/components/form/FormClearDatasourceRepaint.java
index 539263a363..539263a363 100644
--- a/tests/testbench/com/vaadin/tests/components/form/FormClearDatasourceRepaint.java
+++ b/uitest/src/com/vaadin/tests/components/form/FormClearDatasourceRepaint.java
diff --git a/tests/testbench/com/vaadin/tests/components/form/FormCommitWithInvalidValues.html b/uitest/src/com/vaadin/tests/components/form/FormCommitWithInvalidValues.html
index 0d5b435609..0d5b435609 100644
--- a/tests/testbench/com/vaadin/tests/components/form/FormCommitWithInvalidValues.html
+++ b/uitest/src/com/vaadin/tests/components/form/FormCommitWithInvalidValues.html
diff --git a/tests/testbench/com/vaadin/tests/components/form/FormCommitWithInvalidValues.java b/uitest/src/com/vaadin/tests/components/form/FormCommitWithInvalidValues.java
index 907b8a27f3..907b8a27f3 100644
--- a/tests/testbench/com/vaadin/tests/components/form/FormCommitWithInvalidValues.java
+++ b/uitest/src/com/vaadin/tests/components/form/FormCommitWithInvalidValues.java
diff --git a/tests/testbench/com/vaadin/tests/components/form/FormDescription.html b/uitest/src/com/vaadin/tests/components/form/FormDescription.html
index 7cf93c6125..7cf93c6125 100644
--- a/tests/testbench/com/vaadin/tests/components/form/FormDescription.html
+++ b/uitest/src/com/vaadin/tests/components/form/FormDescription.html
diff --git a/tests/testbench/com/vaadin/tests/components/form/FormDescription.java b/uitest/src/com/vaadin/tests/components/form/FormDescription.java
index 76ea039756..76ea039756 100644
--- a/tests/testbench/com/vaadin/tests/components/form/FormDescription.java
+++ b/uitest/src/com/vaadin/tests/components/form/FormDescription.java
diff --git a/tests/testbench/com/vaadin/tests/components/form/FormDescriptions.html b/uitest/src/com/vaadin/tests/components/form/FormDescriptions.html
index 1c6562ac52..1c6562ac52 100644
--- a/tests/testbench/com/vaadin/tests/components/form/FormDescriptions.html
+++ b/uitest/src/com/vaadin/tests/components/form/FormDescriptions.html
diff --git a/tests/testbench/com/vaadin/tests/components/form/FormFieldCaptions.java b/uitest/src/com/vaadin/tests/components/form/FormFieldCaptions.java
index 25487fba7c..25487fba7c 100644
--- a/tests/testbench/com/vaadin/tests/components/form/FormFieldCaptions.java
+++ b/uitest/src/com/vaadin/tests/components/form/FormFieldCaptions.java
diff --git a/tests/testbench/com/vaadin/tests/components/form/FormFieldCaptionsStyles.html b/uitest/src/com/vaadin/tests/components/form/FormFieldCaptionsStyles.html
index 10ebb37529..10ebb37529 100644
--- a/tests/testbench/com/vaadin/tests/components/form/FormFieldCaptionsStyles.html
+++ b/uitest/src/com/vaadin/tests/components/form/FormFieldCaptionsStyles.html
diff --git a/tests/testbench/com/vaadin/tests/components/form/FormFieldCaptionsStyles.java b/uitest/src/com/vaadin/tests/components/form/FormFieldCaptionsStyles.java
index 863d4b5b80..863d4b5b80 100644
--- a/tests/testbench/com/vaadin/tests/components/form/FormFieldCaptionsStyles.java
+++ b/uitest/src/com/vaadin/tests/components/form/FormFieldCaptionsStyles.java
diff --git a/tests/testbench/com/vaadin/tests/components/form/FormFieldFactoryAndLayouts.html b/uitest/src/com/vaadin/tests/components/form/FormFieldFactoryAndLayouts.html
index c9d3dbef93..c9d3dbef93 100644
--- a/tests/testbench/com/vaadin/tests/components/form/FormFieldFactoryAndLayouts.html
+++ b/uitest/src/com/vaadin/tests/components/form/FormFieldFactoryAndLayouts.html
diff --git a/tests/testbench/com/vaadin/tests/components/form/FormNotGettingSmaller.java b/uitest/src/com/vaadin/tests/components/form/FormNotGettingSmaller.java
index a47ab944a2..a47ab944a2 100644
--- a/tests/testbench/com/vaadin/tests/components/form/FormNotGettingSmaller.java
+++ b/uitest/src/com/vaadin/tests/components/form/FormNotGettingSmaller.java
diff --git a/tests/testbench/com/vaadin/tests/components/form/FormRenderingFlicker.java b/uitest/src/com/vaadin/tests/components/form/FormRenderingFlicker.java
index 41e1a91781..41e1a91781 100644
--- a/tests/testbench/com/vaadin/tests/components/form/FormRenderingFlicker.java
+++ b/uitest/src/com/vaadin/tests/components/form/FormRenderingFlicker.java
diff --git a/tests/testbench/com/vaadin/tests/components/form/FormTest.java b/uitest/src/com/vaadin/tests/components/form/FormTest.java
index 604beb5fcc..604beb5fcc 100644
--- a/tests/testbench/com/vaadin/tests/components/form/FormTest.java
+++ b/uitest/src/com/vaadin/tests/components/form/FormTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/form/FormWithEnterShortCut.java b/uitest/src/com/vaadin/tests/components/form/FormWithEnterShortCut.java
index ed1a3d9bd9..ed1a3d9bd9 100644
--- a/tests/testbench/com/vaadin/tests/components/form/FormWithEnterShortCut.java
+++ b/uitest/src/com/vaadin/tests/components/form/FormWithEnterShortCut.java
diff --git a/tests/testbench/com/vaadin/tests/components/form/FormWithEnterShortcut.html b/uitest/src/com/vaadin/tests/components/form/FormWithEnterShortcut.html
index 9680ef7022..9680ef7022 100644
--- a/tests/testbench/com/vaadin/tests/components/form/FormWithEnterShortcut.html
+++ b/uitest/src/com/vaadin/tests/components/form/FormWithEnterShortcut.html
diff --git a/tests/testbench/com/vaadin/tests/components/form/FormWithPaddingsAndBorders.html b/uitest/src/com/vaadin/tests/components/form/FormWithPaddingsAndBorders.html
index 384cc6c398..384cc6c398 100644
--- a/tests/testbench/com/vaadin/tests/components/form/FormWithPaddingsAndBorders.html
+++ b/uitest/src/com/vaadin/tests/components/form/FormWithPaddingsAndBorders.html
diff --git a/tests/testbench/com/vaadin/tests/components/form/FormWithPaddingsAndBorders.java b/uitest/src/com/vaadin/tests/components/form/FormWithPaddingsAndBorders.java
index ff1951d9ca..ff1951d9ca 100644
--- a/tests/testbench/com/vaadin/tests/components/form/FormWithPaddingsAndBorders.java
+++ b/uitest/src/com/vaadin/tests/components/form/FormWithPaddingsAndBorders.java
diff --git a/tests/testbench/com/vaadin/tests/components/form/FormWithPropertyFormatterConnected.java b/uitest/src/com/vaadin/tests/components/form/FormWithPropertyFormatterConnected.java
index 24d207739e..24d207739e 100644
--- a/tests/testbench/com/vaadin/tests/components/form/FormWithPropertyFormatterConnected.java
+++ b/uitest/src/com/vaadin/tests/components/form/FormWithPropertyFormatterConnected.java
diff --git a/tests/testbench/com/vaadin/tests/components/form/FormWithRelativelySizedLayout.java b/uitest/src/com/vaadin/tests/components/form/FormWithRelativelySizedLayout.java
index 17fe4477c3..17fe4477c3 100644
--- a/tests/testbench/com/vaadin/tests/components/form/FormWithRelativelySizedLayout.java
+++ b/uitest/src/com/vaadin/tests/components/form/FormWithRelativelySizedLayout.java
diff --git a/tests/testbench/com/vaadin/tests/components/form/UndefinedWideFormWithRelativeWideFooter.html b/uitest/src/com/vaadin/tests/components/form/UndefinedWideFormWithRelativeWideFooter.html
index ade84de312..ade84de312 100644
--- a/tests/testbench/com/vaadin/tests/components/form/UndefinedWideFormWithRelativeWideFooter.html
+++ b/uitest/src/com/vaadin/tests/components/form/UndefinedWideFormWithRelativeWideFooter.html
diff --git a/tests/testbench/com/vaadin/tests/components/form/UndefinedWideFormWithRelativeWideFooter.java b/uitest/src/com/vaadin/tests/components/form/UndefinedWideFormWithRelativeWideFooter.java
index b34db2170e..b34db2170e 100644
--- a/tests/testbench/com/vaadin/tests/components/form/UndefinedWideFormWithRelativeWideFooter.java
+++ b/uitest/src/com/vaadin/tests/components/form/UndefinedWideFormWithRelativeWideFooter.java
diff --git a/tests/testbench/com/vaadin/tests/components/formlayout/FormLayoutCaptionStyles.html b/uitest/src/com/vaadin/tests/components/formlayout/FormLayoutCaptionStyles.html
index 14b5cc4c53..14b5cc4c53 100644
--- a/tests/testbench/com/vaadin/tests/components/formlayout/FormLayoutCaptionStyles.html
+++ b/uitest/src/com/vaadin/tests/components/formlayout/FormLayoutCaptionStyles.html
diff --git a/tests/testbench/com/vaadin/tests/components/formlayout/FormLayoutCaptionStyles.java b/uitest/src/com/vaadin/tests/components/formlayout/FormLayoutCaptionStyles.java
index 0055c3782e..0055c3782e 100644
--- a/tests/testbench/com/vaadin/tests/components/formlayout/FormLayoutCaptionStyles.java
+++ b/uitest/src/com/vaadin/tests/components/formlayout/FormLayoutCaptionStyles.java
diff --git a/tests/testbench/com/vaadin/tests/components/formlayout/FormLayoutErrorHover.html b/uitest/src/com/vaadin/tests/components/formlayout/FormLayoutErrorHover.html
index 7733da4e95..7733da4e95 100644
--- a/tests/testbench/com/vaadin/tests/components/formlayout/FormLayoutErrorHover.html
+++ b/uitest/src/com/vaadin/tests/components/formlayout/FormLayoutErrorHover.html
diff --git a/tests/testbench/com/vaadin/tests/components/formlayout/FormLayoutErrorHover.java b/uitest/src/com/vaadin/tests/components/formlayout/FormLayoutErrorHover.java
index dc3cffffb6..dc3cffffb6 100644
--- a/tests/testbench/com/vaadin/tests/components/formlayout/FormLayoutErrorHover.java
+++ b/uitest/src/com/vaadin/tests/components/formlayout/FormLayoutErrorHover.java
diff --git a/tests/testbench/com/vaadin/tests/components/formlayout/FormLayouts.java b/uitest/src/com/vaadin/tests/components/formlayout/FormLayouts.java
index f2c24feae5..f2c24feae5 100644
--- a/tests/testbench/com/vaadin/tests/components/formlayout/FormLayouts.java
+++ b/uitest/src/com/vaadin/tests/components/formlayout/FormLayouts.java
diff --git a/tests/testbench/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrolling.html b/uitest/src/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrolling.html
index 8795ad12dc..8795ad12dc 100644
--- a/tests/testbench/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrolling.html
+++ b/uitest/src/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrolling.html
diff --git a/tests/testbench/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrolling.java b/uitest/src/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrolling.java
index 360c559086..360c559086 100644
--- a/tests/testbench/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrolling.java
+++ b/uitest/src/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrolling.java
diff --git a/tests/testbench/com/vaadin/tests/components/gridlayout/GridLayoutInForm.java b/uitest/src/com/vaadin/tests/components/gridlayout/GridLayoutInForm.java
index 165827eb6b..165827eb6b 100644
--- a/tests/testbench/com/vaadin/tests/components/gridlayout/GridLayoutInForm.java
+++ b/uitest/src/com/vaadin/tests/components/gridlayout/GridLayoutInForm.java
diff --git a/tests/testbench/com/vaadin/tests/components/gridlayout/MoveComponentFromGridLayoutToInnerLayout.html b/uitest/src/com/vaadin/tests/components/gridlayout/MoveComponentFromGridLayoutToInnerLayout.html
index ed6d39f63d..ed6d39f63d 100644
--- a/tests/testbench/com/vaadin/tests/components/gridlayout/MoveComponentFromGridLayoutToInnerLayout.html
+++ b/uitest/src/com/vaadin/tests/components/gridlayout/MoveComponentFromGridLayoutToInnerLayout.html
diff --git a/tests/testbench/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayout.java b/uitest/src/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayout.java
index 0106f2e218..0106f2e218 100644
--- a/tests/testbench/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayout.java
+++ b/uitest/src/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayout.java
diff --git a/tests/testbench/com/vaadin/tests/components/image/ImageAltText.html b/uitest/src/com/vaadin/tests/components/image/ImageAltText.html
index 743aa5caaf..743aa5caaf 100644
--- a/tests/testbench/com/vaadin/tests/components/image/ImageAltText.html
+++ b/uitest/src/com/vaadin/tests/components/image/ImageAltText.html
diff --git a/tests/testbench/com/vaadin/tests/components/image/ImageAltText.java b/uitest/src/com/vaadin/tests/components/image/ImageAltText.java
index 6abbc41213..6abbc41213 100644
--- a/tests/testbench/com/vaadin/tests/components/image/ImageAltText.java
+++ b/uitest/src/com/vaadin/tests/components/image/ImageAltText.java
diff --git a/tests/testbench/com/vaadin/tests/components/image/ImageClicks.html b/uitest/src/com/vaadin/tests/components/image/ImageClicks.html
index 14afaab98d..14afaab98d 100644
--- a/tests/testbench/com/vaadin/tests/components/image/ImageClicks.html
+++ b/uitest/src/com/vaadin/tests/components/image/ImageClicks.html
diff --git a/tests/testbench/com/vaadin/tests/components/image/ImageClicks.java b/uitest/src/com/vaadin/tests/components/image/ImageClicks.java
index e2d983b7ce..e2d983b7ce 100644
--- a/tests/testbench/com/vaadin/tests/components/image/ImageClicks.java
+++ b/uitest/src/com/vaadin/tests/components/image/ImageClicks.java
diff --git a/tests/testbench/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.html b/uitest/src/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.html
index 8d0bb44cb5..8d0bb44cb5 100644
--- a/tests/testbench/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.html
+++ b/uitest/src/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.html
diff --git a/tests/testbench/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.java b/uitest/src/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.java
index 38beca3bf1..38beca3bf1 100644
--- a/tests/testbench/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.java
+++ b/uitest/src/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.java
diff --git a/tests/testbench/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponentConnector.js b/uitest/src/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponentConnector.js
index b0ece6217d..b0ece6217d 100644
--- a/tests/testbench/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponentConnector.js
+++ b/uitest/src/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponentConnector.js
diff --git a/tests/testbench/com/vaadin/tests/components/label/HundredPercentWideLabelResize.html b/uitest/src/com/vaadin/tests/components/label/HundredPercentWideLabelResize.html
index 667f08ba4f..667f08ba4f 100644
--- a/tests/testbench/com/vaadin/tests/components/label/HundredPercentWideLabelResize.html
+++ b/uitest/src/com/vaadin/tests/components/label/HundredPercentWideLabelResize.html
diff --git a/tests/testbench/com/vaadin/tests/components/label/HundredPercentWideLabelResize.java b/uitest/src/com/vaadin/tests/components/label/HundredPercentWideLabelResize.java
index 61caf9a2f2..61caf9a2f2 100644
--- a/tests/testbench/com/vaadin/tests/components/label/HundredPercentWideLabelResize.java
+++ b/uitest/src/com/vaadin/tests/components/label/HundredPercentWideLabelResize.java
diff --git a/tests/testbench/com/vaadin/tests/components/label/LabelModes.html b/uitest/src/com/vaadin/tests/components/label/LabelModes.html
index 356688b456..356688b456 100644
--- a/tests/testbench/com/vaadin/tests/components/label/LabelModes.html
+++ b/uitest/src/com/vaadin/tests/components/label/LabelModes.html
diff --git a/tests/testbench/com/vaadin/tests/components/label/LabelModes.java b/uitest/src/com/vaadin/tests/components/label/LabelModes.java
index 207a9a8de7..207a9a8de7 100644
--- a/tests/testbench/com/vaadin/tests/components/label/LabelModes.java
+++ b/uitest/src/com/vaadin/tests/components/label/LabelModes.java
diff --git a/tests/testbench/com/vaadin/tests/components/label/LabelTest.java b/uitest/src/com/vaadin/tests/components/label/LabelTest.java
index 186b3deeb3..186b3deeb3 100644
--- a/tests/testbench/com/vaadin/tests/components/label/LabelTest.java
+++ b/uitest/src/com/vaadin/tests/components/label/LabelTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/label/LabelTooltip-chameleon.html b/uitest/src/com/vaadin/tests/components/label/LabelTooltip-chameleon.html
index 4a724795b3..4a724795b3 100644
--- a/tests/testbench/com/vaadin/tests/components/label/LabelTooltip-chameleon.html
+++ b/uitest/src/com/vaadin/tests/components/label/LabelTooltip-chameleon.html
diff --git a/tests/testbench/com/vaadin/tests/components/label/LabelTooltip-runo.html b/uitest/src/com/vaadin/tests/components/label/LabelTooltip-runo.html
index 9877493b3b..9877493b3b 100644
--- a/tests/testbench/com/vaadin/tests/components/label/LabelTooltip-runo.html
+++ b/uitest/src/com/vaadin/tests/components/label/LabelTooltip-runo.html
diff --git a/tests/testbench/com/vaadin/tests/components/label/LabelTooltip.html b/uitest/src/com/vaadin/tests/components/label/LabelTooltip.html
index 05da9195ef..05da9195ef 100644
--- a/tests/testbench/com/vaadin/tests/components/label/LabelTooltip.html
+++ b/uitest/src/com/vaadin/tests/components/label/LabelTooltip.html
diff --git a/tests/testbench/com/vaadin/tests/components/label/LabelTooltip.java b/uitest/src/com/vaadin/tests/components/label/LabelTooltip.java
index bc399e7d3c..bc399e7d3c 100644
--- a/tests/testbench/com/vaadin/tests/components/label/LabelTooltip.java
+++ b/uitest/src/com/vaadin/tests/components/label/LabelTooltip.java
diff --git a/tests/testbench/com/vaadin/tests/components/label/LabelWrapping.html b/uitest/src/com/vaadin/tests/components/label/LabelWrapping.html
index b8038a75b4..b8038a75b4 100644
--- a/tests/testbench/com/vaadin/tests/components/label/LabelWrapping.html
+++ b/uitest/src/com/vaadin/tests/components/label/LabelWrapping.html
diff --git a/tests/testbench/com/vaadin/tests/components/label/LabelWrapping.java b/uitest/src/com/vaadin/tests/components/label/LabelWrapping.java
index 82969fdb08..82969fdb08 100644
--- a/tests/testbench/com/vaadin/tests/components/label/LabelWrapping.java
+++ b/uitest/src/com/vaadin/tests/components/label/LabelWrapping.java
diff --git a/tests/testbench/com/vaadin/tests/components/label/Labels.html b/uitest/src/com/vaadin/tests/components/label/Labels.html
index 46ff066d8c..46ff066d8c 100644
--- a/tests/testbench/com/vaadin/tests/components/label/Labels.html
+++ b/uitest/src/com/vaadin/tests/components/label/Labels.html
diff --git a/tests/testbench/com/vaadin/tests/components/label/Labels.java b/uitest/src/com/vaadin/tests/components/label/Labels.java
index 1da588576b..1da588576b 100644
--- a/tests/testbench/com/vaadin/tests/components/label/Labels.java
+++ b/uitest/src/com/vaadin/tests/components/label/Labels.java
diff --git a/tests/testbench/com/vaadin/tests/components/label/MarginsInLabels.html b/uitest/src/com/vaadin/tests/components/label/MarginsInLabels.html
index 080200092d..080200092d 100644
--- a/tests/testbench/com/vaadin/tests/components/label/MarginsInLabels.html
+++ b/uitest/src/com/vaadin/tests/components/label/MarginsInLabels.html
diff --git a/tests/testbench/com/vaadin/tests/components/label/MarginsInLabels.java b/uitest/src/com/vaadin/tests/components/label/MarginsInLabels.java
index 060c937feb..060c937feb 100644
--- a/tests/testbench/com/vaadin/tests/components/label/MarginsInLabels.java
+++ b/uitest/src/com/vaadin/tests/components/label/MarginsInLabels.java
diff --git a/tests/testbench/com/vaadin/tests/components/link/LinkIcon.java b/uitest/src/com/vaadin/tests/components/link/LinkIcon.java
index 970c2f71c7..970c2f71c7 100644
--- a/tests/testbench/com/vaadin/tests/components/link/LinkIcon.java
+++ b/uitest/src/com/vaadin/tests/components/link/LinkIcon.java
diff --git a/tests/testbench/com/vaadin/tests/components/link/LinkTargetSize.java b/uitest/src/com/vaadin/tests/components/link/LinkTargetSize.java
index 822a8d5991..822a8d5991 100644
--- a/tests/testbench/com/vaadin/tests/components/link/LinkTargetSize.java
+++ b/uitest/src/com/vaadin/tests/components/link/LinkTargetSize.java
diff --git a/tests/testbench/com/vaadin/tests/components/link/LinkToPercentage.html b/uitest/src/com/vaadin/tests/components/link/LinkToPercentage.html
index 7dff317288..7dff317288 100644
--- a/tests/testbench/com/vaadin/tests/components/link/LinkToPercentage.html
+++ b/uitest/src/com/vaadin/tests/components/link/LinkToPercentage.html
diff --git a/tests/testbench/com/vaadin/tests/components/link/LinkToPercentage.java b/uitest/src/com/vaadin/tests/components/link/LinkToPercentage.java
index 770ff9895a..770ff9895a 100644
--- a/tests/testbench/com/vaadin/tests/components/link/LinkToPercentage.java
+++ b/uitest/src/com/vaadin/tests/components/link/LinkToPercentage.java
diff --git a/tests/testbench/com/vaadin/tests/components/listselect/ListSelectSelection.html b/uitest/src/com/vaadin/tests/components/listselect/ListSelectSelection.html
index 9820e044f7..9820e044f7 100644
--- a/tests/testbench/com/vaadin/tests/components/listselect/ListSelectSelection.html
+++ b/uitest/src/com/vaadin/tests/components/listselect/ListSelectSelection.html
diff --git a/tests/testbench/com/vaadin/tests/components/listselect/ListSelects.java b/uitest/src/com/vaadin/tests/components/listselect/ListSelects.java
index a3fa973bc2..a3fa973bc2 100644
--- a/tests/testbench/com/vaadin/tests/components/listselect/ListSelects.java
+++ b/uitest/src/com/vaadin/tests/components/listselect/ListSelects.java
diff --git a/tests/testbench/com/vaadin/tests/components/loginform/CustomizedLoginFormTest.html b/uitest/src/com/vaadin/tests/components/loginform/CustomizedLoginFormTest.html
index 5a2a0d839a..5a2a0d839a 100644
--- a/tests/testbench/com/vaadin/tests/components/loginform/CustomizedLoginFormTest.html
+++ b/uitest/src/com/vaadin/tests/components/loginform/CustomizedLoginFormTest.html
diff --git a/tests/testbench/com/vaadin/tests/components/loginform/CustomizedLoginFormTest.java b/uitest/src/com/vaadin/tests/components/loginform/CustomizedLoginFormTest.java
index 3fde281c20..3fde281c20 100644
--- a/tests/testbench/com/vaadin/tests/components/loginform/CustomizedLoginFormTest.java
+++ b/uitest/src/com/vaadin/tests/components/loginform/CustomizedLoginFormTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/loginform/LoginFormInIframe.html_disabled b/uitest/src/com/vaadin/tests/components/loginform/LoginFormInIframe.html_disabled
index 075bb3c57f..075bb3c57f 100644
--- a/tests/testbench/com/vaadin/tests/components/loginform/LoginFormInIframe.html_disabled
+++ b/uitest/src/com/vaadin/tests/components/loginform/LoginFormInIframe.html_disabled
diff --git a/tests/testbench/com/vaadin/tests/components/loginform/LoginFormTest.html b/uitest/src/com/vaadin/tests/components/loginform/LoginFormTest.html
index daaefab48c..daaefab48c 100644
--- a/tests/testbench/com/vaadin/tests/components/loginform/LoginFormTest.html
+++ b/uitest/src/com/vaadin/tests/components/loginform/LoginFormTest.html
diff --git a/tests/testbench/com/vaadin/tests/components/loginform/LoginFormTest.java b/uitest/src/com/vaadin/tests/components/loginform/LoginFormTest.java
index 629edc2130..629edc2130 100644
--- a/tests/testbench/com/vaadin/tests/components/loginform/LoginFormTest.java
+++ b/uitest/src/com/vaadin/tests/components/loginform/LoginFormTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/loginform/LoginFormUIInLoginHandler.html b/uitest/src/com/vaadin/tests/components/loginform/LoginFormUIInLoginHandler.html
index 9a80ce6013..9a80ce6013 100755
--- a/tests/testbench/com/vaadin/tests/components/loginform/LoginFormUIInLoginHandler.html
+++ b/uitest/src/com/vaadin/tests/components/loginform/LoginFormUIInLoginHandler.html
diff --git a/tests/testbench/com/vaadin/tests/components/loginform/LoginFormUIInLoginHandler.java b/uitest/src/com/vaadin/tests/components/loginform/LoginFormUIInLoginHandler.java
index b3ebb02751..b3ebb02751 100755
--- a/tests/testbench/com/vaadin/tests/components/loginform/LoginFormUIInLoginHandler.java
+++ b/uitest/src/com/vaadin/tests/components/loginform/LoginFormUIInLoginHandler.java
diff --git a/tests/testbench/com/vaadin/tests/components/loginform/LoginFormWithMultipleWindows.java b/uitest/src/com/vaadin/tests/components/loginform/LoginFormWithMultipleWindows.java
index ac4c3c8ea3..ac4c3c8ea3 100644
--- a/tests/testbench/com/vaadin/tests/components/loginform/LoginFormWithMultipleWindows.java
+++ b/uitest/src/com/vaadin/tests/components/loginform/LoginFormWithMultipleWindows.java
diff --git a/tests/testbench/com/vaadin/tests/components/media/Media.java b/uitest/src/com/vaadin/tests/components/media/Media.java
index 945285fbb4..945285fbb4 100644
--- a/tests/testbench/com/vaadin/tests/components/media/Media.java
+++ b/uitest/src/com/vaadin/tests/components/media/Media.java
diff --git a/tests/testbench/com/vaadin/tests/components/menubar/HiddenAndDisabledMenus.java b/uitest/src/com/vaadin/tests/components/menubar/HiddenAndDisabledMenus.java
index c303aaf5a9..c303aaf5a9 100644
--- a/tests/testbench/com/vaadin/tests/components/menubar/HiddenAndDisabledMenus.java
+++ b/uitest/src/com/vaadin/tests/components/menubar/HiddenAndDisabledMenus.java
diff --git a/tests/testbench/com/vaadin/tests/components/menubar/IconsInRootMenuBar.html b/uitest/src/com/vaadin/tests/components/menubar/IconsInRootMenuBar.html
index dfb74f9d34..dfb74f9d34 100644
--- a/tests/testbench/com/vaadin/tests/components/menubar/IconsInRootMenuBar.html
+++ b/uitest/src/com/vaadin/tests/components/menubar/IconsInRootMenuBar.html
diff --git a/tests/testbench/com/vaadin/tests/components/menubar/IconsInSubMenus.html b/uitest/src/com/vaadin/tests/components/menubar/IconsInSubMenus.html
index 87f6f7a65e..87f6f7a65e 100644
--- a/tests/testbench/com/vaadin/tests/components/menubar/IconsInSubMenus.html
+++ b/uitest/src/com/vaadin/tests/components/menubar/IconsInSubMenus.html
diff --git a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarHtmlItems.html b/uitest/src/com/vaadin/tests/components/menubar/MenuBarHtmlItems.html
index 2878018752..2878018752 100644
--- a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarHtmlItems.html
+++ b/uitest/src/com/vaadin/tests/components/menubar/MenuBarHtmlItems.html
diff --git a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarHtmlItems.java b/uitest/src/com/vaadin/tests/components/menubar/MenuBarHtmlItems.java
index d6e79224a3..d6e79224a3 100644
--- a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarHtmlItems.java
+++ b/uitest/src/com/vaadin/tests/components/menubar/MenuBarHtmlItems.java
diff --git a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarInSplitPanel.java b/uitest/src/com/vaadin/tests/components/menubar/MenuBarInSplitPanel.java
index 59aebd0bd7..59aebd0bd7 100644
--- a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarInSplitPanel.java
+++ b/uitest/src/com/vaadin/tests/components/menubar/MenuBarInSplitPanel.java
diff --git a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarItemsCheckable.html b/uitest/src/com/vaadin/tests/components/menubar/MenuBarItemsCheckable.html
index ebdfa81f20..ebdfa81f20 100644
--- a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarItemsCheckable.html
+++ b/uitest/src/com/vaadin/tests/components/menubar/MenuBarItemsCheckable.html
diff --git a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarLongMenus.html b/uitest/src/com/vaadin/tests/components/menubar/MenuBarLongMenus.html
index 7170a98325..7170a98325 100644
--- a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarLongMenus.html
+++ b/uitest/src/com/vaadin/tests/components/menubar/MenuBarLongMenus.html
diff --git a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarNavigation.java b/uitest/src/com/vaadin/tests/components/menubar/MenuBarNavigation.java
index 3af07645d6..3af07645d6 100644
--- a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarNavigation.java
+++ b/uitest/src/com/vaadin/tests/components/menubar/MenuBarNavigation.java
diff --git a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarNavigationKeyboard.html b/uitest/src/com/vaadin/tests/components/menubar/MenuBarNavigationKeyboard.html
index a3d7700dae..a3d7700dae 100644
--- a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarNavigationKeyboard.html
+++ b/uitest/src/com/vaadin/tests/components/menubar/MenuBarNavigationKeyboard.html
diff --git a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarNavigationMouse.html b/uitest/src/com/vaadin/tests/components/menubar/MenuBarNavigationMouse.html
index 421966876b..421966876b 100644
--- a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarNavigationMouse.html
+++ b/uitest/src/com/vaadin/tests/components/menubar/MenuBarNavigationMouse.html
diff --git a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarResize.html b/uitest/src/com/vaadin/tests/components/menubar/MenuBarResize.html
index 97006323a2..97006323a2 100644
--- a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarResize.html
+++ b/uitest/src/com/vaadin/tests/components/menubar/MenuBarResize.html
diff --git a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarRootItemSelectWithKeyboard.html b/uitest/src/com/vaadin/tests/components/menubar/MenuBarRootItemSelectWithKeyboard.html
index a53757a969..a53757a969 100644
--- a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarRootItemSelectWithKeyboard.html
+++ b/uitest/src/com/vaadin/tests/components/menubar/MenuBarRootItemSelectWithKeyboard.html
diff --git a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarRootItemSelectWithKeyboard.java b/uitest/src/com/vaadin/tests/components/menubar/MenuBarRootItemSelectWithKeyboard.java
index c093a61812..c093a61812 100644
--- a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarRootItemSelectWithKeyboard.java
+++ b/uitest/src/com/vaadin/tests/components/menubar/MenuBarRootItemSelectWithKeyboard.java
diff --git a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.html b/uitest/src/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.html
index 63f6ff7753..63f6ff7753 100644
--- a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.html
+++ b/uitest/src/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.html
diff --git a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.java b/uitest/src/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.java
index c88edf5bdc..c88edf5bdc 100644
--- a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.java
+++ b/uitest/src/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.java
diff --git a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarTest.java b/uitest/src/com/vaadin/tests/components/menubar/MenuBarTest.java
index 982b16c6e2..982b16c6e2 100644
--- a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarTest.java
+++ b/uitest/src/com/vaadin/tests/components/menubar/MenuBarTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarToolTips.html b/uitest/src/com/vaadin/tests/components/menubar/MenuBarToolTips.html
index f7c57baf1f..f7c57baf1f 100644
--- a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarToolTips.html
+++ b/uitest/src/com/vaadin/tests/components/menubar/MenuBarToolTips.html
diff --git a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarToolTips.java b/uitest/src/com/vaadin/tests/components/menubar/MenuBarToolTips.java
index 0ef31dc5dc..0ef31dc5dc 100644
--- a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarToolTips.java
+++ b/uitest/src/com/vaadin/tests/components/menubar/MenuBarToolTips.java
diff --git a/tests/testbench/com/vaadin/tests/components/menubar/Menubars.html b/uitest/src/com/vaadin/tests/components/menubar/Menubars.html
index 93d77f9f36..93d77f9f36 100644
--- a/tests/testbench/com/vaadin/tests/components/menubar/Menubars.html
+++ b/uitest/src/com/vaadin/tests/components/menubar/Menubars.html
diff --git a/tests/testbench/com/vaadin/tests/components/menubar/Menubars.java b/uitest/src/com/vaadin/tests/components/menubar/Menubars.java
index 40e566194a..40e566194a 100644
--- a/tests/testbench/com/vaadin/tests/components/menubar/Menubars.java
+++ b/uitest/src/com/vaadin/tests/components/menubar/Menubars.java
diff --git a/tests/testbench/com/vaadin/tests/components/nativebutton/NativeButtonDisableOnClick.html b/uitest/src/com/vaadin/tests/components/nativebutton/NativeButtonDisableOnClick.html
index 5f80004c7c..5f80004c7c 100644
--- a/tests/testbench/com/vaadin/tests/components/nativebutton/NativeButtonDisableOnClick.html
+++ b/uitest/src/com/vaadin/tests/components/nativebutton/NativeButtonDisableOnClick.html
diff --git a/tests/testbench/com/vaadin/tests/components/nativebutton/NativeButtonHtml.html b/uitest/src/com/vaadin/tests/components/nativebutton/NativeButtonHtml.html
index 8a1b21c35d..8a1b21c35d 100644
--- a/tests/testbench/com/vaadin/tests/components/nativebutton/NativeButtonHtml.html
+++ b/uitest/src/com/vaadin/tests/components/nativebutton/NativeButtonHtml.html
diff --git a/tests/testbench/com/vaadin/tests/components/nativebutton/NativeButtonHtml.java b/uitest/src/com/vaadin/tests/components/nativebutton/NativeButtonHtml.java
index 94023db2d0..94023db2d0 100644
--- a/tests/testbench/com/vaadin/tests/components/nativebutton/NativeButtonHtml.java
+++ b/uitest/src/com/vaadin/tests/components/nativebutton/NativeButtonHtml.java
diff --git a/tests/testbench/com/vaadin/tests/components/nativebutton/NativeButtonTest.java b/uitest/src/com/vaadin/tests/components/nativebutton/NativeButtonTest.java
index 7b1e75a3da..7b1e75a3da 100644
--- a/tests/testbench/com/vaadin/tests/components/nativebutton/NativeButtonTest.java
+++ b/uitest/src/com/vaadin/tests/components/nativebutton/NativeButtonTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/nativeselect/NativeSelects.java b/uitest/src/com/vaadin/tests/components/nativeselect/NativeSelects.java
index 80b088f03a..80b088f03a 100644
--- a/tests/testbench/com/vaadin/tests/components/nativeselect/NativeSelects.java
+++ b/uitest/src/com/vaadin/tests/components/nativeselect/NativeSelects.java
diff --git a/tests/testbench/com/vaadin/tests/components/notification/CloseErrorNotificationWithEscape.html b/uitest/src/com/vaadin/tests/components/notification/CloseErrorNotificationWithEscape.html
index 1ab75e1176..1ab75e1176 100644
--- a/tests/testbench/com/vaadin/tests/components/notification/CloseErrorNotificationWithEscape.html
+++ b/uitest/src/com/vaadin/tests/components/notification/CloseErrorNotificationWithEscape.html
diff --git a/tests/testbench/com/vaadin/tests/components/notification/Notifications.html b/uitest/src/com/vaadin/tests/components/notification/Notifications.html
index c9016cfd6f..c9016cfd6f 100644
--- a/tests/testbench/com/vaadin/tests/components/notification/Notifications.html
+++ b/uitest/src/com/vaadin/tests/components/notification/Notifications.html
diff --git a/tests/testbench/com/vaadin/tests/components/notification/Notifications.java b/uitest/src/com/vaadin/tests/components/notification/Notifications.java
index 10fef434ca..10fef434ca 100644
--- a/tests/testbench/com/vaadin/tests/components/notification/Notifications.java
+++ b/uitest/src/com/vaadin/tests/components/notification/Notifications.java
diff --git a/tests/testbench/com/vaadin/tests/components/notification/NotificationsAndModalWindow.html b/uitest/src/com/vaadin/tests/components/notification/NotificationsAndModalWindow.html
index 35d22da46e..35d22da46e 100644
--- a/tests/testbench/com/vaadin/tests/components/notification/NotificationsAndModalWindow.html
+++ b/uitest/src/com/vaadin/tests/components/notification/NotificationsAndModalWindow.html
diff --git a/tests/testbench/com/vaadin/tests/components/notification/NotificationsAndModalWindow.java b/uitest/src/com/vaadin/tests/components/notification/NotificationsAndModalWindow.java
index 25bc05c771..25bc05c771 100644
--- a/tests/testbench/com/vaadin/tests/components/notification/NotificationsAndModalWindow.java
+++ b/uitest/src/com/vaadin/tests/components/notification/NotificationsAndModalWindow.java
diff --git a/tests/testbench/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.html b/uitest/src/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.html
index 455952fb71..455952fb71 100644
--- a/tests/testbench/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.html
+++ b/uitest/src/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.html
diff --git a/tests/testbench/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.java b/uitest/src/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.java
index 89e97c0b6a..89e97c0b6a 100644
--- a/tests/testbench/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.java
+++ b/uitest/src/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.java
diff --git a/tests/testbench/com/vaadin/tests/components/notification/SemiTransparentNotification.java b/uitest/src/com/vaadin/tests/components/notification/SemiTransparentNotification.java
index 1745c11982..1745c11982 100755
--- a/tests/testbench/com/vaadin/tests/components/notification/SemiTransparentNotification.java
+++ b/uitest/src/com/vaadin/tests/components/notification/SemiTransparentNotification.java
diff --git a/tests/testbench/com/vaadin/tests/components/notification/SemitransparentNotification.html b/uitest/src/com/vaadin/tests/components/notification/SemitransparentNotification.html
index f125b98ee1..f125b98ee1 100755
--- a/tests/testbench/com/vaadin/tests/components/notification/SemitransparentNotification.html
+++ b/uitest/src/com/vaadin/tests/components/notification/SemitransparentNotification.html
diff --git a/tests/testbench/com/vaadin/tests/components/optiongroup/DisabledOptionGroupItems.html b/uitest/src/com/vaadin/tests/components/optiongroup/DisabledOptionGroupItems.html
index 01c033e4fa..01c033e4fa 100644
--- a/tests/testbench/com/vaadin/tests/components/optiongroup/DisabledOptionGroupItems.html
+++ b/uitest/src/com/vaadin/tests/components/optiongroup/DisabledOptionGroupItems.html
diff --git a/tests/testbench/com/vaadin/tests/components/optiongroup/DisabledOptionGroupItems.java b/uitest/src/com/vaadin/tests/components/optiongroup/DisabledOptionGroupItems.java
index 877f9aa675..877f9aa675 100644
--- a/tests/testbench/com/vaadin/tests/components/optiongroup/DisabledOptionGroupItems.java
+++ b/uitest/src/com/vaadin/tests/components/optiongroup/DisabledOptionGroupItems.java
diff --git a/tests/testbench/com/vaadin/tests/components/optiongroup/HtmlOptionGroupItems.html b/uitest/src/com/vaadin/tests/components/optiongroup/HtmlOptionGroupItems.html
index d74354299d..d74354299d 100644
--- a/tests/testbench/com/vaadin/tests/components/optiongroup/HtmlOptionGroupItems.html
+++ b/uitest/src/com/vaadin/tests/components/optiongroup/HtmlOptionGroupItems.html
diff --git a/tests/testbench/com/vaadin/tests/components/optiongroup/HtmlOptionGroupItems.java b/uitest/src/com/vaadin/tests/components/optiongroup/HtmlOptionGroupItems.java
index 179d1aa5ff..179d1aa5ff 100644
--- a/tests/testbench/com/vaadin/tests/components/optiongroup/HtmlOptionGroupItems.java
+++ b/uitest/src/com/vaadin/tests/components/optiongroup/HtmlOptionGroupItems.java
diff --git a/tests/testbench/com/vaadin/tests/components/optiongroup/OptionGroupItemIcons.html b/uitest/src/com/vaadin/tests/components/optiongroup/OptionGroupItemIcons.html
index 978d911a2d..978d911a2d 100644
--- a/tests/testbench/com/vaadin/tests/components/optiongroup/OptionGroupItemIcons.html
+++ b/uitest/src/com/vaadin/tests/components/optiongroup/OptionGroupItemIcons.html
diff --git a/tests/testbench/com/vaadin/tests/components/optiongroup/OptionGroupMultipleValueChange.java b/uitest/src/com/vaadin/tests/components/optiongroup/OptionGroupMultipleValueChange.java
index 213258ed29..213258ed29 100644
--- a/tests/testbench/com/vaadin/tests/components/optiongroup/OptionGroupMultipleValueChange.java
+++ b/uitest/src/com/vaadin/tests/components/optiongroup/OptionGroupMultipleValueChange.java
diff --git a/tests/testbench/com/vaadin/tests/components/optiongroup/OptionGroups.java b/uitest/src/com/vaadin/tests/components/optiongroup/OptionGroups.java
index c4c588d1ea..c4c588d1ea 100644
--- a/tests/testbench/com/vaadin/tests/components/optiongroup/OptionGroups.java
+++ b/uitest/src/com/vaadin/tests/components/optiongroup/OptionGroups.java
diff --git a/tests/testbench/com/vaadin/tests/components/orderedlayout/HorizontalLayoutTest.java b/uitest/src/com/vaadin/tests/components/orderedlayout/HorizontalLayoutTest.java
index fd6ecf5422..fd6ecf5422 100644
--- a/tests/testbench/com/vaadin/tests/components/orderedlayout/HorizontalLayoutTest.java
+++ b/uitest/src/com/vaadin/tests/components/orderedlayout/HorizontalLayoutTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/orderedlayout/LayoutClickListenerTest.html b/uitest/src/com/vaadin/tests/components/orderedlayout/LayoutClickListenerTest.html
index f0fd1568b1..f0fd1568b1 100644
--- a/tests/testbench/com/vaadin/tests/components/orderedlayout/LayoutClickListenerTest.html
+++ b/uitest/src/com/vaadin/tests/components/orderedlayout/LayoutClickListenerTest.html
diff --git a/tests/testbench/com/vaadin/tests/components/orderedlayout/LayoutClickListenerTest.java b/uitest/src/com/vaadin/tests/components/orderedlayout/LayoutClickListenerTest.java
index 821a5dbb93..821a5dbb93 100644
--- a/tests/testbench/com/vaadin/tests/components/orderedlayout/LayoutClickListenerTest.java
+++ b/uitest/src/com/vaadin/tests/components/orderedlayout/LayoutClickListenerTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/orderedlayout/LayoutResizeTest.java b/uitest/src/com/vaadin/tests/components/orderedlayout/LayoutResizeTest.java
index 4122bd626a..4122bd626a 100644
--- a/tests/testbench/com/vaadin/tests/components/orderedlayout/LayoutResizeTest.java
+++ b/uitest/src/com/vaadin/tests/components/orderedlayout/LayoutResizeTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.html b/uitest/src/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.html
index 9e1400521b..9e1400521b 100644
--- a/tests/testbench/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.html
+++ b/uitest/src/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.html
diff --git a/tests/testbench/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java b/uitest/src/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java
index 864ca2e6da..864ca2e6da 100644
--- a/tests/testbench/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java
+++ b/uitest/src/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java
diff --git a/tests/testbench/com/vaadin/tests/components/orderedlayout/ReplaceComponentNPE.html b/uitest/src/com/vaadin/tests/components/orderedlayout/ReplaceComponentNPE.html
index 7a071030dc..7a071030dc 100644
--- a/tests/testbench/com/vaadin/tests/components/orderedlayout/ReplaceComponentNPE.html
+++ b/uitest/src/com/vaadin/tests/components/orderedlayout/ReplaceComponentNPE.html
diff --git a/tests/testbench/com/vaadin/tests/components/orderedlayout/ReplaceComponentNPE.java b/uitest/src/com/vaadin/tests/components/orderedlayout/ReplaceComponentNPE.java
index a18400ce08..a18400ce08 100644
--- a/tests/testbench/com/vaadin/tests/components/orderedlayout/ReplaceComponentNPE.java
+++ b/uitest/src/com/vaadin/tests/components/orderedlayout/ReplaceComponentNPE.java
diff --git a/tests/testbench/com/vaadin/tests/components/orderedlayout/VerticalLayoutChangingChildrenSizes.html b/uitest/src/com/vaadin/tests/components/orderedlayout/VerticalLayoutChangingChildrenSizes.html
index 8b6a8d7d26..8b6a8d7d26 100644
--- a/tests/testbench/com/vaadin/tests/components/orderedlayout/VerticalLayoutChangingChildrenSizes.html
+++ b/uitest/src/com/vaadin/tests/components/orderedlayout/VerticalLayoutChangingChildrenSizes.html
diff --git a/tests/testbench/com/vaadin/tests/components/orderedlayout/VerticalLayoutTest.java b/uitest/src/com/vaadin/tests/components/orderedlayout/VerticalLayoutTest.java
index 2298364c3f..2298364c3f 100644
--- a/tests/testbench/com/vaadin/tests/components/orderedlayout/VerticalLayoutTest.java
+++ b/uitest/src/com/vaadin/tests/components/orderedlayout/VerticalLayoutTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/orderedlayout/VerticalLayoutWidthCalculation.html b/uitest/src/com/vaadin/tests/components/orderedlayout/VerticalLayoutWidthCalculation.html
index f0d837d97a..f0d837d97a 100644
--- a/tests/testbench/com/vaadin/tests/components/orderedlayout/VerticalLayoutWidthCalculation.html
+++ b/uitest/src/com/vaadin/tests/components/orderedlayout/VerticalLayoutWidthCalculation.html
diff --git a/tests/testbench/com/vaadin/tests/components/orderedlayout/VerticalLayoutWidthCalculation.java b/uitest/src/com/vaadin/tests/components/orderedlayout/VerticalLayoutWidthCalculation.java
index bc76a0c0ce..bc76a0c0ce 100644
--- a/tests/testbench/com/vaadin/tests/components/orderedlayout/VerticalLayoutWidthCalculation.java
+++ b/uitest/src/com/vaadin/tests/components/orderedlayout/VerticalLayoutWidthCalculation.java
diff --git a/tests/testbench/com/vaadin/tests/components/panel/BasicPanelTest.java b/uitest/src/com/vaadin/tests/components/panel/BasicPanelTest.java
index b3eac5c82e..b3eac5c82e 100644
--- a/tests/testbench/com/vaadin/tests/components/panel/BasicPanelTest.java
+++ b/uitest/src/com/vaadin/tests/components/panel/BasicPanelTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/panel/PanelChangeContents.html b/uitest/src/com/vaadin/tests/components/panel/PanelChangeContents.html
index bff19c4846..bff19c4846 100644
--- a/tests/testbench/com/vaadin/tests/components/panel/PanelChangeContents.html
+++ b/uitest/src/com/vaadin/tests/components/panel/PanelChangeContents.html
diff --git a/tests/testbench/com/vaadin/tests/components/panel/PanelChangeContents.java b/uitest/src/com/vaadin/tests/components/panel/PanelChangeContents.java
index fd96b08cfb..fd96b08cfb 100644
--- a/tests/testbench/com/vaadin/tests/components/panel/PanelChangeContents.java
+++ b/uitest/src/com/vaadin/tests/components/panel/PanelChangeContents.java
diff --git a/tests/testbench/com/vaadin/tests/components/panel/PanelClickListenerRelativeCoordinates.html b/uitest/src/com/vaadin/tests/components/panel/PanelClickListenerRelativeCoordinates.html
index 4b71c5a9a9..4b71c5a9a9 100644
--- a/tests/testbench/com/vaadin/tests/components/panel/PanelClickListenerRelativeCoordinates.html
+++ b/uitest/src/com/vaadin/tests/components/panel/PanelClickListenerRelativeCoordinates.html
diff --git a/tests/testbench/com/vaadin/tests/components/panel/PanelClickListenerRelativeCoordinates.java b/uitest/src/com/vaadin/tests/components/panel/PanelClickListenerRelativeCoordinates.java
index 40f6d5ea33..40f6d5ea33 100644
--- a/tests/testbench/com/vaadin/tests/components/panel/PanelClickListenerRelativeCoordinates.java
+++ b/uitest/src/com/vaadin/tests/components/panel/PanelClickListenerRelativeCoordinates.java
diff --git a/tests/testbench/com/vaadin/tests/components/panel/PanelShouldNotScroll.html b/uitest/src/com/vaadin/tests/components/panel/PanelShouldNotScroll.html
index 8b03ca330f..8b03ca330f 100644
--- a/tests/testbench/com/vaadin/tests/components/panel/PanelShouldNotScroll.html
+++ b/uitest/src/com/vaadin/tests/components/panel/PanelShouldNotScroll.html
diff --git a/tests/testbench/com/vaadin/tests/components/panel/PanelShouldNotScroll.java b/uitest/src/com/vaadin/tests/components/panel/PanelShouldNotScroll.java
index a4cba89732..a4cba89732 100644
--- a/tests/testbench/com/vaadin/tests/components/panel/PanelShouldNotScroll.java
+++ b/uitest/src/com/vaadin/tests/components/panel/PanelShouldNotScroll.java
diff --git a/tests/testbench/com/vaadin/tests/components/panel/PanelShouldRemoveActionHandler.java b/uitest/src/com/vaadin/tests/components/panel/PanelShouldRemoveActionHandler.java
index 5ca5c5135f..5ca5c5135f 100644
--- a/tests/testbench/com/vaadin/tests/components/panel/PanelShouldRemoveActionHandler.java
+++ b/uitest/src/com/vaadin/tests/components/panel/PanelShouldRemoveActionHandler.java
diff --git a/tests/testbench/com/vaadin/tests/components/panel/PanelTest.java b/uitest/src/com/vaadin/tests/components/panel/PanelTest.java
index 29d93ce86c..29d93ce86c 100644
--- a/tests/testbench/com/vaadin/tests/components/panel/PanelTest.java
+++ b/uitest/src/com/vaadin/tests/components/panel/PanelTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/passwordfield/PasswordFieldBasicStates.html b/uitest/src/com/vaadin/tests/components/passwordfield/PasswordFieldBasicStates.html
index ed671c9104..ed671c9104 100644
--- a/tests/testbench/com/vaadin/tests/components/passwordfield/PasswordFieldBasicStates.html
+++ b/uitest/src/com/vaadin/tests/components/passwordfield/PasswordFieldBasicStates.html
diff --git a/tests/testbench/com/vaadin/tests/components/passwordfield/PasswordFieldTest.java b/uitest/src/com/vaadin/tests/components/passwordfield/PasswordFieldTest.java
index a256438494..a256438494 100644
--- a/tests/testbench/com/vaadin/tests/components/passwordfield/PasswordFieldTest.java
+++ b/uitest/src/com/vaadin/tests/components/passwordfield/PasswordFieldTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/popupview/PopupViewClickShortcut.html b/uitest/src/com/vaadin/tests/components/popupview/PopupViewClickShortcut.html
index c52bfa634d..c52bfa634d 100644
--- a/tests/testbench/com/vaadin/tests/components/popupview/PopupViewClickShortcut.html
+++ b/uitest/src/com/vaadin/tests/components/popupview/PopupViewClickShortcut.html
diff --git a/tests/testbench/com/vaadin/tests/components/popupview/PopupViewClickShortcut.java b/uitest/src/com/vaadin/tests/components/popupview/PopupViewClickShortcut.java
index ba4fe93b68..ba4fe93b68 100644
--- a/tests/testbench/com/vaadin/tests/components/popupview/PopupViewClickShortcut.java
+++ b/uitest/src/com/vaadin/tests/components/popupview/PopupViewClickShortcut.java
diff --git a/tests/testbench/com/vaadin/tests/components/popupview/PopupViewLabelResized.java b/uitest/src/com/vaadin/tests/components/popupview/PopupViewLabelResized.java
index 2776c63e9f..2776c63e9f 100644
--- a/tests/testbench/com/vaadin/tests/components/popupview/PopupViewLabelResized.java
+++ b/uitest/src/com/vaadin/tests/components/popupview/PopupViewLabelResized.java
diff --git a/tests/testbench/com/vaadin/tests/components/popupview/PopupViewNullValues.java b/uitest/src/com/vaadin/tests/components/popupview/PopupViewNullValues.java
index 75f95977bd..75f95977bd 100644
--- a/tests/testbench/com/vaadin/tests/components/popupview/PopupViewNullValues.java
+++ b/uitest/src/com/vaadin/tests/components/popupview/PopupViewNullValues.java
diff --git a/tests/testbench/com/vaadin/tests/components/popupview/PopupViewOffScreen.html b/uitest/src/com/vaadin/tests/components/popupview/PopupViewOffScreen.html
index 99ee864179..99ee864179 100644
--- a/tests/testbench/com/vaadin/tests/components/popupview/PopupViewOffScreen.html
+++ b/uitest/src/com/vaadin/tests/components/popupview/PopupViewOffScreen.html
diff --git a/tests/testbench/com/vaadin/tests/components/popupview/PopupViewOffScreen.java b/uitest/src/com/vaadin/tests/components/popupview/PopupViewOffScreen.java
index 01ed34a13f..01ed34a13f 100644
--- a/tests/testbench/com/vaadin/tests/components/popupview/PopupViewOffScreen.java
+++ b/uitest/src/com/vaadin/tests/components/popupview/PopupViewOffScreen.java
diff --git a/tests/testbench/com/vaadin/tests/components/popupview/PopupViewShouldCloseOnTabOut.html b/uitest/src/com/vaadin/tests/components/popupview/PopupViewShouldCloseOnTabOut.html
index fb62215f16..fb62215f16 100644
--- a/tests/testbench/com/vaadin/tests/components/popupview/PopupViewShouldCloseOnTabOut.html
+++ b/uitest/src/com/vaadin/tests/components/popupview/PopupViewShouldCloseOnTabOut.html
diff --git a/tests/testbench/com/vaadin/tests/components/popupview/PopupViewShouldCloseOnTabOut.java b/uitest/src/com/vaadin/tests/components/popupview/PopupViewShouldCloseOnTabOut.java
index 271a7eea2a..271a7eea2a 100644
--- a/tests/testbench/com/vaadin/tests/components/popupview/PopupViewShouldCloseOnTabOut.java
+++ b/uitest/src/com/vaadin/tests/components/popupview/PopupViewShouldCloseOnTabOut.java
diff --git a/tests/testbench/com/vaadin/tests/components/popupview/PopupViewWithRTE.java b/uitest/src/com/vaadin/tests/components/popupview/PopupViewWithRTE.java
index 069ccef2bb..069ccef2bb 100644
--- a/tests/testbench/com/vaadin/tests/components/popupview/PopupViewWithRTE.java
+++ b/uitest/src/com/vaadin/tests/components/popupview/PopupViewWithRTE.java
diff --git a/tests/testbench/com/vaadin/tests/components/popupview/ReopenPopupView.html b/uitest/src/com/vaadin/tests/components/popupview/ReopenPopupView.html
index a8d1407005..a8d1407005 100644
--- a/tests/testbench/com/vaadin/tests/components/popupview/ReopenPopupView.html
+++ b/uitest/src/com/vaadin/tests/components/popupview/ReopenPopupView.html
diff --git a/tests/testbench/com/vaadin/tests/components/popupview/ReopenPopupView.java b/uitest/src/com/vaadin/tests/components/popupview/ReopenPopupView.java
index d755f5961e..d755f5961e 100644
--- a/tests/testbench/com/vaadin/tests/components/popupview/ReopenPopupView.java
+++ b/uitest/src/com/vaadin/tests/components/popupview/ReopenPopupView.java
diff --git a/tests/testbench/com/vaadin/tests/components/progressindicator/ProgressIndicatorInvisible.java b/uitest/src/com/vaadin/tests/components/progressindicator/ProgressIndicatorInvisible.java
index 9f632ac806..9f632ac806 100644
--- a/tests/testbench/com/vaadin/tests/components/progressindicator/ProgressIndicatorInvisible.java
+++ b/uitest/src/com/vaadin/tests/components/progressindicator/ProgressIndicatorInvisible.java
diff --git a/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaScrolling.html b/uitest/src/com/vaadin/tests/components/richtextarea/RichTextAreaScrolling.html
index be1c5a2cde..be1c5a2cde 100644
--- a/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaScrolling.html
+++ b/uitest/src/com/vaadin/tests/components/richtextarea/RichTextAreaScrolling.html
diff --git a/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaScrolling.java b/uitest/src/com/vaadin/tests/components/richtextarea/RichTextAreaScrolling.java
index f88ed0c67c..f88ed0c67c 100644
--- a/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaScrolling.java
+++ b/uitest/src/com/vaadin/tests/components/richtextarea/RichTextAreaScrolling.java
diff --git a/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaSize.html b/uitest/src/com/vaadin/tests/components/richtextarea/RichTextAreaSize.html
index 7708c88e54..7708c88e54 100644
--- a/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaSize.html
+++ b/uitest/src/com/vaadin/tests/components/richtextarea/RichTextAreaSize.html
diff --git a/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaSize.java b/uitest/src/com/vaadin/tests/components/richtextarea/RichTextAreaSize.java
index 934f2ed2dd..934f2ed2dd 100644
--- a/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaSize.java
+++ b/uitest/src/com/vaadin/tests/components/richtextarea/RichTextAreaSize.java
diff --git a/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaTest.java b/uitest/src/com/vaadin/tests/components/richtextarea/RichTextAreaTest.java
index 4155dd8a07..4155dd8a07 100644
--- a/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaTest.java
+++ b/uitest/src/com/vaadin/tests/components/richtextarea/RichTextAreaTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaWithKeyboardShortcuts.java b/uitest/src/com/vaadin/tests/components/richtextarea/RichTextAreaWithKeyboardShortcuts.java
index e775bf6aca..e775bf6aca 100644
--- a/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaWithKeyboardShortcuts.java
+++ b/uitest/src/com/vaadin/tests/components/richtextarea/RichTextAreaWithKeyboardShortcuts.java
diff --git a/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreas.html b/uitest/src/com/vaadin/tests/components/richtextarea/RichTextAreas.html
index 7d96b4185f..7d96b4185f 100644
--- a/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreas.html
+++ b/uitest/src/com/vaadin/tests/components/richtextarea/RichTextAreas.html
diff --git a/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreas.java b/uitest/src/com/vaadin/tests/components/richtextarea/RichTextAreas.java
index 8585d19bc2..8585d19bc2 100644
--- a/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreas.java
+++ b/uitest/src/com/vaadin/tests/components/richtextarea/RichTextAreas.java
diff --git a/tests/testbench/com/vaadin/tests/components/select/AbstractSelectTestCase.java b/uitest/src/com/vaadin/tests/components/select/AbstractSelectTestCase.java
index b0c6c08a62..b0c6c08a62 100644
--- a/tests/testbench/com/vaadin/tests/components/select/AbstractSelectTestCase.java
+++ b/uitest/src/com/vaadin/tests/components/select/AbstractSelectTestCase.java
diff --git a/tests/testbench/com/vaadin/tests/components/select/ComboBoxAddWhileFiltering.java b/uitest/src/com/vaadin/tests/components/select/ComboBoxAddWhileFiltering.java
index 470c97442f..470c97442f 100644
--- a/tests/testbench/com/vaadin/tests/components/select/ComboBoxAddWhileFiltering.java
+++ b/uitest/src/com/vaadin/tests/components/select/ComboBoxAddWhileFiltering.java
diff --git a/tests/testbench/com/vaadin/tests/components/select/FocusListenerBreaksDropdownMenu.java b/uitest/src/com/vaadin/tests/components/select/FocusListenerBreaksDropdownMenu.java
index 6f203bf8c9..6f203bf8c9 100644
--- a/tests/testbench/com/vaadin/tests/components/select/FocusListenerBreaksDropdownMenu.java
+++ b/uitest/src/com/vaadin/tests/components/select/FocusListenerBreaksDropdownMenu.java
diff --git a/tests/testbench/com/vaadin/tests/components/select/NativeSelects.html b/uitest/src/com/vaadin/tests/components/select/NativeSelects.html
index f9ab8eb3a0..f9ab8eb3a0 100644
--- a/tests/testbench/com/vaadin/tests/components/select/NativeSelects.html
+++ b/uitest/src/com/vaadin/tests/components/select/NativeSelects.html
diff --git a/tests/testbench/com/vaadin/tests/components/select/NativeSelects.java b/uitest/src/com/vaadin/tests/components/select/NativeSelects.java
index 75a3f1b751..75a3f1b751 100644
--- a/tests/testbench/com/vaadin/tests/components/select/NativeSelects.java
+++ b/uitest/src/com/vaadin/tests/components/select/NativeSelects.java
diff --git a/tests/testbench/com/vaadin/tests/components/select/NullSelectionItemId.java b/uitest/src/com/vaadin/tests/components/select/NullSelectionItemId.java
index 984bab5b34..984bab5b34 100644
--- a/tests/testbench/com/vaadin/tests/components/select/NullSelectionItemId.java
+++ b/uitest/src/com/vaadin/tests/components/select/NullSelectionItemId.java
diff --git a/tests/testbench/com/vaadin/tests/components/select/SelectDisplaysOldValue.html b/uitest/src/com/vaadin/tests/components/select/SelectDisplaysOldValue.html
index 122e90e140..122e90e140 100644
--- a/tests/testbench/com/vaadin/tests/components/select/SelectDisplaysOldValue.html
+++ b/uitest/src/com/vaadin/tests/components/select/SelectDisplaysOldValue.html
diff --git a/tests/testbench/com/vaadin/tests/components/select/SelectDisplaysOldValue.java b/uitest/src/com/vaadin/tests/components/select/SelectDisplaysOldValue.java
index 77c187ff60..77c187ff60 100644
--- a/tests/testbench/com/vaadin/tests/components/select/SelectDisplaysOldValue.java
+++ b/uitest/src/com/vaadin/tests/components/select/SelectDisplaysOldValue.java
diff --git a/tests/testbench/com/vaadin/tests/components/select/SelectIconPlacement.html b/uitest/src/com/vaadin/tests/components/select/SelectIconPlacement.html
index 90e2e293a3..90e2e293a3 100644
--- a/tests/testbench/com/vaadin/tests/components/select/SelectIconPlacement.html
+++ b/uitest/src/com/vaadin/tests/components/select/SelectIconPlacement.html
diff --git a/tests/testbench/com/vaadin/tests/components/select/SelectIconPlacement.java b/uitest/src/com/vaadin/tests/components/select/SelectIconPlacement.java
index 0cba74b941..0cba74b941 100644
--- a/tests/testbench/com/vaadin/tests/components/select/SelectIconPlacement.java
+++ b/uitest/src/com/vaadin/tests/components/select/SelectIconPlacement.java
diff --git a/tests/testbench/com/vaadin/tests/components/select/SelectTest.java b/uitest/src/com/vaadin/tests/components/select/SelectTest.java
index f19e7ecad2..f19e7ecad2 100644
--- a/tests/testbench/com/vaadin/tests/components/select/SelectTest.java
+++ b/uitest/src/com/vaadin/tests/components/select/SelectTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/select/StylingPopupOpener.html b/uitest/src/com/vaadin/tests/components/select/StylingPopupOpener.html
index 48adf2edfe..48adf2edfe 100644
--- a/tests/testbench/com/vaadin/tests/components/select/StylingPopupOpener.html
+++ b/uitest/src/com/vaadin/tests/components/select/StylingPopupOpener.html
diff --git a/tests/testbench/com/vaadin/tests/components/select/StylingPopupOpener.java b/uitest/src/com/vaadin/tests/components/select/StylingPopupOpener.java
index b97231ae8e..b97231ae8e 100644
--- a/tests/testbench/com/vaadin/tests/components/select/StylingPopupOpener.java
+++ b/uitest/src/com/vaadin/tests/components/select/StylingPopupOpener.java
diff --git a/tests/testbench/com/vaadin/tests/components/select/TwinColSelectCaptionStyles.html b/uitest/src/com/vaadin/tests/components/select/TwinColSelectCaptionStyles.html
index c2b55a5229..c2b55a5229 100644
--- a/tests/testbench/com/vaadin/tests/components/select/TwinColSelectCaptionStyles.html
+++ b/uitest/src/com/vaadin/tests/components/select/TwinColSelectCaptionStyles.html
diff --git a/tests/testbench/com/vaadin/tests/components/select/TwinColSelectCaptionStyles.java b/uitest/src/com/vaadin/tests/components/select/TwinColSelectCaptionStyles.java
index 789174260f..789174260f 100644
--- a/tests/testbench/com/vaadin/tests/components/select/TwinColSelectCaptionStyles.java
+++ b/uitest/src/com/vaadin/tests/components/select/TwinColSelectCaptionStyles.java
diff --git a/tests/testbench/com/vaadin/tests/components/select/TwinColSelectDualCaptions.html b/uitest/src/com/vaadin/tests/components/select/TwinColSelectDualCaptions.html
index bdb7121675..bdb7121675 100644
--- a/tests/testbench/com/vaadin/tests/components/select/TwinColSelectDualCaptions.html
+++ b/uitest/src/com/vaadin/tests/components/select/TwinColSelectDualCaptions.html
diff --git a/tests/testbench/com/vaadin/tests/components/select/TwinColSelectTest.java b/uitest/src/com/vaadin/tests/components/select/TwinColSelectTest.java
index b27dfa0ec8..b27dfa0ec8 100644
--- a/tests/testbench/com/vaadin/tests/components/select/TwinColSelectTest.java
+++ b/uitest/src/com/vaadin/tests/components/select/TwinColSelectTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/select/TwinColSelects.java b/uitest/src/com/vaadin/tests/components/select/TwinColSelects.java
index 64b3d37c0d..64b3d37c0d 100644
--- a/tests/testbench/com/vaadin/tests/components/select/TwinColSelects.java
+++ b/uitest/src/com/vaadin/tests/components/select/TwinColSelects.java
diff --git a/tests/testbench/com/vaadin/tests/components/select/TwinColSelectsDisabledReadonly.html b/uitest/src/com/vaadin/tests/components/select/TwinColSelectsDisabledReadonly.html
index aa217d97cf..aa217d97cf 100644
--- a/tests/testbench/com/vaadin/tests/components/select/TwinColSelectsDisabledReadonly.html
+++ b/uitest/src/com/vaadin/tests/components/select/TwinColSelectsDisabledReadonly.html
diff --git a/tests/testbench/com/vaadin/tests/components/slider/SliderKeyboardFocus.html b/uitest/src/com/vaadin/tests/components/slider/SliderKeyboardFocus.html
index 0521506418..0521506418 100644
--- a/tests/testbench/com/vaadin/tests/components/slider/SliderKeyboardFocus.html
+++ b/uitest/src/com/vaadin/tests/components/slider/SliderKeyboardFocus.html
diff --git a/tests/testbench/com/vaadin/tests/components/slider/SliderKeyboardFocus.java b/uitest/src/com/vaadin/tests/components/slider/SliderKeyboardFocus.java
index fe9450a0f0..fe9450a0f0 100644
--- a/tests/testbench/com/vaadin/tests/components/slider/SliderKeyboardFocus.java
+++ b/uitest/src/com/vaadin/tests/components/slider/SliderKeyboardFocus.java
diff --git a/tests/testbench/com/vaadin/tests/components/slider/SliderOrientation.html b/uitest/src/com/vaadin/tests/components/slider/SliderOrientation.html
index 174ddca016..174ddca016 100644
--- a/tests/testbench/com/vaadin/tests/components/slider/SliderOrientation.html
+++ b/uitest/src/com/vaadin/tests/components/slider/SliderOrientation.html
diff --git a/tests/testbench/com/vaadin/tests/components/slider/SliderTest.java b/uitest/src/com/vaadin/tests/components/slider/SliderTest.java
index 0b9c2d6c5a..0b9c2d6c5a 100644
--- a/tests/testbench/com/vaadin/tests/components/slider/SliderTest.java
+++ b/uitest/src/com/vaadin/tests/components/slider/SliderTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/slider/SliderTooltip.html b/uitest/src/com/vaadin/tests/components/slider/SliderTooltip.html
index 4e8296050f..4e8296050f 100644
--- a/tests/testbench/com/vaadin/tests/components/slider/SliderTooltip.html
+++ b/uitest/src/com/vaadin/tests/components/slider/SliderTooltip.html
diff --git a/tests/testbench/com/vaadin/tests/components/splitpanel/AbstractSplitPanelTest.java b/uitest/src/com/vaadin/tests/components/splitpanel/AbstractSplitPanelTest.java
index 7c0648876b..7c0648876b 100644
--- a/tests/testbench/com/vaadin/tests/components/splitpanel/AbstractSplitPanelTest.java
+++ b/uitest/src/com/vaadin/tests/components/splitpanel/AbstractSplitPanelTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelBasicStates.html b/uitest/src/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelBasicStates.html
index 82229773d0..82229773d0 100644
--- a/tests/testbench/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelBasicStates.html
+++ b/uitest/src/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelBasicStates.html
diff --git a/tests/testbench/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelMoveSplitter.html b/uitest/src/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelMoveSplitter.html
index b2deb8e509..b2deb8e509 100644
--- a/tests/testbench/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelMoveSplitter.html
+++ b/uitest/src/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelMoveSplitter.html
diff --git a/tests/testbench/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelSplitterClick.html b/uitest/src/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelSplitterClick.html
index d91b3d8c4a..d91b3d8c4a 100644
--- a/tests/testbench/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelSplitterClick.html
+++ b/uitest/src/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelSplitterClick.html
diff --git a/tests/testbench/com/vaadin/tests/components/splitpanel/HorizontalSplitPanels.java b/uitest/src/com/vaadin/tests/components/splitpanel/HorizontalSplitPanels.java
index a330581f22..a330581f22 100644
--- a/tests/testbench/com/vaadin/tests/components/splitpanel/HorizontalSplitPanels.java
+++ b/uitest/src/com/vaadin/tests/components/splitpanel/HorizontalSplitPanels.java
diff --git a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.html b/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.html
index e8e7395198..e8e7395198 100644
--- a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.html
+++ b/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.html
diff --git a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java b/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java
index 342cd9de6c..342cd9de6c 100644
--- a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java
+++ b/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java
diff --git a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelInModalWindow.java b/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelInModalWindow.java
index a1d0fcb42b..a1d0fcb42b 100644
--- a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelInModalWindow.java
+++ b/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelInModalWindow.java
diff --git a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelReversePosition.html b/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelReversePosition.html
index 6bdc9dd5e7..6bdc9dd5e7 100644
--- a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelReversePosition.html
+++ b/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelReversePosition.html
diff --git a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelReversePosition.java b/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelReversePosition.java
index 18ea015d01..18ea015d01 100644
--- a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelReversePosition.java
+++ b/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelReversePosition.java
diff --git a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelSplitterWidth.java b/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelSplitterWidth.java
index 08e602241f..08e602241f 100644
--- a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelSplitterWidth.java
+++ b/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelSplitterWidth.java
diff --git a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelSwapComponents.html b/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelSwapComponents.html
index f84eba7c36..f84eba7c36 100644
--- a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelSwapComponents.html
+++ b/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelSwapComponents.html
diff --git a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelSwapComponents.java b/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelSwapComponents.java
index 26abd0a782..26abd0a782 100644
--- a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelSwapComponents.java
+++ b/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelSwapComponents.java
diff --git a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelWidthOnResize.java b/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelWidthOnResize.java
index c35838e751..c35838e751 100644
--- a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelWidthOnResize.java
+++ b/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelWidthOnResize.java
diff --git a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelWithMinimumAndMaximum.html b/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelWithMinimumAndMaximum.html
index 70d619edac..70d619edac 100644
--- a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelWithMinimumAndMaximum.html
+++ b/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelWithMinimumAndMaximum.html
diff --git a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelWithMinimumAndMaximum.java b/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelWithMinimumAndMaximum.java
index beebbf4d2a..beebbf4d2a 100644
--- a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelWithMinimumAndMaximum.java
+++ b/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelWithMinimumAndMaximum.java
diff --git a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelWithRichTextArea.java b/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelWithRichTextArea.java
index 6b17319509..6b17319509 100644
--- a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelWithRichTextArea.java
+++ b/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelWithRichTextArea.java
diff --git a/tests/testbench/com/vaadin/tests/components/splitpanel/VerticalSplitPanelBasicStates.html b/uitest/src/com/vaadin/tests/components/splitpanel/VerticalSplitPanelBasicStates.html
index cf67caccb7..cf67caccb7 100644
--- a/tests/testbench/com/vaadin/tests/components/splitpanel/VerticalSplitPanelBasicStates.html
+++ b/uitest/src/com/vaadin/tests/components/splitpanel/VerticalSplitPanelBasicStates.html
diff --git a/tests/testbench/com/vaadin/tests/components/splitpanel/VerticalSplitPanelMoveSplitter.html b/uitest/src/com/vaadin/tests/components/splitpanel/VerticalSplitPanelMoveSplitter.html
index 7c8cd6ad12..7c8cd6ad12 100644
--- a/tests/testbench/com/vaadin/tests/components/splitpanel/VerticalSplitPanelMoveSplitter.html
+++ b/uitest/src/com/vaadin/tests/components/splitpanel/VerticalSplitPanelMoveSplitter.html
diff --git a/tests/testbench/com/vaadin/tests/components/splitpanel/VerticalSplitPanelSplitterClick.html b/uitest/src/com/vaadin/tests/components/splitpanel/VerticalSplitPanelSplitterClick.html
index cc384b6de6..cc384b6de6 100644
--- a/tests/testbench/com/vaadin/tests/components/splitpanel/VerticalSplitPanelSplitterClick.html
+++ b/uitest/src/com/vaadin/tests/components/splitpanel/VerticalSplitPanelSplitterClick.html
diff --git a/tests/testbench/com/vaadin/tests/components/splitpanel/VerticalSplitPanels.java b/uitest/src/com/vaadin/tests/components/splitpanel/VerticalSplitPanels.java
index 219a72c196..219a72c196 100644
--- a/tests/testbench/com/vaadin/tests/components/splitpanel/VerticalSplitPanels.java
+++ b/uitest/src/com/vaadin/tests/components/splitpanel/VerticalSplitPanels.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/ActionsOnTableBackground.html b/uitest/src/com/vaadin/tests/components/table/ActionsOnTableBackground.html
index 93037c3da1..93037c3da1 100644
--- a/tests/testbench/com/vaadin/tests/components/table/ActionsOnTableBackground.html
+++ b/uitest/src/com/vaadin/tests/components/table/ActionsOnTableBackground.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/AddItemToEmptyTable.html b/uitest/src/com/vaadin/tests/components/table/AddItemToEmptyTable.html
index 7f4845d1a9..7f4845d1a9 100644
--- a/tests/testbench/com/vaadin/tests/components/table/AddItemToEmptyTable.html
+++ b/uitest/src/com/vaadin/tests/components/table/AddItemToEmptyTable.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/AddItemToEmptyTable.java b/uitest/src/com/vaadin/tests/components/table/AddItemToEmptyTable.java
index bde50af013..bde50af013 100644
--- a/tests/testbench/com/vaadin/tests/components/table/AddItemToEmptyTable.java
+++ b/uitest/src/com/vaadin/tests/components/table/AddItemToEmptyTable.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/AddNonRenderedRow.html b/uitest/src/com/vaadin/tests/components/table/AddNonRenderedRow.html
index ba1e177235..ba1e177235 100644
--- a/tests/testbench/com/vaadin/tests/components/table/AddNonRenderedRow.html
+++ b/uitest/src/com/vaadin/tests/components/table/AddNonRenderedRow.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/AddNonRenderedRow.java b/uitest/src/com/vaadin/tests/components/table/AddNonRenderedRow.java
index 80b136d2ab..80b136d2ab 100644
--- a/tests/testbench/com/vaadin/tests/components/table/AddNonRenderedRow.java
+++ b/uitest/src/com/vaadin/tests/components/table/AddNonRenderedRow.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/CellStyleGeneratorTest.java b/uitest/src/com/vaadin/tests/components/table/CellStyleGeneratorTest.java
index 35f35c1407..35f35c1407 100644
--- a/tests/testbench/com/vaadin/tests/components/table/CellStyleGeneratorTest.java
+++ b/uitest/src/com/vaadin/tests/components/table/CellStyleGeneratorTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/ClippedComponentsInTable.html b/uitest/src/com/vaadin/tests/components/table/ClippedComponentsInTable.html
index 4a6ccbbe2d..4a6ccbbe2d 100644
--- a/tests/testbench/com/vaadin/tests/components/table/ClippedComponentsInTable.html
+++ b/uitest/src/com/vaadin/tests/components/table/ClippedComponentsInTable.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/ClippedComponentsInTable.java b/uitest/src/com/vaadin/tests/components/table/ClippedComponentsInTable.java
index 6b8532a9ad..6b8532a9ad 100644
--- a/tests/testbench/com/vaadin/tests/components/table/ClippedComponentsInTable.java
+++ b/uitest/src/com/vaadin/tests/components/table/ClippedComponentsInTable.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/CollapseIndicatorOverlapsColumn.html b/uitest/src/com/vaadin/tests/components/table/CollapseIndicatorOverlapsColumn.html
index e3d0821642..e3d0821642 100644
--- a/tests/testbench/com/vaadin/tests/components/table/CollapseIndicatorOverlapsColumn.html
+++ b/uitest/src/com/vaadin/tests/components/table/CollapseIndicatorOverlapsColumn.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/CollapseIndicatorOverlapsColumn.java b/uitest/src/com/vaadin/tests/components/table/CollapseIndicatorOverlapsColumn.java
index 267b61854f..267b61854f 100644
--- a/tests/testbench/com/vaadin/tests/components/table/CollapseIndicatorOverlapsColumn.java
+++ b/uitest/src/com/vaadin/tests/components/table/CollapseIndicatorOverlapsColumn.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.html b/uitest/src/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.html
index 9e529836b6..9e529836b6 100644
--- a/tests/testbench/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.html
+++ b/uitest/src/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.java b/uitest/src/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.java
index 08b65e2ef5..08b65e2ef5 100644
--- a/tests/testbench/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.java
+++ b/uitest/src/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/ColumnExpandRatio.html b/uitest/src/com/vaadin/tests/components/table/ColumnExpandRatio.html
index 6d5422831e..6d5422831e 100644
--- a/tests/testbench/com/vaadin/tests/components/table/ColumnExpandRatio.html
+++ b/uitest/src/com/vaadin/tests/components/table/ColumnExpandRatio.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/ColumnExpandRatio.java b/uitest/src/com/vaadin/tests/components/table/ColumnExpandRatio.java
index be176d83fa..be176d83fa 100644
--- a/tests/testbench/com/vaadin/tests/components/table/ColumnExpandRatio.java
+++ b/uitest/src/com/vaadin/tests/components/table/ColumnExpandRatio.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/ColumnExpandWithFixedColumns.html b/uitest/src/com/vaadin/tests/components/table/ColumnExpandWithFixedColumns.html
index eb338c8dde..eb338c8dde 100644
--- a/tests/testbench/com/vaadin/tests/components/table/ColumnExpandWithFixedColumns.html
+++ b/uitest/src/com/vaadin/tests/components/table/ColumnExpandWithFixedColumns.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/ColumnExpandWithFixedColumns.java b/uitest/src/com/vaadin/tests/components/table/ColumnExpandWithFixedColumns.java
index 78b6c0982c..78b6c0982c 100644
--- a/tests/testbench/com/vaadin/tests/components/table/ColumnExpandWithFixedColumns.java
+++ b/uitest/src/com/vaadin/tests/components/table/ColumnExpandWithFixedColumns.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/ColumnGeneratorAddingOrder.java b/uitest/src/com/vaadin/tests/components/table/ColumnGeneratorAddingOrder.java
index 2898750113..2898750113 100644
--- a/tests/testbench/com/vaadin/tests/components/table/ColumnGeneratorAddingOrder.java
+++ b/uitest/src/com/vaadin/tests/components/table/ColumnGeneratorAddingOrder.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/ColumnHeaderAlignments.java b/uitest/src/com/vaadin/tests/components/table/ColumnHeaderAlignments.java
index 324d1a63cf..324d1a63cf 100644
--- a/tests/testbench/com/vaadin/tests/components/table/ColumnHeaderAlignments.java
+++ b/uitest/src/com/vaadin/tests/components/table/ColumnHeaderAlignments.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/ColumnReorderEvent.java b/uitest/src/com/vaadin/tests/components/table/ColumnReorderEvent.java
index f32633eece..f32633eece 100644
--- a/tests/testbench/com/vaadin/tests/components/table/ColumnReorderEvent.java
+++ b/uitest/src/com/vaadin/tests/components/table/ColumnReorderEvent.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/ColumnResizeEvent.java b/uitest/src/com/vaadin/tests/components/table/ColumnResizeEvent.java
index f092ba8bca..f092ba8bca 100644
--- a/tests/testbench/com/vaadin/tests/components/table/ColumnResizeEvent.java
+++ b/uitest/src/com/vaadin/tests/components/table/ColumnResizeEvent.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/ColumnWidths.java b/uitest/src/com/vaadin/tests/components/table/ColumnWidths.java
index 9fe7a98179..9fe7a98179 100644
--- a/tests/testbench/com/vaadin/tests/components/table/ColumnWidths.java
+++ b/uitest/src/com/vaadin/tests/components/table/ColumnWidths.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/ContainerChangeWithPartlySamePropertyIds.html b/uitest/src/com/vaadin/tests/components/table/ContainerChangeWithPartlySamePropertyIds.html
index 6c8a770b6a..6c8a770b6a 100644
--- a/tests/testbench/com/vaadin/tests/components/table/ContainerChangeWithPartlySamePropertyIds.html
+++ b/uitest/src/com/vaadin/tests/components/table/ContainerChangeWithPartlySamePropertyIds.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/ContainerChangeWithPartlySamePropertyIds.java b/uitest/src/com/vaadin/tests/components/table/ContainerChangeWithPartlySamePropertyIds.java
index c76edca40d..c76edca40d 100644
--- a/tests/testbench/com/vaadin/tests/components/table/ContainerChangeWithPartlySamePropertyIds.java
+++ b/uitest/src/com/vaadin/tests/components/table/ContainerChangeWithPartlySamePropertyIds.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/ContainerSizeChange.html b/uitest/src/com/vaadin/tests/components/table/ContainerSizeChange.html
index 7c2374f322..7c2374f322 100644
--- a/tests/testbench/com/vaadin/tests/components/table/ContainerSizeChange.html
+++ b/uitest/src/com/vaadin/tests/components/table/ContainerSizeChange.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/ContainerSizeChange.java b/uitest/src/com/vaadin/tests/components/table/ContainerSizeChange.java
index c24be6de96..c24be6de96 100644
--- a/tests/testbench/com/vaadin/tests/components/table/ContainerSizeChange.java
+++ b/uitest/src/com/vaadin/tests/components/table/ContainerSizeChange.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/CtrlShiftMultiselect.java b/uitest/src/com/vaadin/tests/components/table/CtrlShiftMultiselect.java
index b9e23930e4..b9e23930e4 100644
--- a/tests/testbench/com/vaadin/tests/components/table/CtrlShiftMultiselect.java
+++ b/uitest/src/com/vaadin/tests/components/table/CtrlShiftMultiselect.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/DisabledTableKeyboardNavigation.html b/uitest/src/com/vaadin/tests/components/table/DisabledTableKeyboardNavigation.html
index a8f0e864c3..a8f0e864c3 100644
--- a/tests/testbench/com/vaadin/tests/components/table/DisabledTableKeyboardNavigation.html
+++ b/uitest/src/com/vaadin/tests/components/table/DisabledTableKeyboardNavigation.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/DisabledTableKeyboardNavigation.java b/uitest/src/com/vaadin/tests/components/table/DisabledTableKeyboardNavigation.java
index ec888c2699..ec888c2699 100644
--- a/tests/testbench/com/vaadin/tests/components/table/DisabledTableKeyboardNavigation.java
+++ b/uitest/src/com/vaadin/tests/components/table/DisabledTableKeyboardNavigation.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/DisabledTableShouldNotSendPageLengthUpdates.java b/uitest/src/com/vaadin/tests/components/table/DisabledTableShouldNotSendPageLengthUpdates.java
index c52f57358c..c52f57358c 100644
--- a/tests/testbench/com/vaadin/tests/components/table/DisabledTableShouldNotSendPageLengthUpdates.java
+++ b/uitest/src/com/vaadin/tests/components/table/DisabledTableShouldNotSendPageLengthUpdates.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/DoublesInTable.java b/uitest/src/com/vaadin/tests/components/table/DoublesInTable.java
index 920ccc2038..920ccc2038 100644
--- a/tests/testbench/com/vaadin/tests/components/table/DoublesInTable.java
+++ b/uitest/src/com/vaadin/tests/components/table/DoublesInTable.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/EditableModeChange.html b/uitest/src/com/vaadin/tests/components/table/EditableModeChange.html
index 6414c9bc03..6414c9bc03 100644
--- a/tests/testbench/com/vaadin/tests/components/table/EditableModeChange.html
+++ b/uitest/src/com/vaadin/tests/components/table/EditableModeChange.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/EditableModeChange.java b/uitest/src/com/vaadin/tests/components/table/EditableModeChange.java
index 5db294088a..5db294088a 100644
--- a/tests/testbench/com/vaadin/tests/components/table/EditableModeChange.java
+++ b/uitest/src/com/vaadin/tests/components/table/EditableModeChange.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/EditableTableFocus.java b/uitest/src/com/vaadin/tests/components/table/EditableTableFocus.java
index b5c8aa0296..b5c8aa0296 100644
--- a/tests/testbench/com/vaadin/tests/components/table/EditableTableFocus.java
+++ b/uitest/src/com/vaadin/tests/components/table/EditableTableFocus.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/EditableTableLeak.java b/uitest/src/com/vaadin/tests/components/table/EditableTableLeak.java
index 26ac23d5be..26ac23d5be 100644
--- a/tests/testbench/com/vaadin/tests/components/table/EditableTableLeak.java
+++ b/uitest/src/com/vaadin/tests/components/table/EditableTableLeak.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/EmptyTable.html b/uitest/src/com/vaadin/tests/components/table/EmptyTable.html
index 7196771f56..7196771f56 100644
--- a/tests/testbench/com/vaadin/tests/components/table/EmptyTable.html
+++ b/uitest/src/com/vaadin/tests/components/table/EmptyTable.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/FixedHeightTable.html b/uitest/src/com/vaadin/tests/components/table/FixedHeightTable.html
index fb8f7c8b7f..fb8f7c8b7f 100644
--- a/tests/testbench/com/vaadin/tests/components/table/FixedHeightTable.html
+++ b/uitest/src/com/vaadin/tests/components/table/FixedHeightTable.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/FixedHeightTable.java b/uitest/src/com/vaadin/tests/components/table/FixedHeightTable.java
index 174c166320..174c166320 100644
--- a/tests/testbench/com/vaadin/tests/components/table/FixedHeightTable.java
+++ b/uitest/src/com/vaadin/tests/components/table/FixedHeightTable.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/Footer.html b/uitest/src/com/vaadin/tests/components/table/Footer.html
index dbbdef2f9c..dbbdef2f9c 100644
--- a/tests/testbench/com/vaadin/tests/components/table/Footer.html
+++ b/uitest/src/com/vaadin/tests/components/table/Footer.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/Footer.java b/uitest/src/com/vaadin/tests/components/table/Footer.java
index 7fd8d3563f..7fd8d3563f 100644
--- a/tests/testbench/com/vaadin/tests/components/table/Footer.java
+++ b/uitest/src/com/vaadin/tests/components/table/Footer.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/FooterClick.html b/uitest/src/com/vaadin/tests/components/table/FooterClick.html
index fb3d004620..fb3d004620 100644
--- a/tests/testbench/com/vaadin/tests/components/table/FooterClick.html
+++ b/uitest/src/com/vaadin/tests/components/table/FooterClick.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/FooterClick.java b/uitest/src/com/vaadin/tests/components/table/FooterClick.java
index 992b521b60..992b521b60 100644
--- a/tests/testbench/com/vaadin/tests/components/table/FooterClick.java
+++ b/uitest/src/com/vaadin/tests/components/table/FooterClick.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/HeaderClick.html b/uitest/src/com/vaadin/tests/components/table/HeaderClick.html
index d5328b25d3..d5328b25d3 100644
--- a/tests/testbench/com/vaadin/tests/components/table/HeaderClick.html
+++ b/uitest/src/com/vaadin/tests/components/table/HeaderClick.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/HeaderClick.java b/uitest/src/com/vaadin/tests/components/table/HeaderClick.java
index b335e34d84..b335e34d84 100644
--- a/tests/testbench/com/vaadin/tests/components/table/HeaderClick.java
+++ b/uitest/src/com/vaadin/tests/components/table/HeaderClick.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddle.html b/uitest/src/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddle.html
index dfd001bf5c..dfd001bf5c 100644
--- a/tests/testbench/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddle.html
+++ b/uitest/src/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddle.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddle.java b/uitest/src/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddle.java
index ec82b36575..ec82b36575 100644
--- a/tests/testbench/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddle.java
+++ b/uitest/src/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddle.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/HeaderPositionWhenSorting.html b/uitest/src/com/vaadin/tests/components/table/HeaderPositionWhenSorting.html
index c3128820ef..c3128820ef 100644
--- a/tests/testbench/com/vaadin/tests/components/table/HeaderPositionWhenSorting.html
+++ b/uitest/src/com/vaadin/tests/components/table/HeaderPositionWhenSorting.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/HeaderSyncOnScroll.html b/uitest/src/com/vaadin/tests/components/table/HeaderSyncOnScroll.html
index 66f6107f90..66f6107f90 100644
--- a/tests/testbench/com/vaadin/tests/components/table/HeaderSyncOnScroll.html
+++ b/uitest/src/com/vaadin/tests/components/table/HeaderSyncOnScroll.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/HeaderUpdateWhenNoRows.html b/uitest/src/com/vaadin/tests/components/table/HeaderUpdateWhenNoRows.html
index ef2067fbf5..ef2067fbf5 100644
--- a/tests/testbench/com/vaadin/tests/components/table/HeaderUpdateWhenNoRows.html
+++ b/uitest/src/com/vaadin/tests/components/table/HeaderUpdateWhenNoRows.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/HeaderUpdateWhenNoRows.java b/uitest/src/com/vaadin/tests/components/table/HeaderUpdateWhenNoRows.java
index 6dafdd3dd5..6dafdd3dd5 100644
--- a/tests/testbench/com/vaadin/tests/components/table/HeaderUpdateWhenNoRows.java
+++ b/uitest/src/com/vaadin/tests/components/table/HeaderUpdateWhenNoRows.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/HiddenColumnsExpandRatios.java b/uitest/src/com/vaadin/tests/components/table/HiddenColumnsExpandRatios.java
index 4a729d221f..4a729d221f 100644
--- a/tests/testbench/com/vaadin/tests/components/table/HiddenColumnsExpandRatios.java
+++ b/uitest/src/com/vaadin/tests/components/table/HiddenColumnsExpandRatios.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/HorizontalScrollWithNoRows.html b/uitest/src/com/vaadin/tests/components/table/HorizontalScrollWithNoRows.html
index 98629252d9..98629252d9 100644
--- a/tests/testbench/com/vaadin/tests/components/table/HorizontalScrollWithNoRows.html
+++ b/uitest/src/com/vaadin/tests/components/table/HorizontalScrollWithNoRows.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/HugeRowCount.java b/uitest/src/com/vaadin/tests/components/table/HugeRowCount.java
index 434d650d6d..434d650d6d 100644
--- a/tests/testbench/com/vaadin/tests/components/table/HugeRowCount.java
+++ b/uitest/src/com/vaadin/tests/components/table/HugeRowCount.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/ItemClickEvents.html b/uitest/src/com/vaadin/tests/components/table/ItemClickEvents.html
index 1d7b2b6bf9..1d7b2b6bf9 100644
--- a/tests/testbench/com/vaadin/tests/components/table/ItemClickEvents.html
+++ b/uitest/src/com/vaadin/tests/components/table/ItemClickEvents.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/ItemClickEvents.java b/uitest/src/com/vaadin/tests/components/table/ItemClickEvents.java
index 828d184086..828d184086 100644
--- a/tests/testbench/com/vaadin/tests/components/table/ItemClickEvents.java
+++ b/uitest/src/com/vaadin/tests/components/table/ItemClickEvents.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/KeyControl.java b/uitest/src/com/vaadin/tests/components/table/KeyControl.java
index 2998940db1..2998940db1 100644
--- a/tests/testbench/com/vaadin/tests/components/table/KeyControl.java
+++ b/uitest/src/com/vaadin/tests/components/table/KeyControl.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/KeyboardNavigationDatasourceChange.java b/uitest/src/com/vaadin/tests/components/table/KeyboardNavigationDatasourceChange.java
index b389727fd3..b389727fd3 100644
--- a/tests/testbench/com/vaadin/tests/components/table/KeyboardNavigationDatasourceChange.java
+++ b/uitest/src/com/vaadin/tests/components/table/KeyboardNavigationDatasourceChange.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/KeyboardNavigationWithChangingContent.java b/uitest/src/com/vaadin/tests/components/table/KeyboardNavigationWithChangingContent.java
index f9a0add6fc..f9a0add6fc 100644
--- a/tests/testbench/com/vaadin/tests/components/table/KeyboardNavigationWithChangingContent.java
+++ b/uitest/src/com/vaadin/tests/components/table/KeyboardNavigationWithChangingContent.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.html b/uitest/src/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.html
index 62e3786a44..62e3786a44 100644
--- a/tests/testbench/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.html
+++ b/uitest/src/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java b/uitest/src/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java
index 99ad913674..99ad913674 100644
--- a/tests/testbench/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java
+++ b/uitest/src/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/LastColumnNegative.html b/uitest/src/com/vaadin/tests/components/table/LastColumnNegative.html
index 441142e7f9..441142e7f9 100644
--- a/tests/testbench/com/vaadin/tests/components/table/LastColumnNegative.html
+++ b/uitest/src/com/vaadin/tests/components/table/LastColumnNegative.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/LastColumnNegative.java b/uitest/src/com/vaadin/tests/components/table/LastColumnNegative.java
index b7379b4f2c..b7379b4f2c 100644
--- a/tests/testbench/com/vaadin/tests/components/table/LastColumnNegative.java
+++ b/uitest/src/com/vaadin/tests/components/table/LastColumnNegative.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/LongMultiselect.html b/uitest/src/com/vaadin/tests/components/table/LongMultiselect.html
index 82778d5bac..82778d5bac 100644
--- a/tests/testbench/com/vaadin/tests/components/table/LongMultiselect.html
+++ b/uitest/src/com/vaadin/tests/components/table/LongMultiselect.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/LongMultiselect.java b/uitest/src/com/vaadin/tests/components/table/LongMultiselect.java
index 43a89e4211..43a89e4211 100644
--- a/tests/testbench/com/vaadin/tests/components/table/LongMultiselect.java
+++ b/uitest/src/com/vaadin/tests/components/table/LongMultiselect.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/MissingScrollbar.html b/uitest/src/com/vaadin/tests/components/table/MissingScrollbar.html
index e1f783d42f..e1f783d42f 100644
--- a/tests/testbench/com/vaadin/tests/components/table/MissingScrollbar.html
+++ b/uitest/src/com/vaadin/tests/components/table/MissingScrollbar.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/MissingScrollbar.java b/uitest/src/com/vaadin/tests/components/table/MissingScrollbar.java
index e51cec2a6d..e51cec2a6d 100644
--- a/tests/testbench/com/vaadin/tests/components/table/MissingScrollbar.java
+++ b/uitest/src/com/vaadin/tests/components/table/MissingScrollbar.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/ModifyContainerProperty.html b/uitest/src/com/vaadin/tests/components/table/ModifyContainerProperty.html
index 33318c9a95..33318c9a95 100644
--- a/tests/testbench/com/vaadin/tests/components/table/ModifyContainerProperty.html
+++ b/uitest/src/com/vaadin/tests/components/table/ModifyContainerProperty.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/ModifyContainerProperty.java b/uitest/src/com/vaadin/tests/components/table/ModifyContainerProperty.java
index 00965220db..00965220db 100644
--- a/tests/testbench/com/vaadin/tests/components/table/ModifyContainerProperty.java
+++ b/uitest/src/com/vaadin/tests/components/table/ModifyContainerProperty.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/MultiClickingItemThatDetachesTable.java b/uitest/src/com/vaadin/tests/components/table/MultiClickingItemThatDetachesTable.java
index 0e440a95d0..0e440a95d0 100644
--- a/tests/testbench/com/vaadin/tests/components/table/MultiClickingItemThatDetachesTable.java
+++ b/uitest/src/com/vaadin/tests/components/table/MultiClickingItemThatDetachesTable.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/MultiSelectValueOrder.html b/uitest/src/com/vaadin/tests/components/table/MultiSelectValueOrder.html
index 4bac7741da..4bac7741da 100644
--- a/tests/testbench/com/vaadin/tests/components/table/MultiSelectValueOrder.html
+++ b/uitest/src/com/vaadin/tests/components/table/MultiSelectValueOrder.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/MultiSelectWithNotIdentityEqualIds.java b/uitest/src/com/vaadin/tests/components/table/MultiSelectWithNotIdentityEqualIds.java
index 06deb98f7f..06deb98f7f 100644
--- a/tests/testbench/com/vaadin/tests/components/table/MultiSelectWithNotIdentityEqualIds.java
+++ b/uitest/src/com/vaadin/tests/components/table/MultiSelectWithNotIdentityEqualIds.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/MultiSelectWithRemovedRow.html b/uitest/src/com/vaadin/tests/components/table/MultiSelectWithRemovedRow.html
index c41f3fbfdd..c41f3fbfdd 100644
--- a/tests/testbench/com/vaadin/tests/components/table/MultiSelectWithRemovedRow.html
+++ b/uitest/src/com/vaadin/tests/components/table/MultiSelectWithRemovedRow.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/MultiSelectWithRemovedRow.java b/uitest/src/com/vaadin/tests/components/table/MultiSelectWithRemovedRow.java
index 12ae4a3c4d..12ae4a3c4d 100644
--- a/tests/testbench/com/vaadin/tests/components/table/MultiSelectWithRemovedRow.java
+++ b/uitest/src/com/vaadin/tests/components/table/MultiSelectWithRemovedRow.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/NotselectablePaintSelections.java b/uitest/src/com/vaadin/tests/components/table/NotselectablePaintSelections.java
index cb609b856b..cb609b856b 100644
--- a/tests/testbench/com/vaadin/tests/components/table/NotselectablePaintSelections.java
+++ b/uitest/src/com/vaadin/tests/components/table/NotselectablePaintSelections.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/OddEvenRowStyling.html b/uitest/src/com/vaadin/tests/components/table/OddEvenRowStyling.html
index 525ad34888..525ad34888 100644
--- a/tests/testbench/com/vaadin/tests/components/table/OddEvenRowStyling.html
+++ b/uitest/src/com/vaadin/tests/components/table/OddEvenRowStyling.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/OddEvenRowStyling.java b/uitest/src/com/vaadin/tests/components/table/OddEvenRowStyling.java
index f6c70f4ffe..f6c70f4ffe 100644
--- a/tests/testbench/com/vaadin/tests/components/table/OddEvenRowStyling.java
+++ b/uitest/src/com/vaadin/tests/components/table/OddEvenRowStyling.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/ProgrammaticUnselectInRange.html b/uitest/src/com/vaadin/tests/components/table/ProgrammaticUnselectInRange.html
index 8d185b6219..8d185b6219 100644
--- a/tests/testbench/com/vaadin/tests/components/table/ProgrammaticUnselectInRange.html
+++ b/uitest/src/com/vaadin/tests/components/table/ProgrammaticUnselectInRange.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/ProgrammaticUnselectInRange.java b/uitest/src/com/vaadin/tests/components/table/ProgrammaticUnselectInRange.java
index 0b5b1d139c..0b5b1d139c 100644
--- a/tests/testbench/com/vaadin/tests/components/table/ProgrammaticUnselectInRange.java
+++ b/uitest/src/com/vaadin/tests/components/table/ProgrammaticUnselectInRange.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/PropertyValueChange.html b/uitest/src/com/vaadin/tests/components/table/PropertyValueChange.html
index 71d323cdc0..71d323cdc0 100644
--- a/tests/testbench/com/vaadin/tests/components/table/PropertyValueChange.html
+++ b/uitest/src/com/vaadin/tests/components/table/PropertyValueChange.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/PropertyValueChange.java b/uitest/src/com/vaadin/tests/components/table/PropertyValueChange.java
index e85bfc55a7..e85bfc55a7 100644
--- a/tests/testbench/com/vaadin/tests/components/table/PropertyValueChange.java
+++ b/uitest/src/com/vaadin/tests/components/table/PropertyValueChange.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/ResizeColumnAfterScrolling.html b/uitest/src/com/vaadin/tests/components/table/ResizeColumnAfterScrolling.html
index 7e7536d63a..7e7536d63a 100644
--- a/tests/testbench/com/vaadin/tests/components/table/ResizeColumnAfterScrolling.html
+++ b/uitest/src/com/vaadin/tests/components/table/ResizeColumnAfterScrolling.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/RowAdditionTest.java b/uitest/src/com/vaadin/tests/components/table/RowAdditionTest.java
index c6d071f34c..c6d071f34c 100644
--- a/tests/testbench/com/vaadin/tests/components/table/RowAdditionTest.java
+++ b/uitest/src/com/vaadin/tests/components/table/RowAdditionTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/RowGenerators.java b/uitest/src/com/vaadin/tests/components/table/RowGenerators.java
index c3bf46c12d..c3bf46c12d 100644
--- a/tests/testbench/com/vaadin/tests/components/table/RowGenerators.java
+++ b/uitest/src/com/vaadin/tests/components/table/RowGenerators.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/RowUpdateShouldRetainContextMenu.html b/uitest/src/com/vaadin/tests/components/table/RowUpdateShouldRetainContextMenu.html
index 65487d8fa8..65487d8fa8 100644
--- a/tests/testbench/com/vaadin/tests/components/table/RowUpdateShouldRetainContextMenu.html
+++ b/uitest/src/com/vaadin/tests/components/table/RowUpdateShouldRetainContextMenu.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/RowUpdateShouldRetainContextMenu.java b/uitest/src/com/vaadin/tests/components/table/RowUpdateShouldRetainContextMenu.java
index a9d5869e5f..a9d5869e5f 100644
--- a/tests/testbench/com/vaadin/tests/components/table/RowUpdateShouldRetainContextMenu.java
+++ b/uitest/src/com/vaadin/tests/components/table/RowUpdateShouldRetainContextMenu.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/SafariRenderingBugWhiteSpace.java b/uitest/src/com/vaadin/tests/components/table/SafariRenderingBugWhiteSpace.java
index 6f4436880a..6f4436880a 100644
--- a/tests/testbench/com/vaadin/tests/components/table/SafariRenderingBugWhiteSpace.java
+++ b/uitest/src/com/vaadin/tests/components/table/SafariRenderingBugWhiteSpace.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/ScrollCausesRequestLoop.java b/uitest/src/com/vaadin/tests/components/table/ScrollCausesRequestLoop.java
index edd524d657..edd524d657 100644
--- a/tests/testbench/com/vaadin/tests/components/table/ScrollCausesRequestLoop.java
+++ b/uitest/src/com/vaadin/tests/components/table/ScrollCausesRequestLoop.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/ScrollDetachSynchronization.java b/uitest/src/com/vaadin/tests/components/table/ScrollDetachSynchronization.java
index 9423968ecf..9423968ecf 100644
--- a/tests/testbench/com/vaadin/tests/components/table/ScrollDetachSynchronization.java
+++ b/uitest/src/com/vaadin/tests/components/table/ScrollDetachSynchronization.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/SelectableEditable.html b/uitest/src/com/vaadin/tests/components/table/SelectableEditable.html
index 8d46523c40..8d46523c40 100644
--- a/tests/testbench/com/vaadin/tests/components/table/SelectableEditable.html
+++ b/uitest/src/com/vaadin/tests/components/table/SelectableEditable.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/SelectableEditable.java b/uitest/src/com/vaadin/tests/components/table/SelectableEditable.java
index 2b33c71d2a..2b33c71d2a 100644
--- a/tests/testbench/com/vaadin/tests/components/table/SelectableEditable.java
+++ b/uitest/src/com/vaadin/tests/components/table/SelectableEditable.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/SelectingItemScrollsRight.java b/uitest/src/com/vaadin/tests/components/table/SelectingItemScrollsRight.java
index d9401c21b4..d9401c21b4 100644
--- a/tests/testbench/com/vaadin/tests/components/table/SelectingItemScrollsRight.java
+++ b/uitest/src/com/vaadin/tests/components/table/SelectingItemScrollsRight.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/SelectionRangeDragging.html b/uitest/src/com/vaadin/tests/components/table/SelectionRangeDragging.html
index 1e911699d1..1e911699d1 100644
--- a/tests/testbench/com/vaadin/tests/components/table/SelectionRangeDragging.html
+++ b/uitest/src/com/vaadin/tests/components/table/SelectionRangeDragging.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/SetCurrentPageFirstItemId.java b/uitest/src/com/vaadin/tests/components/table/SetCurrentPageFirstItemId.java
index aebb494247..aebb494247 100644
--- a/tests/testbench/com/vaadin/tests/components/table/SetCurrentPageFirstItemId.java
+++ b/uitest/src/com/vaadin/tests/components/table/SetCurrentPageFirstItemId.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/SortLabelsInTable.html b/uitest/src/com/vaadin/tests/components/table/SortLabelsInTable.html
index 51f13af004..51f13af004 100644
--- a/tests/testbench/com/vaadin/tests/components/table/SortLabelsInTable.html
+++ b/uitest/src/com/vaadin/tests/components/table/SortLabelsInTable.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/SortLabelsInTable.java b/uitest/src/com/vaadin/tests/components/table/SortLabelsInTable.java
index cbe06b8f7d..cbe06b8f7d 100644
--- a/tests/testbench/com/vaadin/tests/components/table/SortLabelsInTable.java
+++ b/uitest/src/com/vaadin/tests/components/table/SortLabelsInTable.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/SortLongTable.html b/uitest/src/com/vaadin/tests/components/table/SortLongTable.html
index 96513509e1..96513509e1 100644
--- a/tests/testbench/com/vaadin/tests/components/table/SortLongTable.html
+++ b/uitest/src/com/vaadin/tests/components/table/SortLongTable.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/SortLongTable.java b/uitest/src/com/vaadin/tests/components/table/SortLongTable.java
index afc63c0eda..afc63c0eda 100644
--- a/tests/testbench/com/vaadin/tests/components/table/SortLongTable.java
+++ b/uitest/src/com/vaadin/tests/components/table/SortLongTable.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableAndBrowserContextMenu.java b/uitest/src/com/vaadin/tests/components/table/TableAndBrowserContextMenu.java
index 039b02e801..039b02e801 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableAndBrowserContextMenu.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableAndBrowserContextMenu.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableCacheBuildEfficiency.java b/uitest/src/com/vaadin/tests/components/table/TableCacheBuildEfficiency.java
index 75f2679234..75f2679234 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableCacheBuildEfficiency.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableCacheBuildEfficiency.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.html b/uitest/src/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.html
index 7ad0873c0f..7ad0873c0f 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java b/uitest/src/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java
index 62a131cbbf..62a131cbbf 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableClickValueChangeInteraction.html b/uitest/src/com/vaadin/tests/components/table/TableClickValueChangeInteraction.html
index 5b50eeba23..5b50eeba23 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableClickValueChangeInteraction.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableClickValueChangeInteraction.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableClickValueChangeInteraction.java b/uitest/src/com/vaadin/tests/components/table/TableClickValueChangeInteraction.java
index a37cf48579..a37cf48579 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableClickValueChangeInteraction.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableClickValueChangeInteraction.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableColumnAlignment.html b/uitest/src/com/vaadin/tests/components/table/TableColumnAlignment.html
index 49bb86dbce..49bb86dbce 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableColumnAlignment.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableColumnAlignment.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableColumnHeaders.html b/uitest/src/com/vaadin/tests/components/table/TableColumnHeaders.html
index 9f4e6cb8da..9f4e6cb8da 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableColumnHeaders.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableColumnHeaders.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableColumnIcons-chameleon.html b/uitest/src/com/vaadin/tests/components/table/TableColumnIcons-chameleon.html
index a9a572e468..a9a572e468 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableColumnIcons-chameleon.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableColumnIcons-chameleon.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableColumnIcons-runo.html b/uitest/src/com/vaadin/tests/components/table/TableColumnIcons-runo.html
index 641d9480ca..641d9480ca 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableColumnIcons-runo.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableColumnIcons-runo.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableColumnIcons.html b/uitest/src/com/vaadin/tests/components/table/TableColumnIcons.html
index 81b8be89fa..81b8be89fa 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableColumnIcons.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableColumnIcons.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableColumnResizeContentsWidth.html b/uitest/src/com/vaadin/tests/components/table/TableColumnResizeContentsWidth.html
index 9c8a12fe15..9c8a12fe15 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableColumnResizeContentsWidth.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableColumnResizeContentsWidth.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableColumnResizeContentsWidth.java b/uitest/src/com/vaadin/tests/components/table/TableColumnResizeContentsWidth.java
index 0b695b41c7..0b695b41c7 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableColumnResizeContentsWidth.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableColumnResizeContentsWidth.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableColumnSorting.html b/uitest/src/com/vaadin/tests/components/table/TableColumnSorting.html
index 7f6ee1a975..7f6ee1a975 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableColumnSorting.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableColumnSorting.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableContextMenu.java b/uitest/src/com/vaadin/tests/components/table/TableContextMenu.java
index 9416ffe70c..9416ffe70c 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableContextMenu.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableContextMenu.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableContextMenuAndIcons.html b/uitest/src/com/vaadin/tests/components/table/TableContextMenuAndIcons.html
index 82f1e63d6b..82f1e63d6b 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableContextMenuAndIcons.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableContextMenuAndIcons.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableContextMenuOnField.java b/uitest/src/com/vaadin/tests/components/table/TableContextMenuOnField.java
index 3b639be21f..3b639be21f 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableContextMenuOnField.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableContextMenuOnField.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableDragColumn.html b/uitest/src/com/vaadin/tests/components/table/TableDragColumn.html
index 7c2dc2813c..7c2dc2813c 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableDragColumn.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableDragColumn.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableExtraScrollbars.java b/uitest/src/com/vaadin/tests/components/table/TableExtraScrollbars.java
index f8fb624c0b..f8fb624c0b 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableExtraScrollbars.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableExtraScrollbars.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableFirstRowFlicker.java b/uitest/src/com/vaadin/tests/components/table/TableFirstRowFlicker.java
index 90df5610eb..90df5610eb 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableFirstRowFlicker.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableFirstRowFlicker.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableGeneratedColumns.html b/uitest/src/com/vaadin/tests/components/table/TableGeneratedColumns.html
index 19326e9f12..19326e9f12 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableGeneratedColumns.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableGeneratedColumns.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableGeneratedRows-chameleon.html b/uitest/src/com/vaadin/tests/components/table/TableGeneratedRows-chameleon.html
index 8a83f27701..8a83f27701 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableGeneratedRows-chameleon.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableGeneratedRows-chameleon.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableGeneratedRows.html b/uitest/src/com/vaadin/tests/components/table/TableGeneratedRows.html
index 35a600765f..35a600765f 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableGeneratedRows.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableGeneratedRows.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableGeneratedStringColumns.html b/uitest/src/com/vaadin/tests/components/table/TableGeneratedStringColumns.html
index 4d5f4c2d17..4d5f4c2d17 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableGeneratedStringColumns.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableGeneratedStringColumns.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableHeaderShifting.java b/uitest/src/com/vaadin/tests/components/table/TableHeaderShifting.java
index 9dc641ddc4..9dc641ddc4 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableHeaderShifting.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableHeaderShifting.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableHeaderZoom.java b/uitest/src/com/vaadin/tests/components/table/TableHeaderZoom.java
index 26f8e25d3b..26f8e25d3b 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableHeaderZoom.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableHeaderZoom.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.html b/uitest/src/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.html
index 01b2c578f0..01b2c578f0 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.java b/uitest/src/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.java
index 6bbf06635a..6bbf06635a 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableInTabsheet.java b/uitest/src/com/vaadin/tests/components/table/TableInTabsheet.java
index 1c6862cf07..1c6862cf07 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableInTabsheet.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableInTabsheet.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableItemDescriptionGeneratorTest.java b/uitest/src/com/vaadin/tests/components/table/TableItemDescriptionGeneratorTest.java
index e7176add0a..e7176add0a 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableItemDescriptionGeneratorTest.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableItemDescriptionGeneratorTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableItemIcon.java b/uitest/src/com/vaadin/tests/components/table/TableItemIcon.java
index 1faa9667c2..1faa9667c2 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableItemIcon.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableItemIcon.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableLastRowMissing.html b/uitest/src/com/vaadin/tests/components/table/TableLastRowMissing.html
index ca8ee6d6a4..ca8ee6d6a4 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableLastRowMissing.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableLastRowMissing.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableLastRowMissing.java b/uitest/src/com/vaadin/tests/components/table/TableLastRowMissing.java
index 18d13e676b..18d13e676b 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableLastRowMissing.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableLastRowMissing.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableModifcationsWhenScrolledRight.java b/uitest/src/com/vaadin/tests/components/table/TableModifcationsWhenScrolledRight.java
index 74a5089a84..74a5089a84 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableModifcationsWhenScrolledRight.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableModifcationsWhenScrolledRight.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableModificationsWhenScrolledRight.html b/uitest/src/com/vaadin/tests/components/table/TableModificationsWhenScrolledRight.html
index eab6164330..eab6164330 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableModificationsWhenScrolledRight.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableModificationsWhenScrolledRight.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableMultiSelectMouse.html b/uitest/src/com/vaadin/tests/components/table/TableMultiSelectMouse.html
index a980253743..a980253743 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableMultiSelectMouse.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableMultiSelectMouse.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableMultiSelectSimple-chameleon.html b/uitest/src/com/vaadin/tests/components/table/TableMultiSelectSimple-chameleon.html
index f13bd22e84..f13bd22e84 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableMultiSelectSimple-chameleon.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableMultiSelectSimple-chameleon.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableMultiSelectSimple.html b/uitest/src/com/vaadin/tests/components/table/TableMultiSelectSimple.html
index dcf88620ca..dcf88620ca 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableMultiSelectSimple.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableMultiSelectSimple.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableMultiSelectSimple.java b/uitest/src/com/vaadin/tests/components/table/TableMultiSelectSimple.java
index 56fb7c1c7d..56fb7c1c7d 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableMultiSelectSimple.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableMultiSelectSimple.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TablePageLengthCalculation.java b/uitest/src/com/vaadin/tests/components/table/TablePageLengthCalculation.java
index 55089ff56b..55089ff56b 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TablePageLengthCalculation.java
+++ b/uitest/src/com/vaadin/tests/components/table/TablePageLengthCalculation.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TablePageLengthUpdate.html b/uitest/src/com/vaadin/tests/components/table/TablePageLengthUpdate.html
index bc438eaf1b..bc438eaf1b 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TablePageLengthUpdate.html
+++ b/uitest/src/com/vaadin/tests/components/table/TablePageLengthUpdate.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TablePageLengthUpdate.java b/uitest/src/com/vaadin/tests/components/table/TablePageLengthUpdate.java
index 75b672a277..75b672a277 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TablePageLengthUpdate.java
+++ b/uitest/src/com/vaadin/tests/components/table/TablePageLengthUpdate.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableRemoveActionHandlers.html b/uitest/src/com/vaadin/tests/components/table/TableRemoveActionHandlers.html
index a363f6980e..a363f6980e 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableRemoveActionHandlers.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableRemoveActionHandlers.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableRepaintWhenMadeVisibile.java b/uitest/src/com/vaadin/tests/components/table/TableRepaintWhenMadeVisibile.java
index 2b02e89c80..2b02e89c80 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableRepaintWhenMadeVisibile.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableRepaintWhenMadeVisibile.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableRepaintWhenMadeVisible.html b/uitest/src/com/vaadin/tests/components/table/TableRepaintWhenMadeVisible.html
index e523a89df3..e523a89df3 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableRepaintWhenMadeVisible.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableRepaintWhenMadeVisible.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableRowHeight.html b/uitest/src/com/vaadin/tests/components/table/TableRowHeight.html
index a28df6329f..a28df6329f 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableRowHeight.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableRowHeight.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableRowHeight.java b/uitest/src/com/vaadin/tests/components/table/TableRowHeight.java
index eb5efbc4f3..eb5efbc4f3 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableRowHeight.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableRowHeight.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableRowHeight2.html b/uitest/src/com/vaadin/tests/components/table/TableRowHeight2.html
index a440ff84fb..a440ff84fb 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableRowHeight2.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableRowHeight2.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableRowHeight2.java b/uitest/src/com/vaadin/tests/components/table/TableRowHeight2.java
index 0011fdca18..0011fdca18 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableRowHeight2.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableRowHeight2.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableRowHeight3.html b/uitest/src/com/vaadin/tests/components/table/TableRowHeight3.html
index 2aa90085e4..2aa90085e4 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableRowHeight3.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableRowHeight3.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableRowHeight3.java b/uitest/src/com/vaadin/tests/components/table/TableRowHeight3.java
index c31b87f9da..c31b87f9da 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableRowHeight3.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableRowHeight3.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableRowNoHeightNoRows.html b/uitest/src/com/vaadin/tests/components/table/TableRowNoHeightNoRows.html
index 35d64c3a0c..35d64c3a0c 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableRowNoHeightNoRows.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableRowNoHeightNoRows.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableScrollOnFocus.html b/uitest/src/com/vaadin/tests/components/table/TableScrollOnFocus.html
index 93e5a802ee..93e5a802ee 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableScrollOnFocus.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableScrollOnFocus.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableScrollOnFocus.java b/uitest/src/com/vaadin/tests/components/table/TableScrollOnFocus.java
index 4782ca94f7..4782ca94f7 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableScrollOnFocus.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableScrollOnFocus.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableScrolling.html b/uitest/src/com/vaadin/tests/components/table/TableScrolling.html
index 51fa844412..51fa844412 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableScrolling.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableScrolling.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableScrollsOnSelection.html b/uitest/src/com/vaadin/tests/components/table/TableScrollsOnSelection.html
index dff3dcbc48..dff3dcbc48 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableScrollsOnSelection.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableScrollsOnSelection.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableScrollsOnSelection.java b/uitest/src/com/vaadin/tests/components/table/TableScrollsOnSelection.java
index f49fdfd3b9..f49fdfd3b9 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableScrollsOnSelection.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableScrollsOnSelection.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableSelectPagingOff.java b/uitest/src/com/vaadin/tests/components/table/TableSelectPagingOff.java
index d97e0a5cef..d97e0a5cef 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableSelectPagingOff.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableSelectPagingOff.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.html b/uitest/src/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.html
index ede2ea70fc..ede2ea70fc 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.java b/uitest/src/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.java
index 030a4ee259..030a4ee259 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableSingleSelect.html b/uitest/src/com/vaadin/tests/components/table/TableSingleSelect.html
index c809678a4f..c809678a4f 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableSingleSelect.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableSingleSelect.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableSingleSelect.java b/uitest/src/com/vaadin/tests/components/table/TableSingleSelect.java
index 92a1491c56..92a1491c56 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableSingleSelect.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableSingleSelect.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableSorting.java b/uitest/src/com/vaadin/tests/components/table/TableSorting.java
index 6417e8e853..6417e8e853 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableSorting.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableSorting.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableToggleVisibility.html b/uitest/src/com/vaadin/tests/components/table/TableToggleVisibility.html
index e9c57203c0..e9c57203c0 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableToggleVisibility.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableToggleVisibility.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableToggleVisibility.java b/uitest/src/com/vaadin/tests/components/table/TableToggleVisibility.java
index 9ca2605cd9..9ca2605cd9 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableToggleVisibility.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableToggleVisibility.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableTooltips.html b/uitest/src/com/vaadin/tests/components/table/TableTooltips.html
index 989fb865c5..989fb865c5 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableTooltips.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableTooltips.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableUndefinedSize.html b/uitest/src/com/vaadin/tests/components/table/TableUndefinedSize.html
index f21a78ddb0..f21a78ddb0 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableUndefinedSize.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableUndefinedSize.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableUndefinedSize.java b/uitest/src/com/vaadin/tests/components/table/TableUndefinedSize.java
index 544fe9bb67..544fe9bb67 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableUndefinedSize.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableUndefinedSize.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableUnregisterComponent.html b/uitest/src/com/vaadin/tests/components/table/TableUnregisterComponent.html
index 1e5617d64f..1e5617d64f 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableUnregisterComponent.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableUnregisterComponent.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableUnregisterComponent.java b/uitest/src/com/vaadin/tests/components/table/TableUnregisterComponent.java
index 11f450baf2..11f450baf2 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableUnregisterComponent.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableUnregisterComponent.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableVisibleColumnsUpdate.html b/uitest/src/com/vaadin/tests/components/table/TableVisibleColumnsUpdate.html
index 05325cb9e6..05325cb9e6 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableVisibleColumnsUpdate.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableVisibleColumnsUpdate.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableVisibleColumnsUpdate.java b/uitest/src/com/vaadin/tests/components/table/TableVisibleColumnsUpdate.java
index 98cd4e0aaa..98cd4e0aaa 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableVisibleColumnsUpdate.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableVisibleColumnsUpdate.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableWithChildComponents.java b/uitest/src/com/vaadin/tests/components/table/TableWithChildComponents.java
index 7eb9c3239c..7eb9c3239c 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableWithChildComponents.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableWithChildComponents.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemId.html b/uitest/src/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemId.html
index 5364b1cd1e..5364b1cd1e 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemId.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemId.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemId.java b/uitest/src/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemId.java
index 733f46959a..733f46959a 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemId.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemId.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableWithManyColumns.html b/uitest/src/com/vaadin/tests/components/table/TableWithManyColumns.html
index a933b0b1d1..a933b0b1d1 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableWithManyColumns.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableWithManyColumns.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableWithManyColumns.java b/uitest/src/com/vaadin/tests/components/table/TableWithManyColumns.java
index e0ae38a8b9..e0ae38a8b9 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableWithManyColumns.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableWithManyColumns.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableWithNoncollapsibleColumns.html b/uitest/src/com/vaadin/tests/components/table/TableWithNoncollapsibleColumns.html
index e3c9a8423b..e3c9a8423b 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableWithNoncollapsibleColumns.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableWithNoncollapsibleColumns.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableWithNoncollapsibleColumns.java b/uitest/src/com/vaadin/tests/components/table/TableWithNoncollapsibleColumns.java
index 226fde3b29..226fde3b29 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableWithNoncollapsibleColumns.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableWithNoncollapsibleColumns.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/Tables.java b/uitest/src/com/vaadin/tests/components/table/Tables.java
index 1431155b1a..1431155b1a 100644
--- a/tests/testbench/com/vaadin/tests/components/table/Tables.java
+++ b/uitest/src/com/vaadin/tests/components/table/Tables.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TestCurrentPageFirstItem.html b/uitest/src/com/vaadin/tests/components/table/TestCurrentPageFirstItem.html
index 451e9b9c8d..451e9b9c8d 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TestCurrentPageFirstItem.html
+++ b/uitest/src/com/vaadin/tests/components/table/TestCurrentPageFirstItem.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TestCurrentPageFirstItem.java b/uitest/src/com/vaadin/tests/components/table/TestCurrentPageFirstItem.java
index c563312efa..c563312efa 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TestCurrentPageFirstItem.java
+++ b/uitest/src/com/vaadin/tests/components/table/TestCurrentPageFirstItem.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TextFieldRelativeWidth.html b/uitest/src/com/vaadin/tests/components/table/TextFieldRelativeWidth.html
index 99f8f5bf9b..99f8f5bf9b 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TextFieldRelativeWidth.html
+++ b/uitest/src/com/vaadin/tests/components/table/TextFieldRelativeWidth.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TextFieldRelativeWidth.java b/uitest/src/com/vaadin/tests/components/table/TextFieldRelativeWidth.java
index ae3f4c42a4..ae3f4c42a4 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TextFieldRelativeWidth.java
+++ b/uitest/src/com/vaadin/tests/components/table/TextFieldRelativeWidth.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TextFieldValueGoesMissing.html b/uitest/src/com/vaadin/tests/components/table/TextFieldValueGoesMissing.html
index caaa15fa1c..caaa15fa1c 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TextFieldValueGoesMissing.html
+++ b/uitest/src/com/vaadin/tests/components/table/TextFieldValueGoesMissing.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TextFieldValueGoesMissing.java b/uitest/src/com/vaadin/tests/components/table/TextFieldValueGoesMissing.java
index 9ffad7f1e4..9ffad7f1e4 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TextFieldValueGoesMissing.java
+++ b/uitest/src/com/vaadin/tests/components/table/TextFieldValueGoesMissing.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/UncollapsedCollumnWidth.html b/uitest/src/com/vaadin/tests/components/table/UncollapsedCollumnWidth.html
index e1b39533f3..e1b39533f3 100644
--- a/tests/testbench/com/vaadin/tests/components/table/UncollapsedCollumnWidth.html
+++ b/uitest/src/com/vaadin/tests/components/table/UncollapsedCollumnWidth.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/UncollapsedCollumnWidth.java b/uitest/src/com/vaadin/tests/components/table/UncollapsedCollumnWidth.java
index 8e623499cf..8e623499cf 100644
--- a/tests/testbench/com/vaadin/tests/components/table/UncollapsedCollumnWidth.java
+++ b/uitest/src/com/vaadin/tests/components/table/UncollapsedCollumnWidth.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/WideSelectableTable.java b/uitest/src/com/vaadin/tests/components/table/WideSelectableTable.java
index c820dc08d5..c820dc08d5 100644
--- a/tests/testbench/com/vaadin/tests/components/table/WideSelectableTable.java
+++ b/uitest/src/com/vaadin/tests/components/table/WideSelectableTable.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/fi.gif b/uitest/src/com/vaadin/tests/components/table/fi.gif
index 8d3a191828..8d3a191828 100644
--- a/tests/testbench/com/vaadin/tests/components/table/fi.gif
+++ b/uitest/src/com/vaadin/tests/components/table/fi.gif
diff --git a/tests/testbench/com/vaadin/tests/components/table/se.gif b/uitest/src/com/vaadin/tests/components/table/se.gif
index 80f6285228..80f6285228 100644
--- a/tests/testbench/com/vaadin/tests/components/table/se.gif
+++ b/uitest/src/com/vaadin/tests/components/table/se.gif
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/AddAndRemoveTabs.html b/uitest/src/com/vaadin/tests/components/tabsheet/AddAndRemoveTabs.html
index 993ef79c91..993ef79c91 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/AddAndRemoveTabs.html
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/AddAndRemoveTabs.html
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/AddAndRemoveTabs.java b/uitest/src/com/vaadin/tests/components/tabsheet/AddAndRemoveTabs.java
index 4b5d216906..4b5d216906 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/AddAndRemoveTabs.java
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/AddAndRemoveTabs.java
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/PreventTabChange.html b/uitest/src/com/vaadin/tests/components/tabsheet/PreventTabChange.html
index c4f5998f47..c4f5998f47 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/PreventTabChange.html
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/PreventTabChange.html
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/PreventTabChange.java b/uitest/src/com/vaadin/tests/components/tabsheet/PreventTabChange.java
index 434c73f778..434c73f778 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/PreventTabChange.java
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/PreventTabChange.java
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/RemoveTabs.java b/uitest/src/com/vaadin/tests/components/tabsheet/RemoveTabs.java
index 2b37c4358e..2b37c4358e 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/RemoveTabs.java
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/RemoveTabs.java
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/RemoveTabsTabsheet.html b/uitest/src/com/vaadin/tests/components/tabsheet/RemoveTabsTabsheet.html
index 13f103b82d..13f103b82d 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/RemoveTabsTabsheet.html
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/RemoveTabsTabsheet.html
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/ScrollbarsInNestedTabsheets.html b/uitest/src/com/vaadin/tests/components/tabsheet/ScrollbarsInNestedTabsheets.html
index f5579c9875..f5579c9875 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/ScrollbarsInNestedTabsheets.html
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/ScrollbarsInNestedTabsheets.html
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/ScrollbarsInNestedTabsheets.java b/uitest/src/com/vaadin/tests/components/tabsheet/ScrollbarsInNestedTabsheets.java
index de250539ff..de250539ff 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/ScrollbarsInNestedTabsheets.java
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/ScrollbarsInNestedTabsheets.java
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabGetAndReplaceComponent.html b/uitest/src/com/vaadin/tests/components/tabsheet/TabGetAndReplaceComponent.html
index fce39361e1..fce39361e1 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabGetAndReplaceComponent.html
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabGetAndReplaceComponent.html
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabGetAndReplaceComponent.java b/uitest/src/com/vaadin/tests/components/tabsheet/TabGetAndReplaceComponent.java
index 0d4f1fe562..0d4f1fe562 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabGetAndReplaceComponent.java
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabGetAndReplaceComponent.java
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabKeyboardNavigation.html b/uitest/src/com/vaadin/tests/components/tabsheet/TabKeyboardNavigation.html
index 129061e69c..129061e69c 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabKeyboardNavigation.html
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabKeyboardNavigation.html
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabKeyboardNavigation.java b/uitest/src/com/vaadin/tests/components/tabsheet/TabKeyboardNavigation.java
index ba737f1df8..ba737f1df8 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabKeyboardNavigation.java
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabKeyboardNavigation.java
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetBasicOperations.html b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetBasicOperations.html
index 357455545e..357455545e 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetBasicOperations.html
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetBasicOperations.html
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetCaptions.html b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetCaptions.html
index d240d4b419..d240d4b419 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetCaptions.html
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetCaptions.html
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetCaptions.java b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetCaptions.java
index e3867cff9f..e3867cff9f 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetCaptions.java
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetCaptions.java
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetDisabling.html b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetDisabling.html
index bc03f7687b..bc03f7687b 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetDisabling.html
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetDisabling.html
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetDisabling.java b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetDisabling.java
index dfe37f2e27..dfe37f2e27 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetDisabling.java
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetDisabling.java
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetDiscardsMovedComponents.html b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetDiscardsMovedComponents.html
index 4cb6925b28..4cb6925b28 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetDiscardsMovedComponents.html
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetDiscardsMovedComponents.html
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetDiscardsMovedComponents.java b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetDiscardsMovedComponents.java
index 8d312f0cd8..8d312f0cd8 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetDiscardsMovedComponents.java
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetDiscardsMovedComponents.java
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetIcons.html b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetIcons.html
index 425da11af4..425da11af4 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetIcons.html
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetIcons.html
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetIcons.java b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetIcons.java
index 5d814ec48f..5d814ec48f 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetIcons.java
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetIcons.java
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetIndexOperations.html b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetIndexOperations.html
index 8db5641603..8db5641603 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetIndexOperations.html
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetIndexOperations.html
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetIndexOperations.java b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetIndexOperations.java
index de637bbed7..de637bbed7 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetIndexOperations.java
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetIndexOperations.java
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetMinimal.java b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetMinimal.java
index b6cf27f6bb..b6cf27f6bb 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetMinimal.java
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetMinimal.java
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetSelectionStyles.html b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetSelectionStyles.html
index e046cfacb4..e046cfacb4 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetSelectionStyles.html
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetSelectionStyles.html
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetTabStyleNames.html b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetTabStyleNames.html
index d49e2817d3..d49e2817d3 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetTabStyleNames.html
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetTabStyleNames.html
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetTabStyleNames.java b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetTabStyleNames.java
index 54a5ed4857..54a5ed4857 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetTabStyleNames.java
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetTabStyleNames.java
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetTabTheming.java b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetTabTheming.java
index a2c75d6e79..a2c75d6e79 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetTabTheming.java
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetTabTheming.java
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetTest.java b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetTest.java
index 6c39cdab73..6c39cdab73 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetTest.java
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetWithDisappearingContent.html b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetWithDisappearingContent.html
index d61a2cbc62..d61a2cbc62 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetWithDisappearingContent.html
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetWithDisappearingContent.html
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetWithDisappearingContent.java b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetWithDisappearingContent.java
index aed273dd64..aed273dd64 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetWithDisappearingContent.java
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetWithDisappearingContent.java
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetWithoutTabCaption.html b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetWithoutTabCaption.html
index 36e85c1b37..36e85c1b37 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetWithoutTabCaption.html
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetWithoutTabCaption.html
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetWithoutTabCaption.java b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetWithoutTabCaption.java
index d766277b48..d766277b48 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetWithoutTabCaption.java
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetWithoutTabCaption.java
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabsheetNPE.java b/uitest/src/com/vaadin/tests/components/tabsheet/TabsheetNPE.java
index 1934649902..1934649902 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabsheetNPE.java
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabsheetNPE.java
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabsheetScrolling.html b/uitest/src/com/vaadin/tests/components/tabsheet/TabsheetScrolling.html
index dd45e2c591..dd45e2c591 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabsheetScrolling.html
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabsheetScrolling.html
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabsheetScrolling.java b/uitest/src/com/vaadin/tests/components/tabsheet/TabsheetScrolling.java
index da449a2461..da449a2461 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabsheetScrolling.java
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabsheetScrolling.java
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabsheetTooltip.html b/uitest/src/com/vaadin/tests/components/tabsheet/TabsheetTooltip.html
index d133ab9937..d133ab9937 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabsheetTooltip.html
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabsheetTooltip.html
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabsheetTooltip.java b/uitest/src/com/vaadin/tests/components/tabsheet/TabsheetTooltip.java
index fefd7a0b28..fefd7a0b28 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabsheetTooltip.java
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabsheetTooltip.java
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/VerticalScrollbarPosition.html b/uitest/src/com/vaadin/tests/components/tabsheet/VerticalScrollbarPosition.html
index 3da03edb6a..3da03edb6a 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/VerticalScrollbarPosition.html
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/VerticalScrollbarPosition.html
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/VerticalScrollbarPosition.java b/uitest/src/com/vaadin/tests/components/tabsheet/VerticalScrollbarPosition.java
index 110f26d478..110f26d478 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/VerticalScrollbarPosition.java
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/VerticalScrollbarPosition.java
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/WrapTabSheetInTabSheet.java b/uitest/src/com/vaadin/tests/components/tabsheet/WrapTabSheetInTabSheet.java
index 7a676c63fb..7a676c63fb 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/WrapTabSheetInTabSheet.java
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/WrapTabSheetInTabSheet.java
diff --git a/tests/testbench/com/vaadin/tests/components/textarea/TextAreaBasicStates.html b/uitest/src/com/vaadin/tests/components/textarea/TextAreaBasicStates.html
index 3d44192506..3d44192506 100644
--- a/tests/testbench/com/vaadin/tests/components/textarea/TextAreaBasicStates.html
+++ b/uitest/src/com/vaadin/tests/components/textarea/TextAreaBasicStates.html
diff --git a/tests/testbench/com/vaadin/tests/components/textarea/TextAreaCursorPosition.java b/uitest/src/com/vaadin/tests/components/textarea/TextAreaCursorPosition.java
index 992f20843b..992f20843b 100644
--- a/tests/testbench/com/vaadin/tests/components/textarea/TextAreaCursorPosition.java
+++ b/uitest/src/com/vaadin/tests/components/textarea/TextAreaCursorPosition.java
diff --git a/tests/testbench/com/vaadin/tests/components/textarea/TextAreaMaxLength.html b/uitest/src/com/vaadin/tests/components/textarea/TextAreaMaxLength.html
index 5fe43b7b7a..5fe43b7b7a 100755
--- a/tests/testbench/com/vaadin/tests/components/textarea/TextAreaMaxLength.html
+++ b/uitest/src/com/vaadin/tests/components/textarea/TextAreaMaxLength.html
diff --git a/tests/testbench/com/vaadin/tests/components/textarea/TextAreaNullRepresentation.html b/uitest/src/com/vaadin/tests/components/textarea/TextAreaNullRepresentation.html
index 6b29b634db..6b29b634db 100644
--- a/tests/testbench/com/vaadin/tests/components/textarea/TextAreaNullRepresentation.html
+++ b/uitest/src/com/vaadin/tests/components/textarea/TextAreaNullRepresentation.html
diff --git a/tests/testbench/com/vaadin/tests/components/textarea/TextAreaTest.java b/uitest/src/com/vaadin/tests/components/textarea/TextAreaTest.java
index e071bdd8fb..e071bdd8fb 100644
--- a/tests/testbench/com/vaadin/tests/components/textarea/TextAreaTest.java
+++ b/uitest/src/com/vaadin/tests/components/textarea/TextAreaTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/textarea/TextAreaWordwrap.html b/uitest/src/com/vaadin/tests/components/textarea/TextAreaWordwrap.html
index 43bb52b3e7..43bb52b3e7 100644
--- a/tests/testbench/com/vaadin/tests/components/textarea/TextAreaWordwrap.html
+++ b/uitest/src/com/vaadin/tests/components/textarea/TextAreaWordwrap.html
diff --git a/tests/testbench/com/vaadin/tests/components/textarea/Wordwrap.java b/uitest/src/com/vaadin/tests/components/textarea/Wordwrap.java
index 8672d4019e..8672d4019e 100644
--- a/tests/testbench/com/vaadin/tests/components/textarea/Wordwrap.java
+++ b/uitest/src/com/vaadin/tests/components/textarea/Wordwrap.java
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/EnterShortcutMaySendInputPromptAsValue.java b/uitest/src/com/vaadin/tests/components/textfield/EnterShortcutMaySendInputPromptAsValue.java
index 938ecf60ce..938ecf60ce 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/EnterShortcutMaySendInputPromptAsValue.java
+++ b/uitest/src/com/vaadin/tests/components/textfield/EnterShortcutMaySendInputPromptAsValue.java
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/IE6Cursor.java b/uitest/src/com/vaadin/tests/components/textfield/IE6Cursor.java
index eb3d3fdd51..eb3d3fdd51 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/IE6Cursor.java
+++ b/uitest/src/com/vaadin/tests/components/textfield/IE6Cursor.java
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/MultipleTextChangeEvents.java b/uitest/src/com/vaadin/tests/components/textfield/MultipleTextChangeEvents.java
index 58bc4c5383..58bc4c5383 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/MultipleTextChangeEvents.java
+++ b/uitest/src/com/vaadin/tests/components/textfield/MultipleTextChangeEvents.java
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/OutOfSyncIssueWithKeyboardShortcut.java b/uitest/src/com/vaadin/tests/components/textfield/OutOfSyncIssueWithKeyboardShortcut.java
index 955a9c2772..955a9c2772 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/OutOfSyncIssueWithKeyboardShortcut.java
+++ b/uitest/src/com/vaadin/tests/components/textfield/OutOfSyncIssueWithKeyboardShortcut.java
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/SelectionAndCursorPosition.html b/uitest/src/com/vaadin/tests/components/textfield/SelectionAndCursorPosition.html
index c058d8d975..c058d8d975 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/SelectionAndCursorPosition.html
+++ b/uitest/src/com/vaadin/tests/components/textfield/SelectionAndCursorPosition.html
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/SelectionAndCursorPosition.java b/uitest/src/com/vaadin/tests/components/textfield/SelectionAndCursorPosition.java
index f6368f0c78..f6368f0c78 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/SelectionAndCursorPosition.java
+++ b/uitest/src/com/vaadin/tests/components/textfield/SelectionAndCursorPosition.java
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/SetTabIndex.html b/uitest/src/com/vaadin/tests/components/textfield/SetTabIndex.html
index b61b464f97..b61b464f97 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/SetTabIndex.html
+++ b/uitest/src/com/vaadin/tests/components/textfield/SetTabIndex.html
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/SetTabIndex.java b/uitest/src/com/vaadin/tests/components/textfield/SetTabIndex.java
index da4ea9de0b..da4ea9de0b 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/SetTabIndex.java
+++ b/uitest/src/com/vaadin/tests/components/textfield/SetTabIndex.java
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/SizedTextFields.java b/uitest/src/com/vaadin/tests/components/textfield/SizedTextFields.java
index 7d993682fd..7d993682fd 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/SizedTextFields.java
+++ b/uitest/src/com/vaadin/tests/components/textfield/SizedTextFields.java
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextChangeEvents.java b/uitest/src/com/vaadin/tests/components/textfield/TextChangeEvents.java
index b38dd36284..b38dd36284 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/TextChangeEvents.java
+++ b/uitest/src/com/vaadin/tests/components/textfield/TextChangeEvents.java
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextChangeEvents2.java b/uitest/src/com/vaadin/tests/components/textfield/TextChangeEvents2.java
index 363e9d448d..363e9d448d 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/TextChangeEvents2.java
+++ b/uitest/src/com/vaadin/tests/components/textfield/TextChangeEvents2.java
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextChangeEventsEternalLoop.html b/uitest/src/com/vaadin/tests/components/textfield/TextChangeEventsEternalLoop.html
index 6f0772aa29..6f0772aa29 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/TextChangeEventsEternalLoop.html
+++ b/uitest/src/com/vaadin/tests/components/textfield/TextChangeEventsEternalLoop.html
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextChangeEventsEternalLoop.java b/uitest/src/com/vaadin/tests/components/textfield/TextChangeEventsEternalLoop.java
index 1a49729b6f..1a49729b6f 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/TextChangeEventsEternalLoop.java
+++ b/uitest/src/com/vaadin/tests/components/textfield/TextChangeEventsEternalLoop.java
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextChangeEventsWithNonImmediateValueChange.java b/uitest/src/com/vaadin/tests/components/textfield/TextChangeEventsWithNonImmediateValueChange.java
index ebb8b88411..ebb8b88411 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/TextChangeEventsWithNonImmediateValueChange.java
+++ b/uitest/src/com/vaadin/tests/components/textfield/TextChangeEventsWithNonImmediateValueChange.java
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextChangeListenerChangingNonTextProperties.html b/uitest/src/com/vaadin/tests/components/textfield/TextChangeListenerChangingNonTextProperties.html
index dc4c0bba13..dc4c0bba13 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/TextChangeListenerChangingNonTextProperties.html
+++ b/uitest/src/com/vaadin/tests/components/textfield/TextChangeListenerChangingNonTextProperties.html
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextChangeListenerChangingNonTextProperties.java b/uitest/src/com/vaadin/tests/components/textfield/TextChangeListenerChangingNonTextProperties.java
index 5991ac6ff7..5991ac6ff7 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/TextChangeListenerChangingNonTextProperties.java
+++ b/uitest/src/com/vaadin/tests/components/textfield/TextChangeListenerChangingNonTextProperties.java
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextChangeTimeoutAfterDetach.html b/uitest/src/com/vaadin/tests/components/textfield/TextChangeTimeoutAfterDetach.html
index 544cea9faa..544cea9faa 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/TextChangeTimeoutAfterDetach.html
+++ b/uitest/src/com/vaadin/tests/components/textfield/TextChangeTimeoutAfterDetach.html
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextChangeTimeoutAfterDetach.java b/uitest/src/com/vaadin/tests/components/textfield/TextChangeTimeoutAfterDetach.java
index 00783e0106..00783e0106 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/TextChangeTimeoutAfterDetach.java
+++ b/uitest/src/com/vaadin/tests/components/textfield/TextChangeTimeoutAfterDetach.java
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldBasicStates.html b/uitest/src/com/vaadin/tests/components/textfield/TextFieldBasicStates.html
index b38c24d7f5..b38c24d7f5 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldBasicStates.html
+++ b/uitest/src/com/vaadin/tests/components/textfield/TextFieldBasicStates.html
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldEagerRepaint.html b/uitest/src/com/vaadin/tests/components/textfield/TextFieldEagerRepaint.html
index 177a2f85cf..177a2f85cf 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldEagerRepaint.html
+++ b/uitest/src/com/vaadin/tests/components/textfield/TextFieldEagerRepaint.html
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldEagerRepaint.java b/uitest/src/com/vaadin/tests/components/textfield/TextFieldEagerRepaint.java
index e103afbe62..e103afbe62 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldEagerRepaint.java
+++ b/uitest/src/com/vaadin/tests/components/textfield/TextFieldEagerRepaint.java
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldFocusAndBlurListeners.java b/uitest/src/com/vaadin/tests/components/textfield/TextFieldFocusAndBlurListeners.java
index 21dba6a196..21dba6a196 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldFocusAndBlurListeners.java
+++ b/uitest/src/com/vaadin/tests/components/textfield/TextFieldFocusAndBlurListeners.java
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.html b/uitest/src/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.html
index e53e8ed601..e53e8ed601 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.html
+++ b/uitest/src/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.html
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.java b/uitest/src/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.java
index 903226c87c..903226c87c 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.java
+++ b/uitest/src/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.java
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldInputPromptAndClickShortcut.java b/uitest/src/com/vaadin/tests/components/textfield/TextFieldInputPromptAndClickShortcut.java
index d52efa0572..d52efa0572 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldInputPromptAndClickShortcut.java
+++ b/uitest/src/com/vaadin/tests/components/textfield/TextFieldInputPromptAndClickShortcut.java
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldMaxLength.html b/uitest/src/com/vaadin/tests/components/textfield/TextFieldMaxLength.html
index a0163352cc..a0163352cc 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldMaxLength.html
+++ b/uitest/src/com/vaadin/tests/components/textfield/TextFieldMaxLength.html
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldNullRepresentation.html b/uitest/src/com/vaadin/tests/components/textfield/TextFieldNullRepresentation.html
index c4a887d764..c4a887d764 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldNullRepresentation.html
+++ b/uitest/src/com/vaadin/tests/components/textfield/TextFieldNullRepresentation.html
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldNullRepresentationAndSelection.html b/uitest/src/com/vaadin/tests/components/textfield/TextFieldNullRepresentationAndSelection.html
index cfd397b4f2..cfd397b4f2 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldNullRepresentationAndSelection.html
+++ b/uitest/src/com/vaadin/tests/components/textfield/TextFieldNullRepresentationAndSelection.html
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldTest.java b/uitest/src/com/vaadin/tests/components/textfield/TextFieldTest.java
index 10793a8bad..10793a8bad 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldTest.java
+++ b/uitest/src/com/vaadin/tests/components/textfield/TextFieldTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldTextChangeEvent.html b/uitest/src/com/vaadin/tests/components/textfield/TextFieldTextChangeEvent.html
index ad98d72ce8..ad98d72ce8 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldTextChangeEvent.html
+++ b/uitest/src/com/vaadin/tests/components/textfield/TextFieldTextChangeEvent.html
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldWithProperty.html b/uitest/src/com/vaadin/tests/components/textfield/TextFieldWithProperty.html
index fd26e3613f..fd26e3613f 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldWithProperty.html
+++ b/uitest/src/com/vaadin/tests/components/textfield/TextFieldWithProperty.html
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldWithProperty.java b/uitest/src/com/vaadin/tests/components/textfield/TextFieldWithProperty.java
index 747301f4e4..747301f4e4 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldWithProperty.java
+++ b/uitest/src/com/vaadin/tests/components/textfield/TextFieldWithProperty.java
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldWithPropertyFormatter.html b/uitest/src/com/vaadin/tests/components/textfield/TextFieldWithPropertyFormatter.html
index f6406af84b..f6406af84b 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldWithPropertyFormatter.html
+++ b/uitest/src/com/vaadin/tests/components/textfield/TextFieldWithPropertyFormatter.html
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldWithPropertyFormatter.java b/uitest/src/com/vaadin/tests/components/textfield/TextFieldWithPropertyFormatter.java
index 4184892545..4184892545 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldWithPropertyFormatter.java
+++ b/uitest/src/com/vaadin/tests/components/textfield/TextFieldWithPropertyFormatter.java
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextFields.html b/uitest/src/com/vaadin/tests/components/textfield/TextFields.html
index 3a13fdbdcf..3a13fdbdcf 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/TextFields.html
+++ b/uitest/src/com/vaadin/tests/components/textfield/TextFields.html
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextFields.java b/uitest/src/com/vaadin/tests/components/textfield/TextFields.java
index 994769b1d1..994769b1d1 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/TextFields.java
+++ b/uitest/src/com/vaadin/tests/components/textfield/TextFields.java
diff --git a/tests/testbench/com/vaadin/tests/components/tree/ActionsOnTreeBackground.html b/uitest/src/com/vaadin/tests/components/tree/ActionsOnTreeBackground.html
index 8b679208d0..8b679208d0 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/ActionsOnTreeBackground.html
+++ b/uitest/src/com/vaadin/tests/components/tree/ActionsOnTreeBackground.html
diff --git a/tests/testbench/com/vaadin/tests/components/tree/CtrlShiftMultiselect.java b/uitest/src/com/vaadin/tests/components/tree/CtrlShiftMultiselect.java
index 03645557f2..03645557f2 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/CtrlShiftMultiselect.java
+++ b/uitest/src/com/vaadin/tests/components/tree/CtrlShiftMultiselect.java
diff --git a/tests/testbench/com/vaadin/tests/components/tree/ExpandCollapseTree.html b/uitest/src/com/vaadin/tests/components/tree/ExpandCollapseTree.html
index 8bb51204aa..8bb51204aa 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/ExpandCollapseTree.html
+++ b/uitest/src/com/vaadin/tests/components/tree/ExpandCollapseTree.html
diff --git a/tests/testbench/com/vaadin/tests/components/tree/ExpandCollapseTree.java b/uitest/src/com/vaadin/tests/components/tree/ExpandCollapseTree.java
index d5c3654b4e..d5c3654b4e 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/ExpandCollapseTree.java
+++ b/uitest/src/com/vaadin/tests/components/tree/ExpandCollapseTree.java
diff --git a/tests/testbench/com/vaadin/tests/components/tree/ItemStyleGenerator.java b/uitest/src/com/vaadin/tests/components/tree/ItemStyleGenerator.java
index 33bd4cef65..33bd4cef65 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/ItemStyleGenerator.java
+++ b/uitest/src/com/vaadin/tests/components/tree/ItemStyleGenerator.java
diff --git a/tests/testbench/com/vaadin/tests/components/tree/PreselectedTreeVisible.html b/uitest/src/com/vaadin/tests/components/tree/PreselectedTreeVisible.html
index 7f8bb408aa..7f8bb408aa 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/PreselectedTreeVisible.html
+++ b/uitest/src/com/vaadin/tests/components/tree/PreselectedTreeVisible.html
diff --git a/tests/testbench/com/vaadin/tests/components/tree/PreselectedTreeVisible.java b/uitest/src/com/vaadin/tests/components/tree/PreselectedTreeVisible.java
index b812c9e955..b812c9e955 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/PreselectedTreeVisible.java
+++ b/uitest/src/com/vaadin/tests/components/tree/PreselectedTreeVisible.java
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeConnectors-base.html b/uitest/src/com/vaadin/tests/components/tree/TreeConnectors-base.html
index 8b9aaab2f7..8b9aaab2f7 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeConnectors-base.html
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeConnectors-base.html
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeConnectors-chameleon.html b/uitest/src/com/vaadin/tests/components/tree/TreeConnectors-chameleon.html
index 0200c31b4a..0200c31b4a 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeConnectors-chameleon.html
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeConnectors-chameleon.html
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeConnectors-reindeer.html b/uitest/src/com/vaadin/tests/components/tree/TreeConnectors-reindeer.html
index f69dde73e4..f69dde73e4 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeConnectors-reindeer.html
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeConnectors-reindeer.html
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeConnectors-runo.html b/uitest/src/com/vaadin/tests/components/tree/TreeConnectors-runo.html
index 46d12bfb9d..46d12bfb9d 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeConnectors-runo.html
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeConnectors-runo.html
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeConnectors.java b/uitest/src/com/vaadin/tests/components/tree/TreeConnectors.java
index ab9bcd9a99..ab9bcd9a99 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeConnectors.java
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeConnectors.java
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeContainerChange b/uitest/src/com/vaadin/tests/components/tree/TreeContainerChange
index 8ea2dcc107..8ea2dcc107 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeContainerChange
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeContainerChange
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeContainerChange.java b/uitest/src/com/vaadin/tests/components/tree/TreeContainerChange.java
index f4374ca2ee..f4374ca2ee 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeContainerChange.java
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeContainerChange.java
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeContextMenuAndIcons.html b/uitest/src/com/vaadin/tests/components/tree/TreeContextMenuAndIcons.html
index 6f9b5e81c3..6f9b5e81c3 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeContextMenuAndIcons.html
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeContextMenuAndIcons.html
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeDragAndDropFromTable.html b/uitest/src/com/vaadin/tests/components/tree/TreeDragAndDropFromTable.html
index b093bd90d6..b093bd90d6 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeDragAndDropFromTable.html
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeDragAndDropFromTable.html
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeDragAndDropFromTable.java b/uitest/src/com/vaadin/tests/components/tree/TreeDragAndDropFromTable.java
index 7aa3933752..7aa3933752 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeDragAndDropFromTable.java
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeDragAndDropFromTable.java
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeFiltering.html b/uitest/src/com/vaadin/tests/components/tree/TreeFiltering.html
index 2b08cdf865..2b08cdf865 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeFiltering.html
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeFiltering.html
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeFiltering.java b/uitest/src/com/vaadin/tests/components/tree/TreeFiltering.java
index be65a335be..be65a335be 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeFiltering.java
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeFiltering.java
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeFocusGaining.html b/uitest/src/com/vaadin/tests/components/tree/TreeFocusGaining.html
index 74a69ec203..74a69ec203 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeFocusGaining.html
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeFocusGaining.html
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeFocusGaining.java b/uitest/src/com/vaadin/tests/components/tree/TreeFocusGaining.java
index dd407fd62a..dd407fd62a 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeFocusGaining.java
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeFocusGaining.java
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeHorizontalResize.html b/uitest/src/com/vaadin/tests/components/tree/TreeHorizontalResize.html
index 8e882e215d..8e882e215d 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeHorizontalResize.html
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeHorizontalResize.html
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeHorizontalResize.java b/uitest/src/com/vaadin/tests/components/tree/TreeHorizontalResize.java
index 1fa73ccd6d..1fa73ccd6d 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeHorizontalResize.java
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeHorizontalResize.java
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeItemClickAndValueChange.html b/uitest/src/com/vaadin/tests/components/tree/TreeItemClickAndValueChange.html
index bf83a1acdb..bf83a1acdb 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeItemClickAndValueChange.html
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeItemClickAndValueChange.html
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeItemClickListening.html b/uitest/src/com/vaadin/tests/components/tree/TreeItemClickListening.html
index 841565df2f..841565df2f 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeItemClickListening.html
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeItemClickListening.html
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeItemClickListening.java b/uitest/src/com/vaadin/tests/components/tree/TreeItemClickListening.java
index 182bc97c44..182bc97c44 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeItemClickListening.java
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeItemClickListening.java
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeKeyboardNavigationScroll.html b/uitest/src/com/vaadin/tests/components/tree/TreeKeyboardNavigationScroll.html
index 0f0db2b71e..0f0db2b71e 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeKeyboardNavigationScroll.html
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeKeyboardNavigationScroll.html
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeKeyboardNavigationScrolls.java b/uitest/src/com/vaadin/tests/components/tree/TreeKeyboardNavigationScrolls.java
index ff3e52505f..ff3e52505f 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeKeyboardNavigationScrolls.java
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeKeyboardNavigationScrolls.java
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeKeyboardNavigationValidators.html b/uitest/src/com/vaadin/tests/components/tree/TreeKeyboardNavigationValidators.html
index 2439079d09..2439079d09 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeKeyboardNavigationValidators.html
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeKeyboardNavigationValidators.html
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeKeyboardNavigationValidators.java b/uitest/src/com/vaadin/tests/components/tree/TreeKeyboardNavigationValidators.java
index 9204f0495b..9204f0495b 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeKeyboardNavigationValidators.java
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeKeyboardNavigationValidators.java
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeNodeCaptionWrapping.html b/uitest/src/com/vaadin/tests/components/tree/TreeNodeCaptionWrapping.html
index f98482f4c7..f98482f4c7 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeNodeCaptionWrapping.html
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeNodeCaptionWrapping.html
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeNodeCaptionWrapping.java b/uitest/src/com/vaadin/tests/components/tree/TreeNodeCaptionWrapping.java
index f885e1d1da..f885e1d1da 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeNodeCaptionWrapping.java
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeNodeCaptionWrapping.java
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreePerformanceTest.java b/uitest/src/com/vaadin/tests/components/tree/TreePerformanceTest.java
index 892b7e669a..892b7e669a 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreePerformanceTest.java
+++ b/uitest/src/com/vaadin/tests/components/tree/TreePerformanceTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeScrolling.html b/uitest/src/com/vaadin/tests/components/tree/TreeScrolling.html
index 880d52ed75..880d52ed75 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeScrolling.html
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeScrolling.html
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeScrolling.java b/uitest/src/com/vaadin/tests/components/tree/TreeScrolling.java
index 70c2d5d433..70c2d5d433 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeScrolling.java
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeScrolling.java
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeScrollingOnSelection.html b/uitest/src/com/vaadin/tests/components/tree/TreeScrollingOnSelection.html
index bd8e944c32..bd8e944c32 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeScrollingOnSelection.html
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeScrollingOnSelection.html
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeScrollingOnSelection.java b/uitest/src/com/vaadin/tests/components/tree/TreeScrollingOnSelection.java
index b3ab5c2b01..b3ab5c2b01 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeScrollingOnSelection.java
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeScrollingOnSelection.java
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeShiftMultiSelectNodes.html b/uitest/src/com/vaadin/tests/components/tree/TreeShiftMultiSelectNodes.html
index 53709b2a64..53709b2a64 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeShiftMultiSelectNodes.html
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeShiftMultiSelectNodes.html
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeToolTips.java b/uitest/src/com/vaadin/tests/components/tree/TreeToolTips.java
index 4b892c2150..4b892c2150 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeToolTips.java
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeToolTips.java
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeTooltip.html b/uitest/src/com/vaadin/tests/components/tree/TreeTooltip.html
index afebdaacd5..afebdaacd5 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeTooltip.html
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeTooltip.html
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeWithIcons.html b/uitest/src/com/vaadin/tests/components/tree/TreeWithIcons.html
index 0b01807054..0b01807054 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeWithIcons.html
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeWithIcons.html
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeWithIcons.java b/uitest/src/com/vaadin/tests/components/tree/TreeWithIcons.java
index 99618c0e5d..99618c0e5d 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeWithIcons.java
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeWithIcons.java
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeWithPreselectedItemNotShown.java b/uitest/src/com/vaadin/tests/components/tree/TreeWithPreselectedItemNotShown.java
index 8da6759b20..8da6759b20 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeWithPreselectedItemNotShown.java
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeWithPreselectedItemNotShown.java
diff --git a/tests/testbench/com/vaadin/tests/components/tree/Trees.java b/uitest/src/com/vaadin/tests/components/tree/Trees.java
index 3ee1d7b0de..3ee1d7b0de 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/Trees.java
+++ b/uitest/src/com/vaadin/tests/components/tree/Trees.java
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/AddItemToEmptyTreeTable.html b/uitest/src/com/vaadin/tests/components/treetable/AddItemToEmptyTreeTable.html
index 15dc0e074d..15dc0e074d 100755
--- a/tests/testbench/com/vaadin/tests/components/treetable/AddItemToEmptyTreeTable.html
+++ b/uitest/src/com/vaadin/tests/components/treetable/AddItemToEmptyTreeTable.html
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/AddNodesOnExpand.html b/uitest/src/com/vaadin/tests/components/treetable/AddNodesOnExpand.html
index efcbded1d5..efcbded1d5 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/AddNodesOnExpand.html
+++ b/uitest/src/com/vaadin/tests/components/treetable/AddNodesOnExpand.html
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/AddNodesOnExpand.java b/uitest/src/com/vaadin/tests/components/treetable/AddNodesOnExpand.java
index f6b32aa4a9..f6b32aa4a9 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/AddNodesOnExpand.java
+++ b/uitest/src/com/vaadin/tests/components/treetable/AddNodesOnExpand.java
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/ChangeDataSourcePageLengthZero.html b/uitest/src/com/vaadin/tests/components/treetable/ChangeDataSourcePageLengthZero.html
index 8391ca186d..8391ca186d 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/ChangeDataSourcePageLengthZero.html
+++ b/uitest/src/com/vaadin/tests/components/treetable/ChangeDataSourcePageLengthZero.html
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/ChangeDataSourcePageLengthZero.java b/uitest/src/com/vaadin/tests/components/treetable/ChangeDataSourcePageLengthZero.java
index 4cf17aef48..4cf17aef48 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/ChangeDataSourcePageLengthZero.java
+++ b/uitest/src/com/vaadin/tests/components/treetable/ChangeDataSourcePageLengthZero.java
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/ComponentsInTreeTable.html b/uitest/src/com/vaadin/tests/components/treetable/ComponentsInTreeTable.html
index 05c5986e6b..05c5986e6b 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/ComponentsInTreeTable.html
+++ b/uitest/src/com/vaadin/tests/components/treetable/ComponentsInTreeTable.html
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/ComponentsInTreeTable.java b/uitest/src/com/vaadin/tests/components/treetable/ComponentsInTreeTable.java
index 8ff80204cc..8ff80204cc 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/ComponentsInTreeTable.java
+++ b/uitest/src/com/vaadin/tests/components/treetable/ComponentsInTreeTable.java
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/DisappearingComponents.html b/uitest/src/com/vaadin/tests/components/treetable/DisappearingComponents.html
index 1a20b798ec..1a20b798ec 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/DisappearingComponents.html
+++ b/uitest/src/com/vaadin/tests/components/treetable/DisappearingComponents.html
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/DisappearingComponents.java b/uitest/src/com/vaadin/tests/components/treetable/DisappearingComponents.java
index d9f6dcc2ac..d9f6dcc2ac 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/DisappearingComponents.java
+++ b/uitest/src/com/vaadin/tests/components/treetable/DisappearingComponents.java
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/DynamicallyModified.html b/uitest/src/com/vaadin/tests/components/treetable/DynamicallyModified.html
index 01bbb75361..01bbb75361 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/DynamicallyModified.html
+++ b/uitest/src/com/vaadin/tests/components/treetable/DynamicallyModified.html
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/DynamicallyModified.java b/uitest/src/com/vaadin/tests/components/treetable/DynamicallyModified.java
index 6dc5417d28..6dc5417d28 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/DynamicallyModified.java
+++ b/uitest/src/com/vaadin/tests/components/treetable/DynamicallyModified.java
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/ExpandAndCollapseListeners.html b/uitest/src/com/vaadin/tests/components/treetable/ExpandAndCollapseListeners.html
index 81a62aaa50..81a62aaa50 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/ExpandAndCollapseListeners.html
+++ b/uitest/src/com/vaadin/tests/components/treetable/ExpandAndCollapseListeners.html
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/ExpandAnimationsInChameleon.java b/uitest/src/com/vaadin/tests/components/treetable/ExpandAnimationsInChameleon.java
index 2042edeea2..2042edeea2 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/ExpandAnimationsInChameleon.java
+++ b/uitest/src/com/vaadin/tests/components/treetable/ExpandAnimationsInChameleon.java
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/KeepAllItemsVisible.html b/uitest/src/com/vaadin/tests/components/treetable/KeepAllItemsVisible.html
index 0d92deec16..0d92deec16 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/KeepAllItemsVisible.html
+++ b/uitest/src/com/vaadin/tests/components/treetable/KeepAllItemsVisible.html
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/KeepAllItemsVisible.java b/uitest/src/com/vaadin/tests/components/treetable/KeepAllItemsVisible.java
index f444b781dd..f444b781dd 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/KeepAllItemsVisible.java
+++ b/uitest/src/com/vaadin/tests/components/treetable/KeepAllItemsVisible.java
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/ProgrammaticCollapse.html b/uitest/src/com/vaadin/tests/components/treetable/ProgrammaticCollapse.html
index 44dd858378..44dd858378 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/ProgrammaticCollapse.html
+++ b/uitest/src/com/vaadin/tests/components/treetable/ProgrammaticCollapse.html
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/ProgrammaticCollapse.java b/uitest/src/com/vaadin/tests/components/treetable/ProgrammaticCollapse.java
index ea76a9639a..ea76a9639a 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/ProgrammaticCollapse.java
+++ b/uitest/src/com/vaadin/tests/components/treetable/ProgrammaticCollapse.java
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/ProgrammaticSelect.java b/uitest/src/com/vaadin/tests/components/treetable/ProgrammaticSelect.java
index 7088497b4e..7088497b4e 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/ProgrammaticSelect.java
+++ b/uitest/src/com/vaadin/tests/components/treetable/ProgrammaticSelect.java
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/RemoveAllItemsRefresh.html b/uitest/src/com/vaadin/tests/components/treetable/RemoveAllItemsRefresh.html
index 1d4c65498b..1d4c65498b 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/RemoveAllItemsRefresh.html
+++ b/uitest/src/com/vaadin/tests/components/treetable/RemoveAllItemsRefresh.html
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/RemoveAllItemsRefresh.java b/uitest/src/com/vaadin/tests/components/treetable/RemoveAllItemsRefresh.java
index e0f68225cd..e0f68225cd 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/RemoveAllItemsRefresh.java
+++ b/uitest/src/com/vaadin/tests/components/treetable/RemoveAllItemsRefresh.java
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/RowAnimation.html b/uitest/src/com/vaadin/tests/components/treetable/RowAnimation.html
index 64ff061c13..64ff061c13 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/RowAnimation.html
+++ b/uitest/src/com/vaadin/tests/components/treetable/RowAnimation.html
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableCacheOnPartialUpdate.html b/uitest/src/com/vaadin/tests/components/treetable/TreeTableCacheOnPartialUpdate.html
index 499c30c86a..499c30c86a 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableCacheOnPartialUpdate.html
+++ b/uitest/src/com/vaadin/tests/components/treetable/TreeTableCacheOnPartialUpdate.html
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableCacheOnPartialUpdates.java b/uitest/src/com/vaadin/tests/components/treetable/TreeTableCacheOnPartialUpdates.java
index c2bd3da860..c2bd3da860 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableCacheOnPartialUpdates.java
+++ b/uitest/src/com/vaadin/tests/components/treetable/TreeTableCacheOnPartialUpdates.java
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableExpandWithRowStyle.html b/uitest/src/com/vaadin/tests/components/treetable/TreeTableExpandWithRowStyle.html
index 2143de2607..2143de2607 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableExpandWithRowStyle.html
+++ b/uitest/src/com/vaadin/tests/components/treetable/TreeTableExpandWithRowStyle.html
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableGeneratedColumns.html b/uitest/src/com/vaadin/tests/components/treetable/TreeTableGeneratedColumns.html
index 09014f3aa0..09014f3aa0 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableGeneratedColumns.html
+++ b/uitest/src/com/vaadin/tests/components/treetable/TreeTableGeneratedColumns.html
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableGeneratedRows.html b/uitest/src/com/vaadin/tests/components/treetable/TreeTableGeneratedRows.html
index 6419a8c251..6419a8c251 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableGeneratedRows.html
+++ b/uitest/src/com/vaadin/tests/components/treetable/TreeTableGeneratedRows.html
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableModifyAndSetCollapsed.java b/uitest/src/com/vaadin/tests/components/treetable/TreeTableModifyAndSetCollapsed.java
index 02ce397a05..02ce397a05 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableModifyAndSetCollapsed.java
+++ b/uitest/src/com/vaadin/tests/components/treetable/TreeTableModifyAndSetCollapsed.java
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableNegativeArraySize.html b/uitest/src/com/vaadin/tests/components/treetable/TreeTableNegativeArraySize.html
index b57c5f978e..b57c5f978e 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableNegativeArraySize.html
+++ b/uitest/src/com/vaadin/tests/components/treetable/TreeTableNegativeArraySize.html
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableOutOfSync.html b/uitest/src/com/vaadin/tests/components/treetable/TreeTableOutOfSync.html
index b8d6cdb22e..b8d6cdb22e 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableOutOfSync.html
+++ b/uitest/src/com/vaadin/tests/components/treetable/TreeTableOutOfSync.html
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableOutOfSync.java b/uitest/src/com/vaadin/tests/components/treetable/TreeTableOutOfSync.java
index 1949697956..1949697956 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableOutOfSync.java
+++ b/uitest/src/com/vaadin/tests/components/treetable/TreeTableOutOfSync.java
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/TreeTablePartialUpdates-LongScroll.html b/uitest/src/com/vaadin/tests/components/treetable/TreeTablePartialUpdates-LongScroll.html
index 276725e6bd..276725e6bd 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/TreeTablePartialUpdates-LongScroll.html
+++ b/uitest/src/com/vaadin/tests/components/treetable/TreeTablePartialUpdates-LongScroll.html
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/TreeTablePartialUpdates.java b/uitest/src/com/vaadin/tests/components/treetable/TreeTablePartialUpdates.java
index 23eaa5dfea..23eaa5dfea 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/TreeTablePartialUpdates.java
+++ b/uitest/src/com/vaadin/tests/components/treetable/TreeTablePartialUpdates.java
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesPageLength0.html b/uitest/src/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesPageLength0.html
index 645135575d..645135575d 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesPageLength0.html
+++ b/uitest/src/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesPageLength0.html
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesPageLength0.java b/uitest/src/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesPageLength0.java
index 20412bf0e2..20412bf0e2 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesPageLength0.java
+++ b/uitest/src/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesPageLength0.java
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableSetCollapsed.html b/uitest/src/com/vaadin/tests/components/treetable/TreeTableSetCollapsed.html
index 5c878dba42..5c878dba42 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableSetCollapsed.html
+++ b/uitest/src/com/vaadin/tests/components/treetable/TreeTableSetCollapsed.html
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableSetCollapsed.java b/uitest/src/com/vaadin/tests/components/treetable/TreeTableSetCollapsed.java
index 7159addb5b..7159addb5b 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableSetCollapsed.java
+++ b/uitest/src/com/vaadin/tests/components/treetable/TreeTableSetCollapsed.java
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableTest.java b/uitest/src/com/vaadin/tests/components/treetable/TreeTableTest.java
index f27a47f12b..f27a47f12b 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableTest.java
+++ b/uitest/src/com/vaadin/tests/components/treetable/TreeTableTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/twincolselect/TwinColSelectSelection.html b/uitest/src/com/vaadin/tests/components/twincolselect/TwinColSelectSelection.html
index a34a14eeef..a34a14eeef 100644
--- a/tests/testbench/com/vaadin/tests/components/twincolselect/TwinColSelectSelection.html
+++ b/uitest/src/com/vaadin/tests/components/twincolselect/TwinColSelectSelection.html
diff --git a/tests/testbench/com/vaadin/tests/components/twincolselect/TwinColSelects.java b/uitest/src/com/vaadin/tests/components/twincolselect/TwinColSelects.java
index fc1b11bb94..fc1b11bb94 100644
--- a/tests/testbench/com/vaadin/tests/components/twincolselect/TwinColSelects.java
+++ b/uitest/src/com/vaadin/tests/components/twincolselect/TwinColSelects.java
diff --git a/tests/testbench/com/vaadin/tests/components/ui/LazyInitUIs.html b/uitest/src/com/vaadin/tests/components/ui/LazyInitUIs.html
index d7e1544026..d7e1544026 100644
--- a/tests/testbench/com/vaadin/tests/components/ui/LazyInitUIs.html
+++ b/uitest/src/com/vaadin/tests/components/ui/LazyInitUIs.html
diff --git a/tests/testbench/com/vaadin/tests/components/ui/LazyInitUIs.java b/uitest/src/com/vaadin/tests/components/ui/LazyInitUIs.java
index 34bf8f6715..34bf8f6715 100644
--- a/tests/testbench/com/vaadin/tests/components/ui/LazyInitUIs.java
+++ b/uitest/src/com/vaadin/tests/components/ui/LazyInitUIs.java
diff --git a/tests/testbench/com/vaadin/tests/components/ui/TestUITheme.html b/uitest/src/com/vaadin/tests/components/ui/TestUITheme.html
index ed2c0ec971..ed2c0ec971 100644
--- a/tests/testbench/com/vaadin/tests/components/ui/TestUITheme.html
+++ b/uitest/src/com/vaadin/tests/components/ui/TestUITheme.html
diff --git a/tests/testbench/com/vaadin/tests/components/ui/TestUITheme.java b/uitest/src/com/vaadin/tests/components/ui/TestUITheme.java
index ec0cdf53a2..ec0cdf53a2 100644
--- a/tests/testbench/com/vaadin/tests/components/ui/TestUITheme.java
+++ b/uitest/src/com/vaadin/tests/components/ui/TestUITheme.java
diff --git a/tests/testbench/com/vaadin/tests/components/ui/TestUIWidgetset.html b/uitest/src/com/vaadin/tests/components/ui/TestUIWidgetset.html
index 2f0858b4c7..2f0858b4c7 100644
--- a/tests/testbench/com/vaadin/tests/components/ui/TestUIWidgetset.html
+++ b/uitest/src/com/vaadin/tests/components/ui/TestUIWidgetset.html
diff --git a/tests/testbench/com/vaadin/tests/components/ui/TestUIWidgetset.java b/uitest/src/com/vaadin/tests/components/ui/TestUIWidgetset.java
index 99c3c49f72..99c3c49f72 100644
--- a/tests/testbench/com/vaadin/tests/components/ui/TestUIWidgetset.java
+++ b/uitest/src/com/vaadin/tests/components/ui/TestUIWidgetset.java
diff --git a/tests/testbench/com/vaadin/tests/components/ui/TestUIWidgetset2.java b/uitest/src/com/vaadin/tests/components/ui/TestUIWidgetset2.java
index b9cdb7a3dc..b9cdb7a3dc 100644
--- a/tests/testbench/com/vaadin/tests/components/ui/TestUIWidgetset2.java
+++ b/uitest/src/com/vaadin/tests/components/ui/TestUIWidgetset2.java
diff --git a/tests/testbench/com/vaadin/tests/components/ui/UIInitException.java b/uitest/src/com/vaadin/tests/components/ui/UIInitException.java
index e225ae73d8..e225ae73d8 100644
--- a/tests/testbench/com/vaadin/tests/components/ui/UIInitException.java
+++ b/uitest/src/com/vaadin/tests/components/ui/UIInitException.java
diff --git a/tests/testbench/com/vaadin/tests/components/ui/UIInitTest.java b/uitest/src/com/vaadin/tests/components/ui/UIInitTest.java
index 68e6a4da34..68e6a4da34 100644
--- a/tests/testbench/com/vaadin/tests/components/ui/UIInitTest.java
+++ b/uitest/src/com/vaadin/tests/components/ui/UIInitTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/ui/UIsInMultipleTabs.html b/uitest/src/com/vaadin/tests/components/ui/UIsInMultipleTabs.html
index 08561588c4..08561588c4 100644
--- a/tests/testbench/com/vaadin/tests/components/ui/UIsInMultipleTabs.html
+++ b/uitest/src/com/vaadin/tests/components/ui/UIsInMultipleTabs.html
diff --git a/tests/testbench/com/vaadin/tests/components/ui/UIsInMultipleTabs.java b/uitest/src/com/vaadin/tests/components/ui/UIsInMultipleTabs.java
index 022db1bf3e..022db1bf3e 100644
--- a/tests/testbench/com/vaadin/tests/components/ui/UIsInMultipleTabs.java
+++ b/uitest/src/com/vaadin/tests/components/ui/UIsInMultipleTabs.java
diff --git a/tests/testbench/com/vaadin/tests/components/ui/UriFragmentTest.html b/uitest/src/com/vaadin/tests/components/ui/UriFragmentTest.html
index bcb9f52afe..bcb9f52afe 100644
--- a/tests/testbench/com/vaadin/tests/components/ui/UriFragmentTest.html
+++ b/uitest/src/com/vaadin/tests/components/ui/UriFragmentTest.html
diff --git a/tests/testbench/com/vaadin/tests/components/ui/UriFragmentTest.java b/uitest/src/com/vaadin/tests/components/ui/UriFragmentTest.java
index b64770408b..b64770408b 100644
--- a/tests/testbench/com/vaadin/tests/components/ui/UriFragmentTest.java
+++ b/uitest/src/com/vaadin/tests/components/ui/UriFragmentTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/upload/ForceSubmit.java b/uitest/src/com/vaadin/tests/components/upload/ForceSubmit.java
index 47aad46348..47aad46348 100644
--- a/tests/testbench/com/vaadin/tests/components/upload/ForceSubmit.java
+++ b/uitest/src/com/vaadin/tests/components/upload/ForceSubmit.java
diff --git a/tests/testbench/com/vaadin/tests/components/upload/TestFileUpload.java b/uitest/src/com/vaadin/tests/components/upload/TestFileUpload.java
index ad86d0f593..ad86d0f593 100644
--- a/tests/testbench/com/vaadin/tests/components/upload/TestFileUpload.java
+++ b/uitest/src/com/vaadin/tests/components/upload/TestFileUpload.java
diff --git a/tests/testbench/com/vaadin/tests/components/upload/TestImmediateUploadInFormLayout.java b/uitest/src/com/vaadin/tests/components/upload/TestImmediateUploadInFormLayout.java
index 7607536357..7607536357 100644
--- a/tests/testbench/com/vaadin/tests/components/upload/TestImmediateUploadInFormLayout.java
+++ b/uitest/src/com/vaadin/tests/components/upload/TestImmediateUploadInFormLayout.java
diff --git a/tests/testbench/com/vaadin/tests/components/upload/TestUpload.java b/uitest/src/com/vaadin/tests/components/upload/TestUpload.java
index 9ca0cb9c38..9ca0cb9c38 100644
--- a/tests/testbench/com/vaadin/tests/components/upload/TestUpload.java
+++ b/uitest/src/com/vaadin/tests/components/upload/TestUpload.java
diff --git a/tests/testbench/com/vaadin/tests/components/upload/TestUploadAndDisableOnSuccess.java b/uitest/src/com/vaadin/tests/components/upload/TestUploadAndDisableOnSuccess.java
index 516ca2d7c9..516ca2d7c9 100644
--- a/tests/testbench/com/vaadin/tests/components/upload/TestUploadAndDisableOnSuccess.java
+++ b/uitest/src/com/vaadin/tests/components/upload/TestUploadAndDisableOnSuccess.java
diff --git a/tests/testbench/com/vaadin/tests/components/upload/TestUploadFilename.java b/uitest/src/com/vaadin/tests/components/upload/TestUploadFilename.java
index de0cca5009..de0cca5009 100644
--- a/tests/testbench/com/vaadin/tests/components/upload/TestUploadFilename.java
+++ b/uitest/src/com/vaadin/tests/components/upload/TestUploadFilename.java
diff --git a/tests/testbench/com/vaadin/tests/components/upload/file-binary-cb4a65687deb859957ad4b0fd9d67eac.png b/uitest/src/com/vaadin/tests/components/upload/file-binary-cb4a65687deb859957ad4b0fd9d67eac.png
index 39daa93ea5..39daa93ea5 100644
--- a/tests/testbench/com/vaadin/tests/components/upload/file-binary-cb4a65687deb859957ad4b0fd9d67eac.png
+++ b/uitest/src/com/vaadin/tests/components/upload/file-binary-cb4a65687deb859957ad4b0fd9d67eac.png
diff --git a/tests/testbench/com/vaadin/tests/components/upload/file-text-6ebed606225d0b6254d45f51aa2dfe9f b/uitest/src/com/vaadin/tests/components/upload/file-text-6ebed606225d0b6254d45f51aa2dfe9f
index 584a249bba..584a249bba 100644
--- a/tests/testbench/com/vaadin/tests/components/upload/file-text-6ebed606225d0b6254d45f51aa2dfe9f
+++ b/uitest/src/com/vaadin/tests/components/upload/file-text-6ebed606225d0b6254d45f51aa2dfe9f
diff --git a/tests/testbench/com/vaadin/tests/components/window/AttachShouldBeCalledForSubWindows.java b/uitest/src/com/vaadin/tests/components/window/AttachShouldBeCalledForSubWindows.java
index 6d2623c199..6d2623c199 100644
--- a/tests/testbench/com/vaadin/tests/components/window/AttachShouldBeCalledForSubWindows.java
+++ b/uitest/src/com/vaadin/tests/components/window/AttachShouldBeCalledForSubWindows.java
diff --git a/tests/testbench/com/vaadin/tests/components/window/CenteredWindowWithUndefinedSize.html b/uitest/src/com/vaadin/tests/components/window/CenteredWindowWithUndefinedSize.html
index 2e15d8d645..2e15d8d645 100644
--- a/tests/testbench/com/vaadin/tests/components/window/CenteredWindowWithUndefinedSize.html
+++ b/uitest/src/com/vaadin/tests/components/window/CenteredWindowWithUndefinedSize.html
diff --git a/tests/testbench/com/vaadin/tests/components/window/CenteredWindowWithUndefinedSize.java b/uitest/src/com/vaadin/tests/components/window/CenteredWindowWithUndefinedSize.java
index a7fcda3cf1..a7fcda3cf1 100644
--- a/tests/testbench/com/vaadin/tests/components/window/CenteredWindowWithUndefinedSize.java
+++ b/uitest/src/com/vaadin/tests/components/window/CenteredWindowWithUndefinedSize.java
diff --git a/tests/testbench/com/vaadin/tests/components/window/CloseSubWindow.html b/uitest/src/com/vaadin/tests/components/window/CloseSubWindow.html
index 6e3eb906b7..6e3eb906b7 100644
--- a/tests/testbench/com/vaadin/tests/components/window/CloseSubWindow.html
+++ b/uitest/src/com/vaadin/tests/components/window/CloseSubWindow.html
diff --git a/tests/testbench/com/vaadin/tests/components/window/CloseSubWindow.java b/uitest/src/com/vaadin/tests/components/window/CloseSubWindow.java
index 8060ec9955..8060ec9955 100644
--- a/tests/testbench/com/vaadin/tests/components/window/CloseSubWindow.java
+++ b/uitest/src/com/vaadin/tests/components/window/CloseSubWindow.java
diff --git a/tests/testbench/com/vaadin/tests/components/window/DownloadAndUpdate.java b/uitest/src/com/vaadin/tests/components/window/DownloadAndUpdate.java
index 573f55b29d..573f55b29d 100644
--- a/tests/testbench/com/vaadin/tests/components/window/DownloadAndUpdate.java
+++ b/uitest/src/com/vaadin/tests/components/window/DownloadAndUpdate.java
diff --git a/tests/testbench/com/vaadin/tests/components/window/EmbeddedInSubWindow.html b/uitest/src/com/vaadin/tests/components/window/EmbeddedInSubWindow.html
index d74e09dd6a..d74e09dd6a 100644
--- a/tests/testbench/com/vaadin/tests/components/window/EmbeddedInSubWindow.html
+++ b/uitest/src/com/vaadin/tests/components/window/EmbeddedInSubWindow.html
diff --git a/tests/testbench/com/vaadin/tests/components/window/EmbeddedInSubWindow.java b/uitest/src/com/vaadin/tests/components/window/EmbeddedInSubWindow.java
index 6ca5837cee..6ca5837cee 100644
--- a/tests/testbench/com/vaadin/tests/components/window/EmbeddedInSubWindow.java
+++ b/uitest/src/com/vaadin/tests/components/window/EmbeddedInSubWindow.java
diff --git a/tests/testbench/com/vaadin/tests/components/window/ExecuteJavaScript.java b/uitest/src/com/vaadin/tests/components/window/ExecuteJavaScript.java
index 92e0e734ff..92e0e734ff 100644
--- a/tests/testbench/com/vaadin/tests/components/window/ExecuteJavaScript.java
+++ b/uitest/src/com/vaadin/tests/components/window/ExecuteJavaScript.java
diff --git a/tests/testbench/com/vaadin/tests/components/window/ExtraLargeSubWindow.html b/uitest/src/com/vaadin/tests/components/window/ExtraLargeSubWindow.html
index 128e3c3583..128e3c3583 100644
--- a/tests/testbench/com/vaadin/tests/components/window/ExtraLargeSubWindow.html
+++ b/uitest/src/com/vaadin/tests/components/window/ExtraLargeSubWindow.html
diff --git a/tests/testbench/com/vaadin/tests/components/window/ExtraLargeSubWindow.java b/uitest/src/com/vaadin/tests/components/window/ExtraLargeSubWindow.java
index 5ce0636f6f..5ce0636f6f 100644
--- a/tests/testbench/com/vaadin/tests/components/window/ExtraLargeSubWindow.java
+++ b/uitest/src/com/vaadin/tests/components/window/ExtraLargeSubWindow.java
diff --git a/tests/testbench/com/vaadin/tests/components/window/ExtraWindowShown.html b/uitest/src/com/vaadin/tests/components/window/ExtraWindowShown.html
index 65e8b0166b..65e8b0166b 100644
--- a/tests/testbench/com/vaadin/tests/components/window/ExtraWindowShown.html
+++ b/uitest/src/com/vaadin/tests/components/window/ExtraWindowShown.html
diff --git a/tests/testbench/com/vaadin/tests/components/window/ExtraWindowShown.java b/uitest/src/com/vaadin/tests/components/window/ExtraWindowShown.java
index 03deb4ea20..03deb4ea20 100644
--- a/tests/testbench/com/vaadin/tests/components/window/ExtraWindowShown.java
+++ b/uitest/src/com/vaadin/tests/components/window/ExtraWindowShown.java
diff --git a/tests/testbench/com/vaadin/tests/components/window/FullSizedWindow.java b/uitest/src/com/vaadin/tests/components/window/FullSizedWindow.java
index 6d0dc74e93..6d0dc74e93 100644
--- a/tests/testbench/com/vaadin/tests/components/window/FullSizedWindow.java
+++ b/uitest/src/com/vaadin/tests/components/window/FullSizedWindow.java
diff --git a/tests/testbench/com/vaadin/tests/components/window/HugeWindowShouldBeClosable.java b/uitest/src/com/vaadin/tests/components/window/HugeWindowShouldBeClosable.java
index 3b8067c726..3b8067c726 100644
--- a/tests/testbench/com/vaadin/tests/components/window/HugeWindowShouldBeClosable.java
+++ b/uitest/src/com/vaadin/tests/components/window/HugeWindowShouldBeClosable.java
diff --git a/tests/testbench/com/vaadin/tests/components/window/LazyWindowResize.java b/uitest/src/com/vaadin/tests/components/window/LazyWindowResize.java
index bacc4c131c..bacc4c131c 100644
--- a/tests/testbench/com/vaadin/tests/components/window/LazyWindowResize.java
+++ b/uitest/src/com/vaadin/tests/components/window/LazyWindowResize.java
diff --git a/tests/testbench/com/vaadin/tests/components/window/LongNotifications.java b/uitest/src/com/vaadin/tests/components/window/LongNotifications.java
index be67cfe9a0..be67cfe9a0 100644
--- a/tests/testbench/com/vaadin/tests/components/window/LongNotifications.java
+++ b/uitest/src/com/vaadin/tests/components/window/LongNotifications.java
diff --git a/tests/testbench/com/vaadin/tests/components/window/ModalWindowNativeSelect.java b/uitest/src/com/vaadin/tests/components/window/ModalWindowNativeSelect.java
index 2c6d3c942f..2c6d3c942f 100644
--- a/tests/testbench/com/vaadin/tests/components/window/ModalWindowNativeSelect.java
+++ b/uitest/src/com/vaadin/tests/components/window/ModalWindowNativeSelect.java
diff --git a/tests/testbench/com/vaadin/tests/components/window/PositionedSubWindows.java b/uitest/src/com/vaadin/tests/components/window/PositionedSubWindows.java
index 9fe44dd7e8..9fe44dd7e8 100644
--- a/tests/testbench/com/vaadin/tests/components/window/PositionedSubWindows.java
+++ b/uitest/src/com/vaadin/tests/components/window/PositionedSubWindows.java
diff --git a/tests/testbench/com/vaadin/tests/components/window/RepaintWindowContents.html b/uitest/src/com/vaadin/tests/components/window/RepaintWindowContents.html
index 9cbcf1d5ea..9cbcf1d5ea 100644
--- a/tests/testbench/com/vaadin/tests/components/window/RepaintWindowContents.html
+++ b/uitest/src/com/vaadin/tests/components/window/RepaintWindowContents.html
diff --git a/tests/testbench/com/vaadin/tests/components/window/RepaintWindowContents.java b/uitest/src/com/vaadin/tests/components/window/RepaintWindowContents.java
index 847ee585f7..847ee585f7 100644
--- a/tests/testbench/com/vaadin/tests/components/window/RepaintWindowContents.java
+++ b/uitest/src/com/vaadin/tests/components/window/RepaintWindowContents.java
diff --git a/tests/testbench/com/vaadin/tests/components/window/SubWindowFocus.java b/uitest/src/com/vaadin/tests/components/window/SubWindowFocus.java
index 389c926986..389c926986 100644
--- a/tests/testbench/com/vaadin/tests/components/window/SubWindowFocus.java
+++ b/uitest/src/com/vaadin/tests/components/window/SubWindowFocus.java
diff --git a/tests/testbench/com/vaadin/tests/components/window/SubWindowFocusAndBlurListeners.java b/uitest/src/com/vaadin/tests/components/window/SubWindowFocusAndBlurListeners.java
index 273d48514c..273d48514c 100644
--- a/tests/testbench/com/vaadin/tests/components/window/SubWindowFocusAndBlurListeners.java
+++ b/uitest/src/com/vaadin/tests/components/window/SubWindowFocusAndBlurListeners.java
diff --git a/tests/testbench/com/vaadin/tests/components/window/SubWindowOrder.html b/uitest/src/com/vaadin/tests/components/window/SubWindowOrder.html
index 0476de6c35..0476de6c35 100644
--- a/tests/testbench/com/vaadin/tests/components/window/SubWindowOrder.html
+++ b/uitest/src/com/vaadin/tests/components/window/SubWindowOrder.html
diff --git a/tests/testbench/com/vaadin/tests/components/window/SubWindowOrder.java b/uitest/src/com/vaadin/tests/components/window/SubWindowOrder.java
index 0ca7fd1067..0ca7fd1067 100644
--- a/tests/testbench/com/vaadin/tests/components/window/SubWindowOrder.java
+++ b/uitest/src/com/vaadin/tests/components/window/SubWindowOrder.java
diff --git a/tests/testbench/com/vaadin/tests/components/window/SubWindowPositionUpdate.java b/uitest/src/com/vaadin/tests/components/window/SubWindowPositionUpdate.java
index 9383dba80f..9383dba80f 100644
--- a/tests/testbench/com/vaadin/tests/components/window/SubWindowPositionUpdate.java
+++ b/uitest/src/com/vaadin/tests/components/window/SubWindowPositionUpdate.java
diff --git a/tests/testbench/com/vaadin/tests/components/window/SubWindowWithUndefinedHeight.html b/uitest/src/com/vaadin/tests/components/window/SubWindowWithUndefinedHeight.html
index 2c3f651e41..2c3f651e41 100644
--- a/tests/testbench/com/vaadin/tests/components/window/SubWindowWithUndefinedHeight.html
+++ b/uitest/src/com/vaadin/tests/components/window/SubWindowWithUndefinedHeight.html
diff --git a/tests/testbench/com/vaadin/tests/components/window/SubWindowWithUndefinedHeight.java b/uitest/src/com/vaadin/tests/components/window/SubWindowWithUndefinedHeight.java
index 5bda762d3f..5bda762d3f 100644
--- a/tests/testbench/com/vaadin/tests/components/window/SubWindowWithUndefinedHeight.java
+++ b/uitest/src/com/vaadin/tests/components/window/SubWindowWithUndefinedHeight.java
diff --git a/tests/testbench/com/vaadin/tests/components/window/SubWindows-runo.html b/uitest/src/com/vaadin/tests/components/window/SubWindows-runo.html
index 5cbd350174..5cbd350174 100644
--- a/tests/testbench/com/vaadin/tests/components/window/SubWindows-runo.html
+++ b/uitest/src/com/vaadin/tests/components/window/SubWindows-runo.html
diff --git a/tests/testbench/com/vaadin/tests/components/window/SubWindows.html b/uitest/src/com/vaadin/tests/components/window/SubWindows.html
index 3b2109e3f1..3b2109e3f1 100644
--- a/tests/testbench/com/vaadin/tests/components/window/SubWindows.html
+++ b/uitest/src/com/vaadin/tests/components/window/SubWindows.html
diff --git a/tests/testbench/com/vaadin/tests/components/window/SubWindows.java b/uitest/src/com/vaadin/tests/components/window/SubWindows.java
index c39bfdb713..c39bfdb713 100644
--- a/tests/testbench/com/vaadin/tests/components/window/SubWindows.java
+++ b/uitest/src/com/vaadin/tests/components/window/SubWindows.java
diff --git a/tests/testbench/com/vaadin/tests/components/window/SubwindowDraggability.java b/uitest/src/com/vaadin/tests/components/window/SubwindowDraggability.java
index 45fb343b45..45fb343b45 100644
--- a/tests/testbench/com/vaadin/tests/components/window/SubwindowDraggability.java
+++ b/uitest/src/com/vaadin/tests/components/window/SubwindowDraggability.java
diff --git a/tests/testbench/com/vaadin/tests/components/window/SubwindowInvalidLayout.java b/uitest/src/com/vaadin/tests/components/window/SubwindowInvalidLayout.java
index 03e5988fad..03e5988fad 100644
--- a/tests/testbench/com/vaadin/tests/components/window/SubwindowInvalidLayout.java
+++ b/uitest/src/com/vaadin/tests/components/window/SubwindowInvalidLayout.java
diff --git a/tests/testbench/com/vaadin/tests/components/window/TestTooSmallSubwindowSize.html b/uitest/src/com/vaadin/tests/components/window/TestTooSmallSubwindowSize.html
index f926696d63..f926696d63 100644
--- a/tests/testbench/com/vaadin/tests/components/window/TestTooSmallSubwindowSize.html
+++ b/uitest/src/com/vaadin/tests/components/window/TestTooSmallSubwindowSize.html
diff --git a/tests/testbench/com/vaadin/tests/components/window/TestTooSmallSubwindowSize.java b/uitest/src/com/vaadin/tests/components/window/TestTooSmallSubwindowSize.java
index 859c1b4b5d..859c1b4b5d 100644
--- a/tests/testbench/com/vaadin/tests/components/window/TestTooSmallSubwindowSize.java
+++ b/uitest/src/com/vaadin/tests/components/window/TestTooSmallSubwindowSize.java
diff --git a/tests/testbench/com/vaadin/tests/components/window/TooltipInWindow.html b/uitest/src/com/vaadin/tests/components/window/TooltipInWindow.html
index d734cab9ea..d734cab9ea 100644
--- a/tests/testbench/com/vaadin/tests/components/window/TooltipInWindow.html
+++ b/uitest/src/com/vaadin/tests/components/window/TooltipInWindow.html
diff --git a/tests/testbench/com/vaadin/tests/components/window/TooltipInWindow.java b/uitest/src/com/vaadin/tests/components/window/TooltipInWindow.java
index 7d4efe39ce..7d4efe39ce 100644
--- a/tests/testbench/com/vaadin/tests/components/window/TooltipInWindow.java
+++ b/uitest/src/com/vaadin/tests/components/window/TooltipInWindow.java
diff --git a/tests/testbench/com/vaadin/tests/components/window/UndefinedHeightSubWindowAndContent.html b/uitest/src/com/vaadin/tests/components/window/UndefinedHeightSubWindowAndContent.html
index a3b56cd12a..a3b56cd12a 100644
--- a/tests/testbench/com/vaadin/tests/components/window/UndefinedHeightSubWindowAndContent.html
+++ b/uitest/src/com/vaadin/tests/components/window/UndefinedHeightSubWindowAndContent.html
diff --git a/tests/testbench/com/vaadin/tests/components/window/UndefinedHeightSubWindowAndContent.java b/uitest/src/com/vaadin/tests/components/window/UndefinedHeightSubWindowAndContent.java
index 715d089f57..715d089f57 100644
--- a/tests/testbench/com/vaadin/tests/components/window/UndefinedHeightSubWindowAndContent.java
+++ b/uitest/src/com/vaadin/tests/components/window/UndefinedHeightSubWindowAndContent.java
diff --git a/tests/testbench/com/vaadin/tests/components/window/WindowCaptionTest.html b/uitest/src/com/vaadin/tests/components/window/WindowCaptionTest.html
index a9a6fd621e..a9a6fd621e 100644
--- a/tests/testbench/com/vaadin/tests/components/window/WindowCaptionTest.html
+++ b/uitest/src/com/vaadin/tests/components/window/WindowCaptionTest.html
diff --git a/tests/testbench/com/vaadin/tests/components/window/WindowClickEvents.html b/uitest/src/com/vaadin/tests/components/window/WindowClickEvents.html
index af5b9ec180..af5b9ec180 100644
--- a/tests/testbench/com/vaadin/tests/components/window/WindowClickEvents.html
+++ b/uitest/src/com/vaadin/tests/components/window/WindowClickEvents.html
diff --git a/tests/testbench/com/vaadin/tests/components/window/WindowClickEvents.java b/uitest/src/com/vaadin/tests/components/window/WindowClickEvents.java
index a4120b7d42..a4120b7d42 100644
--- a/tests/testbench/com/vaadin/tests/components/window/WindowClickEvents.java
+++ b/uitest/src/com/vaadin/tests/components/window/WindowClickEvents.java
diff --git a/tests/testbench/com/vaadin/tests/components/window/WindowResizeListener.java b/uitest/src/com/vaadin/tests/components/window/WindowResizeListener.java
index 57a125bcb7..57a125bcb7 100644
--- a/tests/testbench/com/vaadin/tests/components/window/WindowResizeListener.java
+++ b/uitest/src/com/vaadin/tests/components/window/WindowResizeListener.java
diff --git a/tests/testbench/com/vaadin/tests/components/window/WindowScrollingComponentIntoView.java b/uitest/src/com/vaadin/tests/components/window/WindowScrollingComponentIntoView.java
index 033de48446..033de48446 100644
--- a/tests/testbench/com/vaadin/tests/components/window/WindowScrollingComponentIntoView.java
+++ b/uitest/src/com/vaadin/tests/components/window/WindowScrollingComponentIntoView.java
diff --git a/tests/testbench/com/vaadin/tests/components/window/WindowScrollingUp.java b/uitest/src/com/vaadin/tests/components/window/WindowScrollingUp.java
index 5f55ad8cf3..5f55ad8cf3 100644
--- a/tests/testbench/com/vaadin/tests/components/window/WindowScrollingUp.java
+++ b/uitest/src/com/vaadin/tests/components/window/WindowScrollingUp.java
diff --git a/tests/testbench/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.html b/uitest/src/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.html
index 4923bff58a..4923bff58a 100644
--- a/tests/testbench/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.html
+++ b/uitest/src/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.html
diff --git a/tests/testbench/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.java b/uitest/src/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.java
index fa01706c56..fa01706c56 100644
--- a/tests/testbench/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.java
+++ b/uitest/src/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.java
diff --git a/tests/testbench/com/vaadin/tests/components/window/WindowStyleNames.java b/uitest/src/com/vaadin/tests/components/window/WindowStyleNames.java
index 615f391613..615f391613 100644
--- a/tests/testbench/com/vaadin/tests/components/window/WindowStyleNames.java
+++ b/uitest/src/com/vaadin/tests/components/window/WindowStyleNames.java
diff --git a/tests/testbench/com/vaadin/tests/components/window/WindowTest.java b/uitest/src/com/vaadin/tests/components/window/WindowTest.java
index ae3b0f22df..ae3b0f22df 100644
--- a/tests/testbench/com/vaadin/tests/components/window/WindowTest.java
+++ b/uitest/src/com/vaadin/tests/components/window/WindowTest.java
diff --git a/tests/testbench/com/vaadin/tests/containers/BeanItemContainerFilteringTest.java b/uitest/src/com/vaadin/tests/containers/BeanItemContainerFilteringTest.java
index 8b8ad4cf70..8b8ad4cf70 100644
--- a/tests/testbench/com/vaadin/tests/containers/BeanItemContainerFilteringTest.java
+++ b/uitest/src/com/vaadin/tests/containers/BeanItemContainerFilteringTest.java
diff --git a/tests/testbench/com/vaadin/tests/containers/BeanItemContainerTest.java b/uitest/src/com/vaadin/tests/containers/BeanItemContainerTest.java
index 905ec2f9ff..905ec2f9ff 100644
--- a/tests/testbench/com/vaadin/tests/containers/BeanItemContainerTest.java
+++ b/uitest/src/com/vaadin/tests/containers/BeanItemContainerTest.java
diff --git a/tests/testbench/com/vaadin/tests/containers/HierarchicalWrapperOrdering.java b/uitest/src/com/vaadin/tests/containers/HierarchicalWrapperOrdering.java
index eba8ded705..eba8ded705 100644
--- a/tests/testbench/com/vaadin/tests/containers/HierarchicalWrapperOrdering.java
+++ b/uitest/src/com/vaadin/tests/containers/HierarchicalWrapperOrdering.java
diff --git a/tests/testbench/com/vaadin/tests/containers/IndexedContainerFilteringTest.java b/uitest/src/com/vaadin/tests/containers/IndexedContainerFilteringTest.java
index a1dba3eed8..a1dba3eed8 100644
--- a/tests/testbench/com/vaadin/tests/containers/IndexedContainerFilteringTest.java
+++ b/uitest/src/com/vaadin/tests/containers/IndexedContainerFilteringTest.java
diff --git a/tests/testbench/com/vaadin/tests/containers/TableWithFileSystemContainer.java b/uitest/src/com/vaadin/tests/containers/TableWithFileSystemContainer.java
index 25d0053fb2..25d0053fb2 100644
--- a/tests/testbench/com/vaadin/tests/containers/TableWithFileSystemContainer.java
+++ b/uitest/src/com/vaadin/tests/containers/TableWithFileSystemContainer.java
diff --git a/tests/testbench/com/vaadin/tests/containers/TestItemSorter.java b/uitest/src/com/vaadin/tests/containers/TestItemSorter.java
index 46c4e004c1..46c4e004c1 100644
--- a/tests/testbench/com/vaadin/tests/containers/TestItemSorter.java
+++ b/uitest/src/com/vaadin/tests/containers/TestItemSorter.java
diff --git a/tests/testbench/com/vaadin/tests/containers/filesystemcontainer/FileSystemContainerInTreeTable.html b/uitest/src/com/vaadin/tests/containers/filesystemcontainer/FileSystemContainerInTreeTable.html
index b5ccd53df0..b5ccd53df0 100644
--- a/tests/testbench/com/vaadin/tests/containers/filesystemcontainer/FileSystemContainerInTreeTable.html
+++ b/uitest/src/com/vaadin/tests/containers/filesystemcontainer/FileSystemContainerInTreeTable.html
diff --git a/tests/testbench/com/vaadin/tests/containers/filesystemcontainer/FileSystemContainerInTreeTable.java b/uitest/src/com/vaadin/tests/containers/filesystemcontainer/FileSystemContainerInTreeTable.java
index 0afaf2c15f..0afaf2c15f 100644
--- a/tests/testbench/com/vaadin/tests/containers/filesystemcontainer/FileSystemContainerInTreeTable.java
+++ b/uitest/src/com/vaadin/tests/containers/filesystemcontainer/FileSystemContainerInTreeTable.java
diff --git a/tests/testbench/com/vaadin/tests/containers/sqlcontainer/CheckboxUpdateProblem.java b/uitest/src/com/vaadin/tests/containers/sqlcontainer/CheckboxUpdateProblem.java
index 0c1fdc23f6..0c1fdc23f6 100644
--- a/tests/testbench/com/vaadin/tests/containers/sqlcontainer/CheckboxUpdateProblem.java
+++ b/uitest/src/com/vaadin/tests/containers/sqlcontainer/CheckboxUpdateProblem.java
diff --git a/tests/testbench/com/vaadin/tests/containers/sqlcontainer/ComboBoxUpdateProblem.java b/uitest/src/com/vaadin/tests/containers/sqlcontainer/ComboBoxUpdateProblem.java
index aec0f0e28e..aec0f0e28e 100644
--- a/tests/testbench/com/vaadin/tests/containers/sqlcontainer/ComboBoxUpdateProblem.java
+++ b/uitest/src/com/vaadin/tests/containers/sqlcontainer/ComboBoxUpdateProblem.java
diff --git a/tests/testbench/com/vaadin/tests/containers/sqlcontainer/DatabaseHelper.java b/uitest/src/com/vaadin/tests/containers/sqlcontainer/DatabaseHelper.java
index b7b1e74eb0..b7b1e74eb0 100644
--- a/tests/testbench/com/vaadin/tests/containers/sqlcontainer/DatabaseHelper.java
+++ b/uitest/src/com/vaadin/tests/containers/sqlcontainer/DatabaseHelper.java
diff --git a/tests/testbench/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java b/uitest/src/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java
index 8bb2ba1092..8bb2ba1092 100644
--- a/tests/testbench/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java
+++ b/uitest/src/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java
diff --git a/tests/testbench/com/vaadin/tests/converter/ConverterThatEnforcesAFormat.java b/uitest/src/com/vaadin/tests/converter/ConverterThatEnforcesAFormat.java
index 59aa45dc36..59aa45dc36 100644
--- a/tests/testbench/com/vaadin/tests/converter/ConverterThatEnforcesAFormat.java
+++ b/uitest/src/com/vaadin/tests/converter/ConverterThatEnforcesAFormat.java
diff --git a/tests/testbench/com/vaadin/tests/converter/StringToDoubleConverterWithThreeFractionDigits.java b/uitest/src/com/vaadin/tests/converter/StringToDoubleConverterWithThreeFractionDigits.java
index 23c22a7026..23c22a7026 100644
--- a/tests/testbench/com/vaadin/tests/converter/StringToDoubleConverterWithThreeFractionDigits.java
+++ b/uitest/src/com/vaadin/tests/converter/StringToDoubleConverterWithThreeFractionDigits.java
diff --git a/tests/testbench/com/vaadin/tests/dd/AcceptAnythingWindow.java b/uitest/src/com/vaadin/tests/dd/AcceptAnythingWindow.java
index 5d57de388c..5d57de388c 100644
--- a/tests/testbench/com/vaadin/tests/dd/AcceptAnythingWindow.java
+++ b/uitest/src/com/vaadin/tests/dd/AcceptAnythingWindow.java
diff --git a/tests/testbench/com/vaadin/tests/dd/AcceptFromComponent.java b/uitest/src/com/vaadin/tests/dd/AcceptFromComponent.java
index 99dd069142..99dd069142 100644
--- a/tests/testbench/com/vaadin/tests/dd/AcceptFromComponent.java
+++ b/uitest/src/com/vaadin/tests/dd/AcceptFromComponent.java
diff --git a/tests/testbench/com/vaadin/tests/dd/ActiveDragSourceClassName.java b/uitest/src/com/vaadin/tests/dd/ActiveDragSourceClassName.java
index 9ef1b4029b..9ef1b4029b 100644
--- a/tests/testbench/com/vaadin/tests/dd/ActiveDragSourceClassName.java
+++ b/uitest/src/com/vaadin/tests/dd/ActiveDragSourceClassName.java
diff --git a/tests/testbench/com/vaadin/tests/dd/CustomDDImplementation.java b/uitest/src/com/vaadin/tests/dd/CustomDDImplementation.java
index f6e196761e..f6e196761e 100644
--- a/tests/testbench/com/vaadin/tests/dd/CustomDDImplementation.java
+++ b/uitest/src/com/vaadin/tests/dd/CustomDDImplementation.java
diff --git a/tests/testbench/com/vaadin/tests/dd/DDTest1.java b/uitest/src/com/vaadin/tests/dd/DDTest1.java
index 161a9b423e..161a9b423e 100644
--- a/tests/testbench/com/vaadin/tests/dd/DDTest1.java
+++ b/uitest/src/com/vaadin/tests/dd/DDTest1.java
diff --git a/tests/testbench/com/vaadin/tests/dd/DDTest2.java b/uitest/src/com/vaadin/tests/dd/DDTest2.java
index 7757513fc1..7757513fc1 100644
--- a/tests/testbench/com/vaadin/tests/dd/DDTest2.java
+++ b/uitest/src/com/vaadin/tests/dd/DDTest2.java
diff --git a/tests/testbench/com/vaadin/tests/dd/DDTest4.java b/uitest/src/com/vaadin/tests/dd/DDTest4.java
index 044fe1f49a..044fe1f49a 100644
--- a/tests/testbench/com/vaadin/tests/dd/DDTest4.java
+++ b/uitest/src/com/vaadin/tests/dd/DDTest4.java
diff --git a/tests/testbench/com/vaadin/tests/dd/DDTest5.java b/uitest/src/com/vaadin/tests/dd/DDTest5.java
index 43342fdc35..43342fdc35 100644
--- a/tests/testbench/com/vaadin/tests/dd/DDTest5.java
+++ b/uitest/src/com/vaadin/tests/dd/DDTest5.java
diff --git a/tests/testbench/com/vaadin/tests/dd/DDTest6.java b/uitest/src/com/vaadin/tests/dd/DDTest6.java
index a4c566d75a..a4c566d75a 100644
--- a/tests/testbench/com/vaadin/tests/dd/DDTest6.java
+++ b/uitest/src/com/vaadin/tests/dd/DDTest6.java
diff --git a/tests/testbench/com/vaadin/tests/dd/DDTest7.java b/uitest/src/com/vaadin/tests/dd/DDTest7.java
index 1abf9e379c..1abf9e379c 100644
--- a/tests/testbench/com/vaadin/tests/dd/DDTest7.java
+++ b/uitest/src/com/vaadin/tests/dd/DDTest7.java
diff --git a/tests/testbench/com/vaadin/tests/dd/DDTest8.java b/uitest/src/com/vaadin/tests/dd/DDTest8.java
index ee7d8d9dc5..ee7d8d9dc5 100644
--- a/tests/testbench/com/vaadin/tests/dd/DDTest8.java
+++ b/uitest/src/com/vaadin/tests/dd/DDTest8.java
diff --git a/tests/testbench/com/vaadin/tests/dd/DragAndDropFiles.java b/uitest/src/com/vaadin/tests/dd/DragAndDropFiles.java
index 4ecabee617..4ecabee617 100644
--- a/tests/testbench/com/vaadin/tests/dd/DragAndDropFiles.java
+++ b/uitest/src/com/vaadin/tests/dd/DragAndDropFiles.java
diff --git a/tests/testbench/com/vaadin/tests/dd/DragDropPane.java b/uitest/src/com/vaadin/tests/dd/DragDropPane.java
index 970e1b0141..970e1b0141 100644
--- a/tests/testbench/com/vaadin/tests/dd/DragDropPane.java
+++ b/uitest/src/com/vaadin/tests/dd/DragDropPane.java
diff --git a/tests/testbench/com/vaadin/tests/dd/HorizontalLayoutSortableWithWrappers.java b/uitest/src/com/vaadin/tests/dd/HorizontalLayoutSortableWithWrappers.java
index fe33bce76b..fe33bce76b 100644
--- a/tests/testbench/com/vaadin/tests/dd/HorizontalLayoutSortableWithWrappers.java
+++ b/uitest/src/com/vaadin/tests/dd/HorizontalLayoutSortableWithWrappers.java
diff --git a/tests/testbench/com/vaadin/tests/dd/HorizontalSortableCssLayoutWithWrappers.java b/uitest/src/com/vaadin/tests/dd/HorizontalSortableCssLayoutWithWrappers.java
index 4e9e89add5..4e9e89add5 100644
--- a/tests/testbench/com/vaadin/tests/dd/HorizontalSortableCssLayoutWithWrappers.java
+++ b/uitest/src/com/vaadin/tests/dd/HorizontalSortableCssLayoutWithWrappers.java
diff --git a/tests/testbench/com/vaadin/tests/dd/MyDragSourceConnector.java b/uitest/src/com/vaadin/tests/dd/MyDragSourceConnector.java
index e787a182e4..e787a182e4 100644
--- a/tests/testbench/com/vaadin/tests/dd/MyDragSourceConnector.java
+++ b/uitest/src/com/vaadin/tests/dd/MyDragSourceConnector.java
diff --git a/tests/testbench/com/vaadin/tests/dd/MyDropTargetConnector.java b/uitest/src/com/vaadin/tests/dd/MyDropTargetConnector.java
index f0f2b5dfd6..f0f2b5dfd6 100644
--- a/tests/testbench/com/vaadin/tests/dd/MyDropTargetConnector.java
+++ b/uitest/src/com/vaadin/tests/dd/MyDropTargetConnector.java
diff --git a/tests/testbench/com/vaadin/tests/dd/NotPaintedAcceptSource.html b/uitest/src/com/vaadin/tests/dd/NotPaintedAcceptSource.html
index 03a4830584..03a4830584 100644
--- a/tests/testbench/com/vaadin/tests/dd/NotPaintedAcceptSource.html
+++ b/uitest/src/com/vaadin/tests/dd/NotPaintedAcceptSource.html
diff --git a/tests/testbench/com/vaadin/tests/dd/NotPaintedAcceptSource.java b/uitest/src/com/vaadin/tests/dd/NotPaintedAcceptSource.java
index 020a6b56c5..020a6b56c5 100644
--- a/tests/testbench/com/vaadin/tests/dd/NotPaintedAcceptSource.java
+++ b/uitest/src/com/vaadin/tests/dd/NotPaintedAcceptSource.java
diff --git a/tests/testbench/com/vaadin/tests/dd/NotPaintedAcceptSourceInTabSheet.java b/uitest/src/com/vaadin/tests/dd/NotPaintedAcceptSourceInTabSheet.java
index e19bbaf2c5..e19bbaf2c5 100644
--- a/tests/testbench/com/vaadin/tests/dd/NotPaintedAcceptSourceInTabSheet.java
+++ b/uitest/src/com/vaadin/tests/dd/NotPaintedAcceptSourceInTabSheet.java
diff --git a/tests/testbench/com/vaadin/tests/dd/ScrolledDropTarget.html.disabled b/uitest/src/com/vaadin/tests/dd/ScrolledDropTarget.html.disabled
index e69de29bb2..e69de29bb2 100644
--- a/tests/testbench/com/vaadin/tests/dd/ScrolledDropTarget.html.disabled
+++ b/uitest/src/com/vaadin/tests/dd/ScrolledDropTarget.html.disabled
diff --git a/tests/testbench/com/vaadin/tests/dd/ScrolledDropTarget.java b/uitest/src/com/vaadin/tests/dd/ScrolledDropTarget.java
index 951b9a4a57..951b9a4a57 100644
--- a/tests/testbench/com/vaadin/tests/dd/ScrolledDropTarget.java
+++ b/uitest/src/com/vaadin/tests/dd/ScrolledDropTarget.java
diff --git a/tests/testbench/com/vaadin/tests/dd/StartHtml5Drag.java b/uitest/src/com/vaadin/tests/dd/StartHtml5Drag.java
index 609b2fe4fc..609b2fe4fc 100644
--- a/tests/testbench/com/vaadin/tests/dd/StartHtml5Drag.java
+++ b/uitest/src/com/vaadin/tests/dd/StartHtml5Drag.java
diff --git a/tests/testbench/com/vaadin/tests/dd/TreeDragStart.java b/uitest/src/com/vaadin/tests/dd/TreeDragStart.java
index 27ac8b6586..27ac8b6586 100644
--- a/tests/testbench/com/vaadin/tests/dd/TreeDragStart.java
+++ b/uitest/src/com/vaadin/tests/dd/TreeDragStart.java
diff --git a/tests/testbench/com/vaadin/tests/dd/VMyDragSource.java b/uitest/src/com/vaadin/tests/dd/VMyDragSource.java
index 8cca6d6459..8cca6d6459 100644
--- a/tests/testbench/com/vaadin/tests/dd/VMyDragSource.java
+++ b/uitest/src/com/vaadin/tests/dd/VMyDragSource.java
diff --git a/tests/testbench/com/vaadin/tests/dd/VMyDropTarget.java b/uitest/src/com/vaadin/tests/dd/VMyDropTarget.java
index 58bd326524..58bd326524 100644
--- a/tests/testbench/com/vaadin/tests/dd/VMyDropTarget.java
+++ b/uitest/src/com/vaadin/tests/dd/VMyDropTarget.java
diff --git a/tests/testbench/com/vaadin/tests/dd/html5drop.htm b/uitest/src/com/vaadin/tests/dd/html5drop.htm
index ed05fcedea..ed05fcedea 100644
--- a/tests/testbench/com/vaadin/tests/dd/html5drop.htm
+++ b/uitest/src/com/vaadin/tests/dd/html5drop.htm
diff --git a/tests/testbench/com/vaadin/tests/debug/DebugWindowPresent.html b/uitest/src/com/vaadin/tests/debug/DebugWindowPresent.html
index 11640ef6c3..11640ef6c3 100644
--- a/tests/testbench/com/vaadin/tests/debug/DebugWindowPresent.html
+++ b/uitest/src/com/vaadin/tests/debug/DebugWindowPresent.html
diff --git a/tests/testbench/com/vaadin/tests/debug/DebugWindowPresent.java b/uitest/src/com/vaadin/tests/debug/DebugWindowPresent.java
index 3e04d27628..3e04d27628 100644
--- a/tests/testbench/com/vaadin/tests/debug/DebugWindowPresent.java
+++ b/uitest/src/com/vaadin/tests/debug/DebugWindowPresent.java
diff --git a/tests/testbench/com/vaadin/tests/extensions/BasicExtension.java b/uitest/src/com/vaadin/tests/extensions/BasicExtension.java
index e4fc291728..e4fc291728 100644
--- a/tests/testbench/com/vaadin/tests/extensions/BasicExtension.java
+++ b/uitest/src/com/vaadin/tests/extensions/BasicExtension.java
diff --git a/tests/testbench/com/vaadin/tests/extensions/BasicExtensionTest.html b/uitest/src/com/vaadin/tests/extensions/BasicExtensionTest.html
index c57882b3f4..c57882b3f4 100644
--- a/tests/testbench/com/vaadin/tests/extensions/BasicExtensionTest.html
+++ b/uitest/src/com/vaadin/tests/extensions/BasicExtensionTest.html
diff --git a/tests/testbench/com/vaadin/tests/extensions/BasicExtensionTest.java b/uitest/src/com/vaadin/tests/extensions/BasicExtensionTest.java
index 40856af11e..40856af11e 100644
--- a/tests/testbench/com/vaadin/tests/extensions/BasicExtensionTest.java
+++ b/uitest/src/com/vaadin/tests/extensions/BasicExtensionTest.java
diff --git a/tests/testbench/com/vaadin/tests/extensions/HelloWorldExtension.java b/uitest/src/com/vaadin/tests/extensions/HelloWorldExtension.java
index e8a33fd3af..e8a33fd3af 100644
--- a/tests/testbench/com/vaadin/tests/extensions/HelloWorldExtension.java
+++ b/uitest/src/com/vaadin/tests/extensions/HelloWorldExtension.java
diff --git a/tests/testbench/com/vaadin/tests/extensions/HelloWorldExtensionTest.java b/uitest/src/com/vaadin/tests/extensions/HelloWorldExtensionTest.java
index 576b16fbb6..576b16fbb6 100644
--- a/tests/testbench/com/vaadin/tests/extensions/HelloWorldExtensionTest.java
+++ b/uitest/src/com/vaadin/tests/extensions/HelloWorldExtensionTest.java
diff --git a/tests/testbench/com/vaadin/tests/extensions/JavascriptManagerTest.html b/uitest/src/com/vaadin/tests/extensions/JavascriptManagerTest.html
index 7bdb8cd50f..7bdb8cd50f 100644
--- a/tests/testbench/com/vaadin/tests/extensions/JavascriptManagerTest.html
+++ b/uitest/src/com/vaadin/tests/extensions/JavascriptManagerTest.html
diff --git a/tests/testbench/com/vaadin/tests/extensions/JavascriptManagerTest.java b/uitest/src/com/vaadin/tests/extensions/JavascriptManagerTest.java
index a4e2acb31e..a4e2acb31e 100644
--- a/tests/testbench/com/vaadin/tests/extensions/JavascriptManagerTest.java
+++ b/uitest/src/com/vaadin/tests/extensions/JavascriptManagerTest.java
diff --git a/tests/testbench/com/vaadin/tests/extensions/SimpleJavaScriptExtensionTest.java b/uitest/src/com/vaadin/tests/extensions/SimpleJavaScriptExtensionTest.java
index 18054c8e0f..18054c8e0f 100644
--- a/tests/testbench/com/vaadin/tests/extensions/SimpleJavaScriptExtensionTest.java
+++ b/uitest/src/com/vaadin/tests/extensions/SimpleJavaScriptExtensionTest.java
diff --git a/tests/testbench/com/vaadin/tests/fieldgroup/AbstractBeanFieldGroupTest.java b/uitest/src/com/vaadin/tests/fieldgroup/AbstractBeanFieldGroupTest.java
index 894944d186..894944d186 100644
--- a/tests/testbench/com/vaadin/tests/fieldgroup/AbstractBeanFieldGroupTest.java
+++ b/uitest/src/com/vaadin/tests/fieldgroup/AbstractBeanFieldGroupTest.java
diff --git a/tests/testbench/com/vaadin/tests/fieldgroup/BasicPersonForm.java b/uitest/src/com/vaadin/tests/fieldgroup/BasicPersonForm.java
index b399857b3b..b399857b3b 100644
--- a/tests/testbench/com/vaadin/tests/fieldgroup/BasicPersonForm.java
+++ b/uitest/src/com/vaadin/tests/fieldgroup/BasicPersonForm.java
diff --git a/tests/testbench/com/vaadin/tests/fieldgroup/BooleanTextField.html b/uitest/src/com/vaadin/tests/fieldgroup/BooleanTextField.html
index 3d5e1052c3..3d5e1052c3 100644
--- a/tests/testbench/com/vaadin/tests/fieldgroup/BooleanTextField.html
+++ b/uitest/src/com/vaadin/tests/fieldgroup/BooleanTextField.html
diff --git a/tests/testbench/com/vaadin/tests/fieldgroup/CommitHandlerFailures.html b/uitest/src/com/vaadin/tests/fieldgroup/CommitHandlerFailures.html
index 2ad104c16c..2ad104c16c 100644
--- a/tests/testbench/com/vaadin/tests/fieldgroup/CommitHandlerFailures.html
+++ b/uitest/src/com/vaadin/tests/fieldgroup/CommitHandlerFailures.html
diff --git a/tests/testbench/com/vaadin/tests/fieldgroup/CommitWithValidationOrConversionError.html b/uitest/src/com/vaadin/tests/fieldgroup/CommitWithValidationOrConversionError.html
index 2c88930077..2c88930077 100644
--- a/tests/testbench/com/vaadin/tests/fieldgroup/CommitWithValidationOrConversionError.html
+++ b/uitest/src/com/vaadin/tests/fieldgroup/CommitWithValidationOrConversionError.html
diff --git a/tests/testbench/com/vaadin/tests/fieldgroup/FieldBinderWithBeanValidation.java b/uitest/src/com/vaadin/tests/fieldgroup/FieldBinderWithBeanValidation.java
index 4f83f5d0fd..4f83f5d0fd 100644
--- a/tests/testbench/com/vaadin/tests/fieldgroup/FieldBinderWithBeanValidation.java
+++ b/uitest/src/com/vaadin/tests/fieldgroup/FieldBinderWithBeanValidation.java
diff --git a/tests/testbench/com/vaadin/tests/fieldgroup/FieldGroupDiscard.html b/uitest/src/com/vaadin/tests/fieldgroup/FieldGroupDiscard.html
index a2ac1b748b..a2ac1b748b 100644
--- a/tests/testbench/com/vaadin/tests/fieldgroup/FieldGroupDiscard.html
+++ b/uitest/src/com/vaadin/tests/fieldgroup/FieldGroupDiscard.html
diff --git a/tests/testbench/com/vaadin/tests/fieldgroup/FormBuilderWithNestedProperties.java b/uitest/src/com/vaadin/tests/fieldgroup/FormBuilderWithNestedProperties.java
index 5f25070f2e..5f25070f2e 100644
--- a/tests/testbench/com/vaadin/tests/fieldgroup/FormBuilderWithNestedProperties.java
+++ b/uitest/src/com/vaadin/tests/fieldgroup/FormBuilderWithNestedProperties.java
diff --git a/tests/testbench/com/vaadin/tests/fieldgroup/FormManyToMany.java b/uitest/src/com/vaadin/tests/fieldgroup/FormManyToMany.java
index f4f612503c..f4f612503c 100644
--- a/tests/testbench/com/vaadin/tests/fieldgroup/FormManyToMany.java
+++ b/uitest/src/com/vaadin/tests/fieldgroup/FormManyToMany.java
diff --git a/tests/testbench/com/vaadin/tests/fieldgroup/FormOneToMany.java b/uitest/src/com/vaadin/tests/fieldgroup/FormOneToMany.java
index e269a39441..e269a39441 100644
--- a/tests/testbench/com/vaadin/tests/fieldgroup/FormOneToMany.java
+++ b/uitest/src/com/vaadin/tests/fieldgroup/FormOneToMany.java
diff --git a/tests/testbench/com/vaadin/tests/fieldgroup/FormOneToOne.java b/uitest/src/com/vaadin/tests/fieldgroup/FormOneToOne.java
index b16cb29a8a..b16cb29a8a 100644
--- a/tests/testbench/com/vaadin/tests/fieldgroup/FormOneToOne.java
+++ b/uitest/src/com/vaadin/tests/fieldgroup/FormOneToOne.java
diff --git a/tests/testbench/com/vaadin/tests/fieldgroup/FormWithNestedProperties.java b/uitest/src/com/vaadin/tests/fieldgroup/FormWithNestedProperties.java
index f66d822495..f66d822495 100644
--- a/tests/testbench/com/vaadin/tests/fieldgroup/FormWithNestedProperties.java
+++ b/uitest/src/com/vaadin/tests/fieldgroup/FormWithNestedProperties.java
diff --git a/tests/testbench/com/vaadin/tests/fieldgroup/IntegerRangeValidator.html b/uitest/src/com/vaadin/tests/fieldgroup/IntegerRangeValidator.html
index b7c40b4d9e..b7c40b4d9e 100644
--- a/tests/testbench/com/vaadin/tests/fieldgroup/IntegerRangeValidator.html
+++ b/uitest/src/com/vaadin/tests/fieldgroup/IntegerRangeValidator.html
diff --git a/tests/testbench/com/vaadin/tests/fields/FormManyToMany.java b/uitest/src/com/vaadin/tests/fields/FormManyToMany.java
index 43fba20f33..43fba20f33 100644
--- a/tests/testbench/com/vaadin/tests/fields/FormManyToMany.java
+++ b/uitest/src/com/vaadin/tests/fields/FormManyToMany.java
diff --git a/tests/testbench/com/vaadin/tests/fields/FormOneToMany.java b/uitest/src/com/vaadin/tests/fields/FormOneToMany.java
index a010e935ab..a010e935ab 100644
--- a/tests/testbench/com/vaadin/tests/fields/FormOneToMany.java
+++ b/uitest/src/com/vaadin/tests/fields/FormOneToMany.java
diff --git a/tests/testbench/com/vaadin/tests/fields/FormOneToOne.java b/uitest/src/com/vaadin/tests/fields/FormOneToOne.java
index 36f4dfe0ea..36f4dfe0ea 100644
--- a/tests/testbench/com/vaadin/tests/fields/FormOneToOne.java
+++ b/uitest/src/com/vaadin/tests/fields/FormOneToOne.java
diff --git a/tests/testbench/com/vaadin/tests/gwtadapter/componentlocator/TestDetachedNotPresent.html b/uitest/src/com/vaadin/tests/gwtadapter/componentlocator/TestDetachedNotPresent.html
index 24e5e992ca..24e5e992ca 100644
--- a/tests/testbench/com/vaadin/tests/gwtadapter/componentlocator/TestDetachedNotPresent.html
+++ b/uitest/src/com/vaadin/tests/gwtadapter/componentlocator/TestDetachedNotPresent.html
diff --git a/tests/testbench/com/vaadin/tests/integration/EmbedSizeTest.java b/uitest/src/com/vaadin/tests/integration/EmbedSizeTest.java
index 7afdf906b5..7afdf906b5 100644
--- a/tests/testbench/com/vaadin/tests/integration/EmbedSizeTest.java
+++ b/uitest/src/com/vaadin/tests/integration/EmbedSizeTest.java
diff --git a/tests/testbench/com/vaadin/tests/integration/FlagSeResource.java b/uitest/src/com/vaadin/tests/integration/FlagSeResource.java
index 6c2fcdc2d4..6c2fcdc2d4 100644
--- a/tests/testbench/com/vaadin/tests/integration/FlagSeResource.java
+++ b/uitest/src/com/vaadin/tests/integration/FlagSeResource.java
diff --git a/tests/testbench/com/vaadin/tests/integration/IntegrationTestApplication.java b/uitest/src/com/vaadin/tests/integration/IntegrationTestApplication.java
index 9c7225b510..9c7225b510 100644
--- a/tests/testbench/com/vaadin/tests/integration/IntegrationTestApplication.java
+++ b/uitest/src/com/vaadin/tests/integration/IntegrationTestApplication.java
diff --git a/tests/testbench/com/vaadin/tests/integration/JSR286PortletApplication.java b/uitest/src/com/vaadin/tests/integration/JSR286PortletApplication.java
index 2243adf336..2243adf336 100644
--- a/tests/testbench/com/vaadin/tests/integration/JSR286PortletApplication.java
+++ b/uitest/src/com/vaadin/tests/integration/JSR286PortletApplication.java
diff --git a/tests/testbench/com/vaadin/tests/integration/LiferayThemeDemo.java b/uitest/src/com/vaadin/tests/integration/LiferayThemeDemo.java
index 0cbf50ae1b..0cbf50ae1b 100644
--- a/tests/testbench/com/vaadin/tests/integration/LiferayThemeDemo.java
+++ b/uitest/src/com/vaadin/tests/integration/LiferayThemeDemo.java
diff --git a/tests/testbench/com/vaadin/tests/integration/PortletConnectorResource.css b/uitest/src/com/vaadin/tests/integration/PortletConnectorResource.css
index 7338e4708a..7338e4708a 100644
--- a/tests/testbench/com/vaadin/tests/integration/PortletConnectorResource.css
+++ b/uitest/src/com/vaadin/tests/integration/PortletConnectorResource.css
diff --git a/tests/testbench/com/vaadin/tests/integration/PortletSizeInLiferayFreeformLayoutApplication.java b/uitest/src/com/vaadin/tests/integration/PortletSizeInLiferayFreeformLayoutApplication.java
index fc54547890..fc54547890 100644
--- a/tests/testbench/com/vaadin/tests/integration/PortletSizeInLiferayFreeformLayoutApplication.java
+++ b/uitest/src/com/vaadin/tests/integration/PortletSizeInLiferayFreeformLayoutApplication.java
diff --git a/tests/testbench/com/vaadin/tests/integration/SpecialNameResource.java b/uitest/src/com/vaadin/tests/integration/SpecialNameResource.java
index 3806e61c36..3806e61c36 100644
--- a/tests/testbench/com/vaadin/tests/integration/SpecialNameResource.java
+++ b/uitest/src/com/vaadin/tests/integration/SpecialNameResource.java
diff --git a/tests/testbench/com/vaadin/tests/integration/fi.gif b/uitest/src/com/vaadin/tests/integration/fi.gif
index 8d3a191828..8d3a191828 100644
--- a/tests/testbench/com/vaadin/tests/integration/fi.gif
+++ b/uitest/src/com/vaadin/tests/integration/fi.gif
diff --git a/tests/testbench/com/vaadin/tests/integration/se.gif b/uitest/src/com/vaadin/tests/integration/se.gif
index 80f6285228..80f6285228 100644
--- a/tests/testbench/com/vaadin/tests/integration/se.gif
+++ b/uitest/src/com/vaadin/tests/integration/se.gif
diff --git a/tests/testbench/com/vaadin/tests/integration/spe=cial%res&ource.gif b/uitest/src/com/vaadin/tests/integration/spe=cial%res&ource.gif
index 41bdd9a6be..41bdd9a6be 100644
--- a/tests/testbench/com/vaadin/tests/integration/spe=cial%res&ource.gif
+++ b/uitest/src/com/vaadin/tests/integration/spe=cial%res&ource.gif
diff --git a/tests/testbench/com/vaadin/tests/layouts/AbsoluteLayoutAddRemove.java b/uitest/src/com/vaadin/tests/layouts/AbsoluteLayoutAddRemove.java
index b2cadebd02..b2cadebd02 100644
--- a/tests/testbench/com/vaadin/tests/layouts/AbsoluteLayoutAddRemove.java
+++ b/uitest/src/com/vaadin/tests/layouts/AbsoluteLayoutAddRemove.java
diff --git a/tests/testbench/com/vaadin/tests/layouts/CaptionsInLayouts.java b/uitest/src/com/vaadin/tests/layouts/CaptionsInLayouts.java
index 03c3c43ccd..03c3c43ccd 100644
--- a/tests/testbench/com/vaadin/tests/layouts/CaptionsInLayouts.java
+++ b/uitest/src/com/vaadin/tests/layouts/CaptionsInLayouts.java
diff --git a/tests/testbench/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.html b/uitest/src/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.html
index 6dab84d718..6dab84d718 100644
--- a/tests/testbench/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.html
+++ b/uitest/src/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.html
diff --git a/tests/testbench/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.java b/uitest/src/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.java
index f4050ea085..f4050ea085 100644
--- a/tests/testbench/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.java
+++ b/uitest/src/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.java
diff --git a/tests/testbench/com/vaadin/tests/layouts/CssLayoutCustomCss.java b/uitest/src/com/vaadin/tests/layouts/CssLayoutCustomCss.java
index 2f717d2b64..2f717d2b64 100644
--- a/tests/testbench/com/vaadin/tests/layouts/CssLayoutCustomCss.java
+++ b/uitest/src/com/vaadin/tests/layouts/CssLayoutCustomCss.java
diff --git a/tests/testbench/com/vaadin/tests/layouts/CssLayoutRemoveComponent.html b/uitest/src/com/vaadin/tests/layouts/CssLayoutRemoveComponent.html
index 0932be5d81..0932be5d81 100644
--- a/tests/testbench/com/vaadin/tests/layouts/CssLayoutRemoveComponent.html
+++ b/uitest/src/com/vaadin/tests/layouts/CssLayoutRemoveComponent.html
diff --git a/tests/testbench/com/vaadin/tests/layouts/CssLayoutRemoveComponent.java b/uitest/src/com/vaadin/tests/layouts/CssLayoutRemoveComponent.java
index 093dc782fb..093dc782fb 100644
--- a/tests/testbench/com/vaadin/tests/layouts/CssLayoutRemoveComponent.java
+++ b/uitest/src/com/vaadin/tests/layouts/CssLayoutRemoveComponent.java
diff --git a/tests/testbench/com/vaadin/tests/layouts/CssLayoutRemoveComponentWithCaption.java b/uitest/src/com/vaadin/tests/layouts/CssLayoutRemoveComponentWithCaption.java
index df4fc8615d..df4fc8615d 100644
--- a/tests/testbench/com/vaadin/tests/layouts/CssLayoutRemoveComponentWithCaption.java
+++ b/uitest/src/com/vaadin/tests/layouts/CssLayoutRemoveComponentWithCaption.java
diff --git a/tests/testbench/com/vaadin/tests/layouts/CssLayoutSizeChangePropagation.java b/uitest/src/com/vaadin/tests/layouts/CssLayoutSizeChangePropagation.java
index ed3c5e66d3..ed3c5e66d3 100644
--- a/tests/testbench/com/vaadin/tests/layouts/CssLayoutSizeChangePropagation.java
+++ b/uitest/src/com/vaadin/tests/layouts/CssLayoutSizeChangePropagation.java
diff --git a/tests/testbench/com/vaadin/tests/layouts/DeepComponentTrees.java b/uitest/src/com/vaadin/tests/layouts/DeepComponentTrees.java
index e119b91b82..e119b91b82 100644
--- a/tests/testbench/com/vaadin/tests/layouts/DeepComponentTrees.java
+++ b/uitest/src/com/vaadin/tests/layouts/DeepComponentTrees.java
diff --git a/tests/testbench/com/vaadin/tests/layouts/FormLayoutWithInvisibleComponent.java b/uitest/src/com/vaadin/tests/layouts/FormLayoutWithInvisibleComponent.java
index f596fdb77e..f596fdb77e 100644
--- a/tests/testbench/com/vaadin/tests/layouts/FormLayoutWithInvisibleComponent.java
+++ b/uitest/src/com/vaadin/tests/layouts/FormLayoutWithInvisibleComponent.java
diff --git a/tests/testbench/com/vaadin/tests/layouts/GridLayoutCaptions.java b/uitest/src/com/vaadin/tests/layouts/GridLayoutCaptions.java
index 9f2715a09b..9f2715a09b 100644
--- a/tests/testbench/com/vaadin/tests/layouts/GridLayoutCaptions.java
+++ b/uitest/src/com/vaadin/tests/layouts/GridLayoutCaptions.java
diff --git a/tests/testbench/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java b/uitest/src/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java
index acc5f07103..acc5f07103 100644
--- a/tests/testbench/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java
+++ b/uitest/src/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java
diff --git a/tests/testbench/com/vaadin/tests/layouts/GridLayoutInsidePanel.java b/uitest/src/com/vaadin/tests/layouts/GridLayoutInsidePanel.java
index e200c40744..e200c40744 100644
--- a/tests/testbench/com/vaadin/tests/layouts/GridLayoutInsidePanel.java
+++ b/uitest/src/com/vaadin/tests/layouts/GridLayoutInsidePanel.java
diff --git a/tests/testbench/com/vaadin/tests/layouts/GridLayoutInsidePanel2.java b/uitest/src/com/vaadin/tests/layouts/GridLayoutInsidePanel2.java
index 6273b92838..6273b92838 100644
--- a/tests/testbench/com/vaadin/tests/layouts/GridLayoutInsidePanel2.java
+++ b/uitest/src/com/vaadin/tests/layouts/GridLayoutInsidePanel2.java
diff --git a/tests/testbench/com/vaadin/tests/layouts/GridLayoutMoveComponent.html b/uitest/src/com/vaadin/tests/layouts/GridLayoutMoveComponent.html
index 77a17263f8..77a17263f8 100644
--- a/tests/testbench/com/vaadin/tests/layouts/GridLayoutMoveComponent.html
+++ b/uitest/src/com/vaadin/tests/layouts/GridLayoutMoveComponent.html
diff --git a/tests/testbench/com/vaadin/tests/layouts/GridLayoutMoveComponent.java b/uitest/src/com/vaadin/tests/layouts/GridLayoutMoveComponent.java
index efd1277653..efd1277653 100644
--- a/tests/testbench/com/vaadin/tests/layouts/GridLayoutMoveComponent.java
+++ b/uitest/src/com/vaadin/tests/layouts/GridLayoutMoveComponent.java
diff --git a/tests/testbench/com/vaadin/tests/layouts/GridLayoutNPE.java b/uitest/src/com/vaadin/tests/layouts/GridLayoutNPE.java
index 3531a4e13c..3531a4e13c 100644
--- a/tests/testbench/com/vaadin/tests/layouts/GridLayoutNPE.java
+++ b/uitest/src/com/vaadin/tests/layouts/GridLayoutNPE.java
diff --git a/tests/testbench/com/vaadin/tests/layouts/GridLayoutRemoveFinalRow.java b/uitest/src/com/vaadin/tests/layouts/GridLayoutRemoveFinalRow.java
index 5d45f72142..5d45f72142 100644
--- a/tests/testbench/com/vaadin/tests/layouts/GridLayoutRemoveFinalRow.java
+++ b/uitest/src/com/vaadin/tests/layouts/GridLayoutRemoveFinalRow.java
diff --git a/tests/testbench/com/vaadin/tests/layouts/GridLayoutSpanExpansion.html b/uitest/src/com/vaadin/tests/layouts/GridLayoutSpanExpansion.html
index 5237d5f49e..5237d5f49e 100644
--- a/tests/testbench/com/vaadin/tests/layouts/GridLayoutSpanExpansion.html
+++ b/uitest/src/com/vaadin/tests/layouts/GridLayoutSpanExpansion.html
diff --git a/tests/testbench/com/vaadin/tests/layouts/GridLayoutSpanExpansion.java b/uitest/src/com/vaadin/tests/layouts/GridLayoutSpanExpansion.java
index 9753526a9e..9753526a9e 100644
--- a/tests/testbench/com/vaadin/tests/layouts/GridLayoutSpanExpansion.java
+++ b/uitest/src/com/vaadin/tests/layouts/GridLayoutSpanExpansion.java
diff --git a/tests/testbench/com/vaadin/tests/layouts/GridLayoutWidthChange.html b/uitest/src/com/vaadin/tests/layouts/GridLayoutWidthChange.html
index f01a1a7026..f01a1a7026 100644
--- a/tests/testbench/com/vaadin/tests/layouts/GridLayoutWidthChange.html
+++ b/uitest/src/com/vaadin/tests/layouts/GridLayoutWidthChange.html
diff --git a/tests/testbench/com/vaadin/tests/layouts/GridLayoutWidthChange.java b/uitest/src/com/vaadin/tests/layouts/GridLayoutWidthChange.java
index c0e6b27c7d..c0e6b27c7d 100644
--- a/tests/testbench/com/vaadin/tests/layouts/GridLayoutWidthChange.java
+++ b/uitest/src/com/vaadin/tests/layouts/GridLayoutWidthChange.java
diff --git a/tests/testbench/com/vaadin/tests/layouts/HiddenHorizontalLayout.java b/uitest/src/com/vaadin/tests/layouts/HiddenHorizontalLayout.java
index dc0c8958ea..dc0c8958ea 100644
--- a/tests/testbench/com/vaadin/tests/layouts/HiddenHorizontalLayout.java
+++ b/uitest/src/com/vaadin/tests/layouts/HiddenHorizontalLayout.java
diff --git a/tests/testbench/com/vaadin/tests/layouts/LayoutPerformanceTests.java b/uitest/src/com/vaadin/tests/layouts/LayoutPerformanceTests.java
index 57c6173895..57c6173895 100644
--- a/tests/testbench/com/vaadin/tests/layouts/LayoutPerformanceTests.java
+++ b/uitest/src/com/vaadin/tests/layouts/LayoutPerformanceTests.java
diff --git a/tests/testbench/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.html b/uitest/src/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.html
index 31b3985a1c..31b3985a1c 100644
--- a/tests/testbench/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.html
+++ b/uitest/src/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.html
diff --git a/tests/testbench/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.java b/uitest/src/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.java
index 87ce80d4f7..87ce80d4f7 100644
--- a/tests/testbench/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.java
+++ b/uitest/src/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.java
diff --git a/tests/testbench/com/vaadin/tests/layouts/MovingInvisibleField.html b/uitest/src/com/vaadin/tests/layouts/MovingInvisibleField.html
index a3f3f84dac..a3f3f84dac 100644
--- a/tests/testbench/com/vaadin/tests/layouts/MovingInvisibleField.html
+++ b/uitest/src/com/vaadin/tests/layouts/MovingInvisibleField.html
diff --git a/tests/testbench/com/vaadin/tests/layouts/MovingInvisibleField.java b/uitest/src/com/vaadin/tests/layouts/MovingInvisibleField.java
index 1285e5b52e..1285e5b52e 100644
--- a/tests/testbench/com/vaadin/tests/layouts/MovingInvisibleField.java
+++ b/uitest/src/com/vaadin/tests/layouts/MovingInvisibleField.java
diff --git a/tests/testbench/com/vaadin/tests/layouts/OrderedLayoutBasics.java b/uitest/src/com/vaadin/tests/layouts/OrderedLayoutBasics.java
index 9e0380a1f6..9e0380a1f6 100644
--- a/tests/testbench/com/vaadin/tests/layouts/OrderedLayoutBasics.java
+++ b/uitest/src/com/vaadin/tests/layouts/OrderedLayoutBasics.java
diff --git a/tests/testbench/com/vaadin/tests/layouts/OrderedLayoutCSSCompatibility.java b/uitest/src/com/vaadin/tests/layouts/OrderedLayoutCSSCompatibility.java
index 41f1de2c4a..41f1de2c4a 100644
--- a/tests/testbench/com/vaadin/tests/layouts/OrderedLayoutCSSCompatibility.java
+++ b/uitest/src/com/vaadin/tests/layouts/OrderedLayoutCSSCompatibility.java
diff --git a/tests/testbench/com/vaadin/tests/layouts/TestAbsoluteLayout.java b/uitest/src/com/vaadin/tests/layouts/TestAbsoluteLayout.java
index 177471e3c8..177471e3c8 100644
--- a/tests/testbench/com/vaadin/tests/layouts/TestAbsoluteLayout.java
+++ b/uitest/src/com/vaadin/tests/layouts/TestAbsoluteLayout.java
diff --git a/tests/testbench/com/vaadin/tests/layouts/TestLayoutClickListeners.html b/uitest/src/com/vaadin/tests/layouts/TestLayoutClickListeners.html
index 2cc695e4fa..2cc695e4fa 100644
--- a/tests/testbench/com/vaadin/tests/layouts/TestLayoutClickListeners.html
+++ b/uitest/src/com/vaadin/tests/layouts/TestLayoutClickListeners.html
diff --git a/tests/testbench/com/vaadin/tests/layouts/TestLayoutClickListeners.java b/uitest/src/com/vaadin/tests/layouts/TestLayoutClickListeners.java
index 44f40a7d78..44f40a7d78 100644
--- a/tests/testbench/com/vaadin/tests/layouts/TestLayoutClickListeners.java
+++ b/uitest/src/com/vaadin/tests/layouts/TestLayoutClickListeners.java
diff --git a/tests/testbench/com/vaadin/tests/layouts/TestLayoutPerformance.java b/uitest/src/com/vaadin/tests/layouts/TestLayoutPerformance.java
index 85ecf2897b..85ecf2897b 100644
--- a/tests/testbench/com/vaadin/tests/layouts/TestLayoutPerformance.java
+++ b/uitest/src/com/vaadin/tests/layouts/TestLayoutPerformance.java
diff --git a/tests/testbench/com/vaadin/tests/layouts/TreeWithBordersInLayout.html b/uitest/src/com/vaadin/tests/layouts/TreeWithBordersInLayout.html
index e1034c2f0e..e1034c2f0e 100644
--- a/tests/testbench/com/vaadin/tests/layouts/TreeWithBordersInLayout.html
+++ b/uitest/src/com/vaadin/tests/layouts/TreeWithBordersInLayout.html
diff --git a/tests/testbench/com/vaadin/tests/layouts/TreeWithBordersInLayout.java b/uitest/src/com/vaadin/tests/layouts/TreeWithBordersInLayout.java
index 8786ae282c..8786ae282c 100644
--- a/tests/testbench/com/vaadin/tests/layouts/TreeWithBordersInLayout.java
+++ b/uitest/src/com/vaadin/tests/layouts/TreeWithBordersInLayout.java
diff --git a/tests/testbench/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java b/uitest/src/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java
index ef24150762..ef24150762 100644
--- a/tests/testbench/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java
+++ b/uitest/src/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java
diff --git a/tests/testbench/com/vaadin/tests/layouts/VerticalLayoutWithRelativeSizeComponents.java b/uitest/src/com/vaadin/tests/layouts/VerticalLayoutWithRelativeSizeComponents.java
index 906de9bb77..906de9bb77 100644
--- a/tests/testbench/com/vaadin/tests/layouts/VerticalLayoutWithRelativeSizeComponents.java
+++ b/uitest/src/com/vaadin/tests/layouts/VerticalLayoutWithRelativeSizeComponents.java
diff --git a/tests/testbench/com/vaadin/tests/layouts/VerticalLayoutWithRelativeSizeComponentsInitiallyHidden.java b/uitest/src/com/vaadin/tests/layouts/VerticalLayoutWithRelativeSizeComponentsInitiallyHidden.java
index f3d4029663..f3d4029663 100644
--- a/tests/testbench/com/vaadin/tests/layouts/VerticalLayoutWithRelativeSizeComponentsInitiallyHidden.java
+++ b/uitest/src/com/vaadin/tests/layouts/VerticalLayoutWithRelativeSizeComponentsInitiallyHidden.java
diff --git a/tests/testbench/com/vaadin/tests/layouts/layouttester/AbstractLayoutTests.java b/uitest/src/com/vaadin/tests/layouts/layouttester/AbstractLayoutTests.java
index c96d542a4c..c96d542a4c 100644
--- a/tests/testbench/com/vaadin/tests/layouts/layouttester/AbstractLayoutTests.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/AbstractLayoutTests.java
diff --git a/tests/testbench/com/vaadin/tests/layouts/layouttester/GridLayoutTests.java b/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayoutTests.java
index 8da94feb7f..8da94feb7f 100644
--- a/tests/testbench/com/vaadin/tests/layouts/layouttester/GridLayoutTests.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayoutTests.java
diff --git a/tests/testbench/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java b/uitest/src/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java
index 0042f0ba11..0042f0ba11 100644
--- a/tests/testbench/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java
diff --git a/tests/testbench/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.html b/uitest/src/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.html
index 8408aba9fd..8408aba9fd 100644
--- a/tests/testbench/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.html
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.html
diff --git a/tests/testbench/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.java b/uitest/src/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.java
index e31ecc2498..e31ecc2498 100644
--- a/tests/testbench/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.java
diff --git a/tests/testbench/com/vaadin/tests/layouts/layouttester/UndefWideLabel.java b/uitest/src/com/vaadin/tests/layouts/layouttester/UndefWideLabel.java
index c998ce458a..c998ce458a 100644
--- a/tests/testbench/com/vaadin/tests/layouts/layouttester/UndefWideLabel.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/UndefWideLabel.java
diff --git a/tests/testbench/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java b/uitest/src/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java
index 3e668289fe..3e668289fe 100644
--- a/tests/testbench/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java
diff --git a/tests/testbench/com/vaadin/tests/m.gif b/uitest/src/com/vaadin/tests/m.gif
index 2201bdfc1c..2201bdfc1c 100644
--- a/tests/testbench/com/vaadin/tests/m.gif
+++ b/uitest/src/com/vaadin/tests/m.gif
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/AutoGeneratingForm.java b/uitest/src/com/vaadin/tests/minitutorials/v7a1/AutoGeneratingForm.java
index 4e8d2f3160..4e8d2f3160 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/AutoGeneratingForm.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a1/AutoGeneratingForm.java
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/BasicApplication.java b/uitest/src/com/vaadin/tests/minitutorials/v7a1/BasicApplication.java
index f55377b3f4..f55377b3f4 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/BasicApplication.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a1/BasicApplication.java
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/CreatingPreserveState.java b/uitest/src/com/vaadin/tests/minitutorials/v7a1/CreatingPreserveState.java
index a96b8957c6..a96b8957c6 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/CreatingPreserveState.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a1/CreatingPreserveState.java
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/CustomConverterFactoryUI.java b/uitest/src/com/vaadin/tests/minitutorials/v7a1/CustomConverterFactoryUI.java
index 2cbff64117..2cbff64117 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/CustomConverterFactoryUI.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a1/CustomConverterFactoryUI.java
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/DefineUITheme.java b/uitest/src/com/vaadin/tests/minitutorials/v7a1/DefineUITheme.java
index 9da6a75a45..9da6a75a45 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/DefineUITheme.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a1/DefineUITheme.java
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/DifferentFeaturesForDifferentClients.java b/uitest/src/com/vaadin/tests/minitutorials/v7a1/DifferentFeaturesForDifferentClients.java
index ba3042c48e..ba3042c48e 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/DifferentFeaturesForDifferentClients.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a1/DifferentFeaturesForDifferentClients.java
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/DynamicImageUI.java b/uitest/src/com/vaadin/tests/minitutorials/v7a1/DynamicImageUI.java
index 4fd9c1187b..4fd9c1187b 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/DynamicImageUI.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a1/DynamicImageUI.java
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/FindCurrentUI.java b/uitest/src/com/vaadin/tests/minitutorials/v7a1/FindCurrentUI.java
index e0f53935c7..e0f53935c7 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/FindCurrentUI.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a1/FindCurrentUI.java
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/FormUsingExistingLayout.java b/uitest/src/com/vaadin/tests/minitutorials/v7a1/FormUsingExistingLayout.java
index a3de39c039..a3de39c039 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/FormUsingExistingLayout.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a1/FormUsingExistingLayout.java
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/FormatTableValue.java b/uitest/src/com/vaadin/tests/minitutorials/v7a1/FormatTableValue.java
index ae8de83e30..ae8de83e30 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/FormatTableValue.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a1/FormatTableValue.java
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldDataSource.java b/uitest/src/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldDataSource.java
index f0df14e158..f0df14e158 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldDataSource.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldDataSource.java
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldStandalone.java b/uitest/src/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldStandalone.java
index 1e32916d0b..1e32916d0b 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldStandalone.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldStandalone.java
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/MultiTabApplication.java b/uitest/src/com/vaadin/tests/minitutorials/v7a1/MultiTabApplication.java
index 2c7d6ee7ba..2c7d6ee7ba 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/MultiTabApplication.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a1/MultiTabApplication.java
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/MyConverterFactory.java b/uitest/src/com/vaadin/tests/minitutorials/v7a1/MyConverterFactory.java
index 17c37f2115..17c37f2115 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/MyConverterFactory.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a1/MyConverterFactory.java
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/MyStringToDoubleConverter.java b/uitest/src/com/vaadin/tests/minitutorials/v7a1/MyStringToDoubleConverter.java
index 483f841ce2..483f841ce2 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/MyStringToDoubleConverter.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a1/MyStringToDoubleConverter.java
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/StringMyTypeConverter.java b/uitest/src/com/vaadin/tests/minitutorials/v7a1/StringMyTypeConverter.java
index 5834f320af..5834f320af 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/StringMyTypeConverter.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a1/StringMyTypeConverter.java
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/UsingBeanValidation.java b/uitest/src/com/vaadin/tests/minitutorials/v7a1/UsingBeanValidation.java
index 4beb321cd1..4beb321cd1 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/UsingBeanValidation.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a1/UsingBeanValidation.java
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/UsingUriFragments.java b/uitest/src/com/vaadin/tests/minitutorials/v7a1/UsingUriFragments.java
index cde71d5ac2..cde71d5ac2 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/UsingUriFragments.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a1/UsingUriFragments.java
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/UsingXyzWhenInitializing.java b/uitest/src/com/vaadin/tests/minitutorials/v7a1/UsingXyzWhenInitializing.java
index dc6c8ce7bf..dc6c8ce7bf 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/UsingXyzWhenInitializing.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a1/UsingXyzWhenInitializing.java
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/ComponentInStateComponent.java b/uitest/src/com/vaadin/tests/minitutorials/v7a2/ComponentInStateComponent.java
index 061eb7a23e..061eb7a23e 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/ComponentInStateComponent.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a2/ComponentInStateComponent.java
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/ComponentInStateUI.java b/uitest/src/com/vaadin/tests/minitutorials/v7a2/ComponentInStateUI.java
index 8ad3b037b3..8ad3b037b3 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/ComponentInStateUI.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a2/ComponentInStateUI.java
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/MyComponent.java b/uitest/src/com/vaadin/tests/minitutorials/v7a2/MyComponent.java
index 292ac62125..292ac62125 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/MyComponent.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a2/MyComponent.java
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/MyComponentUI.java b/uitest/src/com/vaadin/tests/minitutorials/v7a2/MyComponentUI.java
index 62088f304d..62088f304d 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/MyComponentUI.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a2/MyComponentUI.java
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/MyPickerConnector.java b/uitest/src/com/vaadin/tests/minitutorials/v7a2/MyPickerConnector.java
index 0306555a5d..0306555a5d 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/MyPickerConnector.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a2/MyPickerConnector.java
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/MyPickerWidget.java b/uitest/src/com/vaadin/tests/minitutorials/v7a2/MyPickerWidget.java
index 7818ac4f99..7818ac4f99 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/MyPickerWidget.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a2/MyPickerWidget.java
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/ResourceInStateComponent.java b/uitest/src/com/vaadin/tests/minitutorials/v7a2/ResourceInStateComponent.java
index cf0c5a3e2b..cf0c5a3e2b 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/ResourceInStateComponent.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a2/ResourceInStateComponent.java
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/ResourceInStateUI.java b/uitest/src/com/vaadin/tests/minitutorials/v7a2/ResourceInStateUI.java
index 35062fbf0c..35062fbf0c 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/ResourceInStateUI.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a2/ResourceInStateUI.java
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/WidgetContainer.java b/uitest/src/com/vaadin/tests/minitutorials/v7a2/WidgetContainer.java
index 5c519dbdfe..5c519dbdfe 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/WidgetContainer.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a2/WidgetContainer.java
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/WidgetcontainerUI.java b/uitest/src/com/vaadin/tests/minitutorials/v7a2/WidgetcontainerUI.java
index 76e332504c..76e332504c 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/WidgetcontainerUI.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a2/WidgetcontainerUI.java
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/Analytics.java b/uitest/src/com/vaadin/tests/minitutorials/v7a3/Analytics.java
index 86a1908a2b..86a1908a2b 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/Analytics.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a3/Analytics.java
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/AnalyticsUI.java b/uitest/src/com/vaadin/tests/minitutorials/v7a3/AnalyticsUI.java
index 95055cd207..95055cd207 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/AnalyticsUI.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a3/AnalyticsUI.java
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/ComplexTypesBean.java b/uitest/src/com/vaadin/tests/minitutorials/v7a3/ComplexTypesBean.java
index 8e415e4e68..8e415e4e68 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/ComplexTypesBean.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a3/ComplexTypesBean.java
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/ComplexTypesComponent.java b/uitest/src/com/vaadin/tests/minitutorials/v7a3/ComplexTypesComponent.java
index 5b6a693389..5b6a693389 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/ComplexTypesComponent.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a3/ComplexTypesComponent.java
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/ComplexTypesRpc.java b/uitest/src/com/vaadin/tests/minitutorials/v7a3/ComplexTypesRpc.java
index eb1277851c..eb1277851c 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/ComplexTypesRpc.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a3/ComplexTypesRpc.java
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/ComplexTypesUI.java b/uitest/src/com/vaadin/tests/minitutorials/v7a3/ComplexTypesUI.java
index b84cb5e599..b84cb5e599 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/ComplexTypesUI.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a3/ComplexTypesUI.java
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/Flot.java b/uitest/src/com/vaadin/tests/minitutorials/v7a3/Flot.java
index 816c60cfe5..816c60cfe5 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/Flot.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a3/Flot.java
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/FlotClickRpc.java b/uitest/src/com/vaadin/tests/minitutorials/v7a3/FlotClickRpc.java
index 3802fe6e3f..3802fe6e3f 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/FlotClickRpc.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a3/FlotClickRpc.java
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/FlotHighlightRpc.java b/uitest/src/com/vaadin/tests/minitutorials/v7a3/FlotHighlightRpc.java
index a1c04db794..a1c04db794 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/FlotHighlightRpc.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a3/FlotHighlightRpc.java
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/FlotJavaScriptUI.java b/uitest/src/com/vaadin/tests/minitutorials/v7a3/FlotJavaScriptUI.java
index 5e519d1b7a..5e519d1b7a 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/FlotJavaScriptUI.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a3/FlotJavaScriptUI.java
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/FlotState.java b/uitest/src/com/vaadin/tests/minitutorials/v7a3/FlotState.java
index eb9e2f64ce..eb9e2f64ce 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/FlotState.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a3/FlotState.java
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/RedButton.java b/uitest/src/com/vaadin/tests/minitutorials/v7a3/RedButton.java
index 366dab16f0..366dab16f0 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/RedButton.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a3/RedButton.java
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/RedButtonUI.java b/uitest/src/com/vaadin/tests/minitutorials/v7a3/RedButtonUI.java
index 793ba3dee8..793ba3dee8 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/RedButtonUI.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a3/RedButtonUI.java
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/analytics_connector.js b/uitest/src/com/vaadin/tests/minitutorials/v7a3/analytics_connector.js
index 4eadff5803..4eadff5803 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/analytics_connector.js
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a3/analytics_connector.js
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/complex_types_connector.js b/uitest/src/com/vaadin/tests/minitutorials/v7a3/complex_types_connector.js
index 496afce432..496afce432 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/complex_types_connector.js
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a3/complex_types_connector.js
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/flot_connector.js b/uitest/src/com/vaadin/tests/minitutorials/v7a3/flot_connector.js
index 5e572a4c72..5e572a4c72 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/flot_connector.js
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a3/flot_connector.js
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/jquery.flot.js b/uitest/src/com/vaadin/tests/minitutorials/v7a3/jquery.flot.js
index f38561ba10..f38561ba10 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/jquery.flot.js
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a3/jquery.flot.js
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/redbutton.css b/uitest/src/com/vaadin/tests/minitutorials/v7a3/redbutton.css
index a70cf5e575..a70cf5e575 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/redbutton.css
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a3/redbutton.css
diff --git a/tests/testbench/com/vaadin/tests/requesthandlers/AppResource404.html b/uitest/src/com/vaadin/tests/requesthandlers/AppResource404.html
index da050b3aaa..da050b3aaa 100644
--- a/tests/testbench/com/vaadin/tests/requesthandlers/AppResource404.html
+++ b/uitest/src/com/vaadin/tests/requesthandlers/AppResource404.html
diff --git a/tests/testbench/com/vaadin/tests/requesthandlers/AppResource404.java b/uitest/src/com/vaadin/tests/requesthandlers/AppResource404.java
index ebccba74fb..ebccba74fb 100644
--- a/tests/testbench/com/vaadin/tests/requesthandlers/AppResource404.java
+++ b/uitest/src/com/vaadin/tests/requesthandlers/AppResource404.java
diff --git a/tests/testbench/com/vaadin/tests/resources/ConnectorResourceTest.html b/uitest/src/com/vaadin/tests/resources/ConnectorResourceTest.html
index f400bacffa..f400bacffa 100644
--- a/tests/testbench/com/vaadin/tests/resources/ConnectorResourceTest.html
+++ b/uitest/src/com/vaadin/tests/resources/ConnectorResourceTest.html
diff --git a/tests/testbench/com/vaadin/tests/resources/ConnectorResourceTest.java b/uitest/src/com/vaadin/tests/resources/ConnectorResourceTest.java
index c8d711f0b2..c8d711f0b2 100644
--- a/tests/testbench/com/vaadin/tests/resources/ConnectorResourceTest.java
+++ b/uitest/src/com/vaadin/tests/resources/ConnectorResourceTest.java
diff --git a/tests/testbench/com/vaadin/tests/resources/DownloadLargeFileResource.java b/uitest/src/com/vaadin/tests/resources/DownloadLargeFileResource.java
index d799e1a8d4..d799e1a8d4 100644
--- a/tests/testbench/com/vaadin/tests/resources/DownloadLargeFileResource.java
+++ b/uitest/src/com/vaadin/tests/resources/DownloadLargeFileResource.java
diff --git a/tests/testbench/com/vaadin/tests/resources/NonExistingFileResource.java b/uitest/src/com/vaadin/tests/resources/NonExistingFileResource.java
index eb8559f746..eb8559f746 100644
--- a/tests/testbench/com/vaadin/tests/resources/NonExistingFileResource.java
+++ b/uitest/src/com/vaadin/tests/resources/NonExistingFileResource.java
diff --git a/tests/testbench/com/vaadin/tests/resources/ResourceDownload.java b/uitest/src/com/vaadin/tests/resources/ResourceDownload.java
index e323f5285b..e323f5285b 100644
--- a/tests/testbench/com/vaadin/tests/resources/ResourceDownload.java
+++ b/uitest/src/com/vaadin/tests/resources/ResourceDownload.java
diff --git a/tests/testbench/com/vaadin/tests/serialization/DelegateToWidgetTest.html b/uitest/src/com/vaadin/tests/serialization/DelegateToWidgetTest.html
index 12228eb9f0..12228eb9f0 100644
--- a/tests/testbench/com/vaadin/tests/serialization/DelegateToWidgetTest.html
+++ b/uitest/src/com/vaadin/tests/serialization/DelegateToWidgetTest.html
diff --git a/tests/testbench/com/vaadin/tests/serialization/DelegateToWidgetTest.java b/uitest/src/com/vaadin/tests/serialization/DelegateToWidgetTest.java
index 3a5dd0a326..3a5dd0a326 100644
--- a/tests/testbench/com/vaadin/tests/serialization/DelegateToWidgetTest.java
+++ b/uitest/src/com/vaadin/tests/serialization/DelegateToWidgetTest.java
diff --git a/tests/testbench/com/vaadin/tests/serialization/SerializerNamespaceTest.html b/uitest/src/com/vaadin/tests/serialization/SerializerNamespaceTest.html
index 70d0e905f5..70d0e905f5 100644
--- a/tests/testbench/com/vaadin/tests/serialization/SerializerNamespaceTest.html
+++ b/uitest/src/com/vaadin/tests/serialization/SerializerNamespaceTest.html
diff --git a/tests/testbench/com/vaadin/tests/serialization/SerializerNamespaceTest.java b/uitest/src/com/vaadin/tests/serialization/SerializerNamespaceTest.java
index 0d939a3d18..0d939a3d18 100644
--- a/tests/testbench/com/vaadin/tests/serialization/SerializerNamespaceTest.java
+++ b/uitest/src/com/vaadin/tests/serialization/SerializerNamespaceTest.java
diff --git a/tests/testbench/com/vaadin/tests/serialization/SerializerTest.html b/uitest/src/com/vaadin/tests/serialization/SerializerTest.html
index 4417fabf14..4417fabf14 100644
--- a/tests/testbench/com/vaadin/tests/serialization/SerializerTest.html
+++ b/uitest/src/com/vaadin/tests/serialization/SerializerTest.html
diff --git a/tests/testbench/com/vaadin/tests/serialization/SerializerTest.java b/uitest/src/com/vaadin/tests/serialization/SerializerTest.java
index cb9d9e997d..cb9d9e997d 100644
--- a/tests/testbench/com/vaadin/tests/serialization/SerializerTest.java
+++ b/uitest/src/com/vaadin/tests/serialization/SerializerTest.java
diff --git a/tests/testbench/com/vaadin/tests/themes/ButtonsTest.java b/uitest/src/com/vaadin/tests/themes/ButtonsTest.java
index 39b43f3516..39b43f3516 100644
--- a/tests/testbench/com/vaadin/tests/themes/ButtonsTest.java
+++ b/uitest/src/com/vaadin/tests/themes/ButtonsTest.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1225.java b/uitest/src/com/vaadin/tests/tickets/Ticket1225.java
index 8c99fe6ebb..8c99fe6ebb 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1225.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1225.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1230.java b/uitest/src/com/vaadin/tests/tickets/Ticket1230.java
index e11d6ea024..e11d6ea024 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1230.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1230.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket124.java b/uitest/src/com/vaadin/tests/tickets/Ticket124.java
index 4bcf31a366..4bcf31a366 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket124.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket124.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1245.java b/uitest/src/com/vaadin/tests/tickets/Ticket1245.java
index 6aa1c1752a..6aa1c1752a 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1245.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1245.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1365.java b/uitest/src/com/vaadin/tests/tickets/Ticket1365.java
index c617b07248..c617b07248 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1365.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1365.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1368.java b/uitest/src/com/vaadin/tests/tickets/Ticket1368.java
index 16b47a1f31..16b47a1f31 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1368.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1368.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1397.java b/uitest/src/com/vaadin/tests/tickets/Ticket1397.java
index e162e96bfa..e162e96bfa 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1397.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1397.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1435.java b/uitest/src/com/vaadin/tests/tickets/Ticket1435.java
index d46a56f73a..d46a56f73a 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1435.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1435.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1444.java b/uitest/src/com/vaadin/tests/tickets/Ticket1444.java
index 1da3b5c290..1da3b5c290 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1444.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1444.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1465ModalNotification.java b/uitest/src/com/vaadin/tests/tickets/Ticket1465ModalNotification.java
index 3c766ef985..3c766ef985 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1465ModalNotification.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1465ModalNotification.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1506.java b/uitest/src/com/vaadin/tests/tickets/Ticket1506.java
index 4788d27aad..4788d27aad 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1506.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1506.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1506_Panel.java b/uitest/src/com/vaadin/tests/tickets/Ticket1506_Panel.java
index 9835e046dc..9835e046dc 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1506_Panel.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1506_Panel.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1506_TestContainer.java b/uitest/src/com/vaadin/tests/tickets/Ticket1506_TestContainer.java
index d6b53db7c7..d6b53db7c7 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1506_TestContainer.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1506_TestContainer.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1506_TestContainer2.java b/uitest/src/com/vaadin/tests/tickets/Ticket1506_TestContainer2.java
index 7ac34dcd2e..7ac34dcd2e 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1506_TestContainer2.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1506_TestContainer2.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1519.java b/uitest/src/com/vaadin/tests/tickets/Ticket1519.java
index 8b1736637b..8b1736637b 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1519.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1519.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1572.java b/uitest/src/com/vaadin/tests/tickets/Ticket1572.java
index a511bae6d9..a511bae6d9 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1572.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1572.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1581.java b/uitest/src/com/vaadin/tests/tickets/Ticket1581.java
index 5025605413..5025605413 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1581.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1581.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1589.java b/uitest/src/com/vaadin/tests/tickets/Ticket1589.java
index 37f9197285..37f9197285 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1589.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1589.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1598.java b/uitest/src/com/vaadin/tests/tickets/Ticket1598.java
index 2f845a2264..2f845a2264 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1598.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1598.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket161.java b/uitest/src/com/vaadin/tests/tickets/Ticket161.java
index 4da1b3a6b4..4da1b3a6b4 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket161.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket161.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1632.java b/uitest/src/com/vaadin/tests/tickets/Ticket1632.java
index bca902a73f..bca902a73f 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1632.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1632.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1659.java b/uitest/src/com/vaadin/tests/tickets/Ticket1659.java
index 57d2ad73e5..57d2ad73e5 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1659.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1659.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1663.java b/uitest/src/com/vaadin/tests/tickets/Ticket1663.java
index 1ef16afe95..1ef16afe95 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1663.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1663.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1673.java b/uitest/src/com/vaadin/tests/tickets/Ticket1673.java
index 99f213541a..99f213541a 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1673.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1673.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1710.java b/uitest/src/com/vaadin/tests/tickets/Ticket1710.java
index c00e2f32eb..c00e2f32eb 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1710.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1710.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1737.java b/uitest/src/com/vaadin/tests/tickets/Ticket1737.java
index caf44865f9..caf44865f9 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1737.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1737.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1767.java b/uitest/src/com/vaadin/tests/tickets/Ticket1767.java
index eca0c0f833..eca0c0f833 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1767.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1767.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1772.java b/uitest/src/com/vaadin/tests/tickets/Ticket1772.java
index a269acc1e0..a269acc1e0 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1772.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1772.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1775.java b/uitest/src/com/vaadin/tests/tickets/Ticket1775.java
index ec28a957bb..ec28a957bb 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1775.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1775.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1804.java b/uitest/src/com/vaadin/tests/tickets/Ticket1804.java
index a77e6e843a..a77e6e843a 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1804.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1804.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1805.java b/uitest/src/com/vaadin/tests/tickets/Ticket1805.java
index 7f5c684479..7f5c684479 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1805.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1805.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1806.java b/uitest/src/com/vaadin/tests/tickets/Ticket1806.java
index 8359b024aa..8359b024aa 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1806.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1806.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1811.java b/uitest/src/com/vaadin/tests/tickets/Ticket1811.java
index 824c58436f..824c58436f 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1811.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1811.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1819.java b/uitest/src/com/vaadin/tests/tickets/Ticket1819.java
index e16b2c2774..e16b2c2774 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1819.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1819.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1834PanelScrolling.java b/uitest/src/com/vaadin/tests/tickets/Ticket1834PanelScrolling.java
index f7329037cc..f7329037cc 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1834PanelScrolling.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1834PanelScrolling.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1857.java b/uitest/src/com/vaadin/tests/tickets/Ticket1857.java
index 039f867fff..039f867fff 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1857.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1857.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1868.java b/uitest/src/com/vaadin/tests/tickets/Ticket1868.java
index 8bd4a77204..8bd4a77204 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1868.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1868.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1869.java b/uitest/src/com/vaadin/tests/tickets/Ticket1869.java
index 741adecae4..741adecae4 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1869.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1869.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1878.java b/uitest/src/com/vaadin/tests/tickets/Ticket1878.java
index 90a96ba0f1..90a96ba0f1 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1878.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1878.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1900.java b/uitest/src/com/vaadin/tests/tickets/Ticket1900.java
index 136af23474..136af23474 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1900.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1900.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1904.java b/uitest/src/com/vaadin/tests/tickets/Ticket1904.java
index f35463f6a8..f35463f6a8 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1904.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1904.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1916.java b/uitest/src/com/vaadin/tests/tickets/Ticket1916.java
index 92102426ca..92102426ca 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1916.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1916.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1919.java b/uitest/src/com/vaadin/tests/tickets/Ticket1919.java
index 8e9e0cb0ba..8e9e0cb0ba 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1919.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1919.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1921.java b/uitest/src/com/vaadin/tests/tickets/Ticket1921.java
index ac5f990915..ac5f990915 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1921.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1921.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1923.java b/uitest/src/com/vaadin/tests/tickets/Ticket1923.java
index 2bde4c95ec..2bde4c95ec 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1923.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1923.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1925.java b/uitest/src/com/vaadin/tests/tickets/Ticket1925.java
index b5d938dbed..b5d938dbed 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1925.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1925.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1939.java b/uitest/src/com/vaadin/tests/tickets/Ticket1939.java
index f65fbf9852..f65fbf9852 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1939.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1939.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1940.java b/uitest/src/com/vaadin/tests/tickets/Ticket1940.java
index 1a27e1ad28..1a27e1ad28 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1940.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1940.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1953.java b/uitest/src/com/vaadin/tests/tickets/Ticket1953.java
index 9bf4ddee51..9bf4ddee51 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1953.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1953.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1966.java b/uitest/src/com/vaadin/tests/tickets/Ticket1966.java
index 9440855bbe..9440855bbe 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1966.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1966.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1966_2.java b/uitest/src/com/vaadin/tests/tickets/Ticket1966_2.java
index c5442e6473..c5442e6473 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1966_2.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1966_2.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1966_3.java b/uitest/src/com/vaadin/tests/tickets/Ticket1966_3.java
index 7258971f50..7258971f50 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1966_3.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1966_3.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1969.java b/uitest/src/com/vaadin/tests/tickets/Ticket1969.java
index 78c09d8914..78c09d8914 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1969.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1969.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1970.java b/uitest/src/com/vaadin/tests/tickets/Ticket1970.java
index b07a997f8f..b07a997f8f 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1970.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1970.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1972.java b/uitest/src/com/vaadin/tests/tickets/Ticket1972.java
index 6b406a2f89..6b406a2f89 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1972.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1972.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1973.java b/uitest/src/com/vaadin/tests/tickets/Ticket1973.java
index a3365bedcb..a3365bedcb 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1973.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1973.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1973_2.java b/uitest/src/com/vaadin/tests/tickets/Ticket1973_2.java
index 27c3d4a8a7..27c3d4a8a7 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1973_2.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1973_2.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1975.java b/uitest/src/com/vaadin/tests/tickets/Ticket1975.java
index 9c6dd8c272..9c6dd8c272 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1975.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1975.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1982.java b/uitest/src/com/vaadin/tests/tickets/Ticket1982.java
index a5953d22af..a5953d22af 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1982.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1982.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1983.java b/uitest/src/com/vaadin/tests/tickets/Ticket1983.java
index 7b544ec9b0..7b544ec9b0 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1983.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1983.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1986.java b/uitest/src/com/vaadin/tests/tickets/Ticket1986.java
index fd6665b2fe..fd6665b2fe 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1986.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1986.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1991.java b/uitest/src/com/vaadin/tests/tickets/Ticket1991.java
index ed60c89c16..ed60c89c16 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1991.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1991.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1995.java b/uitest/src/com/vaadin/tests/tickets/Ticket1995.java
index 04ce9c712d..04ce9c712d 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1995.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1995.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket20.java b/uitest/src/com/vaadin/tests/tickets/Ticket20.java
index ea610a3db8..ea610a3db8 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket20.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket20.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2001.java b/uitest/src/com/vaadin/tests/tickets/Ticket2001.java
index 8ff3d952c4..8ff3d952c4 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2001.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2001.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2002.java b/uitest/src/com/vaadin/tests/tickets/Ticket2002.java
index aeaf3bfb33..aeaf3bfb33 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2002.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2002.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2007.java b/uitest/src/com/vaadin/tests/tickets/Ticket2007.java
index fcffbc01bf..fcffbc01bf 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2007.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2007.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2009.java b/uitest/src/com/vaadin/tests/tickets/Ticket2009.java
index e79ec8905e..e79ec8905e 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2009.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2009.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2011.java b/uitest/src/com/vaadin/tests/tickets/Ticket2011.java
index 754036cd5b..754036cd5b 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2011.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2011.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2014.java b/uitest/src/com/vaadin/tests/tickets/Ticket2014.java
index bf909acb35..bf909acb35 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2014.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2014.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2021.java b/uitest/src/com/vaadin/tests/tickets/Ticket2021.java
index c23f031a91..c23f031a91 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2021.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2021.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2022.java b/uitest/src/com/vaadin/tests/tickets/Ticket2022.java
index ea142b7e9e..ea142b7e9e 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2022.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2022.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2023.java b/uitest/src/com/vaadin/tests/tickets/Ticket2023.java
index c6b2c0f28a..c6b2c0f28a 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2023.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2023.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2024.java b/uitest/src/com/vaadin/tests/tickets/Ticket2024.java
index b1a8b64931..b1a8b64931 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2024.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2024.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2026.java b/uitest/src/com/vaadin/tests/tickets/Ticket2026.java
index 0b72073bec..0b72073bec 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2026.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2026.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2029.java b/uitest/src/com/vaadin/tests/tickets/Ticket2029.java
index 5900c76706..5900c76706 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2029.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2029.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2037.java b/uitest/src/com/vaadin/tests/tickets/Ticket2037.java
index da47f796a5..da47f796a5 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2037.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2037.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2038.java b/uitest/src/com/vaadin/tests/tickets/Ticket2038.java
index c4714783a0..c4714783a0 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2038.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2038.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2040.java b/uitest/src/com/vaadin/tests/tickets/Ticket2040.java
index a7ca7b179f..a7ca7b179f 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2040.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2040.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2042.java b/uitest/src/com/vaadin/tests/tickets/Ticket2042.java
index 49e999a601..49e999a601 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2042.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2042.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2043.java b/uitest/src/com/vaadin/tests/tickets/Ticket2043.java
index 8a10067455..8a10067455 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2043.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2043.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2048.java b/uitest/src/com/vaadin/tests/tickets/Ticket2048.java
index 5ac0480fe2..5ac0480fe2 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2048.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2048.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2051.java b/uitest/src/com/vaadin/tests/tickets/Ticket2051.java
index 1660f00d88..1660f00d88 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2051.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2051.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2053.java b/uitest/src/com/vaadin/tests/tickets/Ticket2053.java
index 31973e4c92..31973e4c92 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2053.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2053.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2060.java b/uitest/src/com/vaadin/tests/tickets/Ticket2060.java
index c9e91930bf..c9e91930bf 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2060.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2060.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2061.java b/uitest/src/com/vaadin/tests/tickets/Ticket2061.java
index 4d6549bfbf..4d6549bfbf 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2061.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2061.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2061b.java b/uitest/src/com/vaadin/tests/tickets/Ticket2061b.java
index 87d92ad9f6..87d92ad9f6 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2061b.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2061b.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2061c.java b/uitest/src/com/vaadin/tests/tickets/Ticket2061c.java
index 5cb041788b..5cb041788b 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2061c.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2061c.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2062.java b/uitest/src/com/vaadin/tests/tickets/Ticket2062.java
index 9b2fe05514..9b2fe05514 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2062.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2062.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2083.java b/uitest/src/com/vaadin/tests/tickets/Ticket2083.java
index 87bea00023..87bea00023 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2083.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2083.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2090.java b/uitest/src/com/vaadin/tests/tickets/Ticket2090.java
index 2f311b9428..2f311b9428 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2090.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2090.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2095.java b/uitest/src/com/vaadin/tests/tickets/Ticket2095.java
index 53f2aac79e..53f2aac79e 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2095.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2095.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2098.java b/uitest/src/com/vaadin/tests/tickets/Ticket2098.java
index a8a3e22d2b..a8a3e22d2b 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2098.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2098.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2099.java b/uitest/src/com/vaadin/tests/tickets/Ticket2099.java
index 2bba0504a5..2bba0504a5 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2099.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2099.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2101.java b/uitest/src/com/vaadin/tests/tickets/Ticket2101.java
index c29eaaf453..c29eaaf453 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2101.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2101.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2103.java b/uitest/src/com/vaadin/tests/tickets/Ticket2103.java
index 576fe03d87..576fe03d87 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2103.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2103.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2104.java b/uitest/src/com/vaadin/tests/tickets/Ticket2104.java
index 0dba639712..0dba639712 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2104.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2104.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2106.java b/uitest/src/com/vaadin/tests/tickets/Ticket2106.java
index 9d6e198f03..9d6e198f03 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2106.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2106.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2107.java b/uitest/src/com/vaadin/tests/tickets/Ticket2107.java
index 37d570546b..37d570546b 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2107.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2107.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2117.java b/uitest/src/com/vaadin/tests/tickets/Ticket2117.java
index fb0d62ba85..fb0d62ba85 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2117.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2117.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2119.java b/uitest/src/com/vaadin/tests/tickets/Ticket2119.java
index 38cc567295..38cc567295 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2119.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2119.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2125.java b/uitest/src/com/vaadin/tests/tickets/Ticket2125.java
index bc1f886418..bc1f886418 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2125.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2125.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2126.java b/uitest/src/com/vaadin/tests/tickets/Ticket2126.java
index d49c73ea5f..d49c73ea5f 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2126.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2126.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2151.java b/uitest/src/com/vaadin/tests/tickets/Ticket2151.java
index 721bdf3c9f..721bdf3c9f 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2151.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2151.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2157.java b/uitest/src/com/vaadin/tests/tickets/Ticket2157.java
index b8f75fc279..b8f75fc279 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2157.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2157.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2178.java b/uitest/src/com/vaadin/tests/tickets/Ticket2178.java
index e64db69ced..e64db69ced 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2178.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2178.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2179.java b/uitest/src/com/vaadin/tests/tickets/Ticket2179.java
index 622488dc0f..622488dc0f 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2179.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2179.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2180.java b/uitest/src/com/vaadin/tests/tickets/Ticket2180.java
index fb9332d100..fb9332d100 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2180.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2180.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2181.java b/uitest/src/com/vaadin/tests/tickets/Ticket2181.java
index b67fad52c0..b67fad52c0 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2181.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2181.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2186.java b/uitest/src/com/vaadin/tests/tickets/Ticket2186.java
index 50b8a1f113..50b8a1f113 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2186.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2186.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2204.java b/uitest/src/com/vaadin/tests/tickets/Ticket2204.java
index 24c4d6e8b9..24c4d6e8b9 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2204.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2204.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2208.java b/uitest/src/com/vaadin/tests/tickets/Ticket2208.java
index f622f093ee..f622f093ee 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2208.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2208.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2209.java b/uitest/src/com/vaadin/tests/tickets/Ticket2209.java
index ecad9a950a..ecad9a950a 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2209.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2209.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2209OL.java b/uitest/src/com/vaadin/tests/tickets/Ticket2209OL.java
index 6eec0a7704..6eec0a7704 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2209OL.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2209OL.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2209OL2.java b/uitest/src/com/vaadin/tests/tickets/Ticket2209OL2.java
index 7f4082d0f8..7f4082d0f8 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2209OL2.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2209OL2.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2215.java b/uitest/src/com/vaadin/tests/tickets/Ticket2215.java
index f7099d88f4..f7099d88f4 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2215.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2215.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2221.java b/uitest/src/com/vaadin/tests/tickets/Ticket2221.java
index e3f1516fb8..e3f1516fb8 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2221.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2221.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2222.java b/uitest/src/com/vaadin/tests/tickets/Ticket2222.java
index 14024fda8b..14024fda8b 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2222.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2222.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2227OrderedlayoutInTable.java b/uitest/src/com/vaadin/tests/tickets/Ticket2227OrderedlayoutInTable.java
index f9c670708e..f9c670708e 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2227OrderedlayoutInTable.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2227OrderedlayoutInTable.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2231.java b/uitest/src/com/vaadin/tests/tickets/Ticket2231.java
index 21994bff60..21994bff60 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2231.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2231.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2232.java b/uitest/src/com/vaadin/tests/tickets/Ticket2232.java
index d71134696f..d71134696f 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2232.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2232.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2234.java b/uitest/src/com/vaadin/tests/tickets/Ticket2234.java
index ccda59bb6a..ccda59bb6a 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2234.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2234.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2235.java b/uitest/src/com/vaadin/tests/tickets/Ticket2235.java
index fba82956e0..fba82956e0 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2235.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2235.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2240.java b/uitest/src/com/vaadin/tests/tickets/Ticket2240.java
index bb16a40cd7..bb16a40cd7 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2240.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2240.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2242.java b/uitest/src/com/vaadin/tests/tickets/Ticket2242.java
index 77fbfefe1a..77fbfefe1a 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2242.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2242.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2244.java b/uitest/src/com/vaadin/tests/tickets/Ticket2244.java
index 495e3de26a..495e3de26a 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2244.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2244.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2245.java b/uitest/src/com/vaadin/tests/tickets/Ticket2245.java
index ab474fe6f7..ab474fe6f7 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2245.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2245.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2267.java b/uitest/src/com/vaadin/tests/tickets/Ticket2267.java
index 41843a9742..41843a9742 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2267.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2267.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2271.java b/uitest/src/com/vaadin/tests/tickets/Ticket2271.java
index 91fb51034b..91fb51034b 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2271.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2271.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2282.java b/uitest/src/com/vaadin/tests/tickets/Ticket2282.java
index 976b06fe32..976b06fe32 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2282.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2282.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2283.java b/uitest/src/com/vaadin/tests/tickets/Ticket2283.java
index 5576e48fba..5576e48fba 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2283.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2283.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2287.java b/uitest/src/com/vaadin/tests/tickets/Ticket2287.java
index 59fc174215..59fc174215 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2287.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2287.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2289.java b/uitest/src/com/vaadin/tests/tickets/Ticket2289.java
index c715fafd74..c715fafd74 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2289.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2289.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2292.java b/uitest/src/com/vaadin/tests/tickets/Ticket2292.java
index ce7960a169..ce7960a169 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2292.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2292.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2294.java b/uitest/src/com/vaadin/tests/tickets/Ticket2294.java
index 053534191b..053534191b 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2294.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2294.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2296.java b/uitest/src/com/vaadin/tests/tickets/Ticket2296.java
index d059b96953..d059b96953 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2296.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2296.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2297.java b/uitest/src/com/vaadin/tests/tickets/Ticket2297.java
index 073126ae07..073126ae07 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2297.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2297.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2303.java b/uitest/src/com/vaadin/tests/tickets/Ticket2303.java
index fb1c5440ad..fb1c5440ad 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2303.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2303.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2304.java b/uitest/src/com/vaadin/tests/tickets/Ticket2304.java
index ccef7a9a92..ccef7a9a92 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2304.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2304.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2310.java b/uitest/src/com/vaadin/tests/tickets/Ticket2310.java
index 24fbd7a968..24fbd7a968 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2310.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2310.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2319.java b/uitest/src/com/vaadin/tests/tickets/Ticket2319.java
index 438d2ff286..438d2ff286 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2319.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2319.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2323.java b/uitest/src/com/vaadin/tests/tickets/Ticket2323.java
index d7b8db86bd..d7b8db86bd 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2323.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2323.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2325.java b/uitest/src/com/vaadin/tests/tickets/Ticket2325.java
index ecc897d4ba..ecc897d4ba 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2325.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2325.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2329.java b/uitest/src/com/vaadin/tests/tickets/Ticket2329.java
index 2ce42376f9..2ce42376f9 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2329.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2329.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2337.java b/uitest/src/com/vaadin/tests/tickets/Ticket2337.java
index 3ac381b2d1..3ac381b2d1 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2337.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2337.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2339.java b/uitest/src/com/vaadin/tests/tickets/Ticket2339.java
index ce884bada7..ce884bada7 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2339.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2339.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2341.java b/uitest/src/com/vaadin/tests/tickets/Ticket2341.java
index aa2eefcb7e..aa2eefcb7e 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2341.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2341.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2344.java b/uitest/src/com/vaadin/tests/tickets/Ticket2344.java
index befad78a73..befad78a73 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2344.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2344.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2347.java b/uitest/src/com/vaadin/tests/tickets/Ticket2347.java
index 582b9a95ee..582b9a95ee 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2347.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2347.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2364.java b/uitest/src/com/vaadin/tests/tickets/Ticket2364.java
index f7d6f61110..f7d6f61110 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2364.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2364.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2365.java b/uitest/src/com/vaadin/tests/tickets/Ticket2365.java
index b191901356..b191901356 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2365.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2365.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2398.java b/uitest/src/com/vaadin/tests/tickets/Ticket2398.java
index f5b68800e6..f5b68800e6 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2398.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2398.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2404.java b/uitest/src/com/vaadin/tests/tickets/Ticket2404.java
index 30f9d04d3b..30f9d04d3b 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2404.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2404.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2405.java b/uitest/src/com/vaadin/tests/tickets/Ticket2405.java
index 8be6a13e9f..8be6a13e9f 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2405.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2405.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2406.java b/uitest/src/com/vaadin/tests/tickets/Ticket2406.java
index dd42727591..dd42727591 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2406.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2406.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2407.java b/uitest/src/com/vaadin/tests/tickets/Ticket2407.java
index df2ae47acd..df2ae47acd 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2407.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2407.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2411.java b/uitest/src/com/vaadin/tests/tickets/Ticket2411.java
index 2c59493e0c..2c59493e0c 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2411.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2411.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2415.java b/uitest/src/com/vaadin/tests/tickets/Ticket2415.java
index f52c1b1ccc..f52c1b1ccc 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2415.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2415.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2420.java b/uitest/src/com/vaadin/tests/tickets/Ticket2420.java
index 5d15107053..5d15107053 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2420.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2420.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2425.java b/uitest/src/com/vaadin/tests/tickets/Ticket2425.java
index 140fa6f2b6..140fa6f2b6 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2425.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2425.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2426.java b/uitest/src/com/vaadin/tests/tickets/Ticket2426.java
index fee74b73f7..fee74b73f7 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2426.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2426.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2431.java b/uitest/src/com/vaadin/tests/tickets/Ticket2431.java
index cb9eb449bf..cb9eb449bf 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2431.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2431.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2432.java b/uitest/src/com/vaadin/tests/tickets/Ticket2432.java
index f21e6a6752..f21e6a6752 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2432.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2432.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2434.java b/uitest/src/com/vaadin/tests/tickets/Ticket2434.java
index 6401a98763..6401a98763 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2434.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2434.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2436.java b/uitest/src/com/vaadin/tests/tickets/Ticket2436.java
index 5367c24b01..5367c24b01 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2436.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2436.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2526.java b/uitest/src/com/vaadin/tests/tickets/Ticket2526.java
index 998fe75f8c..998fe75f8c 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2526.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2526.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2742.java b/uitest/src/com/vaadin/tests/tickets/Ticket2742.java
index 733f6ac6f6..733f6ac6f6 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2742.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2742.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2901.java b/uitest/src/com/vaadin/tests/tickets/Ticket2901.java
index c4352abefe..c4352abefe 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2901.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2901.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2998.java b/uitest/src/com/vaadin/tests/tickets/Ticket2998.java
index 0cd43533fd..0cd43533fd 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2998.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2998.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket3146.java b/uitest/src/com/vaadin/tests/tickets/Ticket3146.java
index 7973ffa496..7973ffa496 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket3146.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket3146.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket34.java b/uitest/src/com/vaadin/tests/tickets/Ticket34.java
index fd5e9c6005..fd5e9c6005 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket34.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket34.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket5053.java b/uitest/src/com/vaadin/tests/tickets/Ticket5053.java
index 6f8ade15c4..6f8ade15c4 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket5053.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket5053.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket5157.java b/uitest/src/com/vaadin/tests/tickets/Ticket5157.java
index 3102a0a56c..3102a0a56c 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket5157.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket5157.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket5952.java b/uitest/src/com/vaadin/tests/tickets/Ticket5952.java
index 92cd0290d6..92cd0290d6 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket5952.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket5952.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket6002.java b/uitest/src/com/vaadin/tests/tickets/Ticket6002.java
index 887652aee7..887652aee7 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket6002.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket6002.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket677.java b/uitest/src/com/vaadin/tests/tickets/Ticket677.java
index 1c66f67ca1..1c66f67ca1 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket677.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket677.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket695.java b/uitest/src/com/vaadin/tests/tickets/Ticket695.java
index e539f999b3..e539f999b3 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket695.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket695.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket736.java b/uitest/src/com/vaadin/tests/tickets/Ticket736.java
index 417ee86fac..417ee86fac 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket736.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket736.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket8291.java b/uitest/src/com/vaadin/tests/tickets/Ticket8291.java
index 0280db0693..0280db0693 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket8291.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket8291.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket846.java b/uitest/src/com/vaadin/tests/tickets/Ticket846.java
index 407663c6c6..407663c6c6 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket846.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket846.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket932.java b/uitest/src/com/vaadin/tests/tickets/Ticket932.java
index c12e2fcad3..c12e2fcad3 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket932.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket932.java
diff --git a/tests/testbench/com/vaadin/tests/util/Address.java b/uitest/src/com/vaadin/tests/util/Address.java
index 5ef0669e1b..5ef0669e1b 100644
--- a/tests/testbench/com/vaadin/tests/util/Address.java
+++ b/uitest/src/com/vaadin/tests/util/Address.java
diff --git a/tests/testbench/com/vaadin/tests/util/AlwaysFailValidator.java b/uitest/src/com/vaadin/tests/util/AlwaysFailValidator.java
index ddb58999ee..ddb58999ee 100644
--- a/tests/testbench/com/vaadin/tests/util/AlwaysFailValidator.java
+++ b/uitest/src/com/vaadin/tests/util/AlwaysFailValidator.java
diff --git a/tests/testbench/com/vaadin/tests/util/Log.java b/uitest/src/com/vaadin/tests/util/Log.java
index 7a58a4c80c..7a58a4c80c 100644
--- a/tests/testbench/com/vaadin/tests/util/Log.java
+++ b/uitest/src/com/vaadin/tests/util/Log.java
diff --git a/tests/testbench/com/vaadin/tests/util/LogPrintWriter.java b/uitest/src/com/vaadin/tests/util/LogPrintWriter.java
index 1f07a9c7ae..1f07a9c7ae 100644
--- a/tests/testbench/com/vaadin/tests/util/LogPrintWriter.java
+++ b/uitest/src/com/vaadin/tests/util/LogPrintWriter.java
diff --git a/tests/testbench/com/vaadin/tests/util/LoremIpsum.java b/uitest/src/com/vaadin/tests/util/LoremIpsum.java
index 3dc775badf..3dc775badf 100644
--- a/tests/testbench/com/vaadin/tests/util/LoremIpsum.java
+++ b/uitest/src/com/vaadin/tests/util/LoremIpsum.java
diff --git a/tests/testbench/com/vaadin/tests/util/Millionaire.java b/uitest/src/com/vaadin/tests/util/Millionaire.java
index 44d4def416..44d4def416 100644
--- a/tests/testbench/com/vaadin/tests/util/Millionaire.java
+++ b/uitest/src/com/vaadin/tests/util/Millionaire.java
diff --git a/tests/testbench/com/vaadin/tests/util/Person.java b/uitest/src/com/vaadin/tests/util/Person.java
index 72f6b7d20d..72f6b7d20d 100644
--- a/tests/testbench/com/vaadin/tests/util/Person.java
+++ b/uitest/src/com/vaadin/tests/util/Person.java
diff --git a/tests/testbench/com/vaadin/tests/util/PersonContainer.java b/uitest/src/com/vaadin/tests/util/PersonContainer.java
index a3cf28b083..a3cf28b083 100644
--- a/tests/testbench/com/vaadin/tests/util/PersonContainer.java
+++ b/uitest/src/com/vaadin/tests/util/PersonContainer.java
diff --git a/tests/testbench/com/vaadin/tests/util/PortableRandom.java b/uitest/src/com/vaadin/tests/util/PortableRandom.java
index b66bdfdcaf..b66bdfdcaf 100644
--- a/tests/testbench/com/vaadin/tests/util/PortableRandom.java
+++ b/uitest/src/com/vaadin/tests/util/PortableRandom.java
diff --git a/tests/testbench/com/vaadin/tests/util/Product.java b/uitest/src/com/vaadin/tests/util/Product.java
index 46ec1935b0..46ec1935b0 100644
--- a/tests/testbench/com/vaadin/tests/util/Product.java
+++ b/uitest/src/com/vaadin/tests/util/Product.java
diff --git a/tests/testbench/com/vaadin/tests/util/Role.java b/uitest/src/com/vaadin/tests/util/Role.java
index 83f63db4ab..83f63db4ab 100644
--- a/tests/testbench/com/vaadin/tests/util/Role.java
+++ b/uitest/src/com/vaadin/tests/util/Role.java
diff --git a/tests/testbench/com/vaadin/tests/util/SampleDirectory.java b/uitest/src/com/vaadin/tests/util/SampleDirectory.java
index ef20da788d..ef20da788d 100644
--- a/tests/testbench/com/vaadin/tests/util/SampleDirectory.java
+++ b/uitest/src/com/vaadin/tests/util/SampleDirectory.java
diff --git a/tests/testbench/com/vaadin/tests/util/TestClickListener.java b/uitest/src/com/vaadin/tests/util/TestClickListener.java
index b9f6d66b3e..b9f6d66b3e 100644
--- a/tests/testbench/com/vaadin/tests/util/TestClickListener.java
+++ b/uitest/src/com/vaadin/tests/util/TestClickListener.java
diff --git a/tests/testbench/com/vaadin/tests/util/TestUtils.java b/uitest/src/com/vaadin/tests/util/TestUtils.java
index 62f2cc0be3..62f2cc0be3 100644
--- a/tests/testbench/com/vaadin/tests/util/TestUtils.java
+++ b/uitest/src/com/vaadin/tests/util/TestUtils.java
diff --git a/tests/testbench/com/vaadin/tests/util/User.java b/uitest/src/com/vaadin/tests/util/User.java
index 003f485017..003f485017 100644
--- a/tests/testbench/com/vaadin/tests/util/User.java
+++ b/uitest/src/com/vaadin/tests/util/User.java
diff --git a/tests/testbench/com/vaadin/tests/vaadin_spin.swf b/uitest/src/com/vaadin/tests/vaadin_spin.swf
index 9e58ce29c6..9e58ce29c6 100644
--- a/tests/testbench/com/vaadin/tests/vaadin_spin.swf
+++ b/uitest/src/com/vaadin/tests/vaadin_spin.swf
diff --git a/tests/testbench/com/vaadin/tests/vaadincontext/BootstrapModifyUI.html b/uitest/src/com/vaadin/tests/vaadincontext/BootstrapModifyUI.html
index e6fafb14fa..e6fafb14fa 100644
--- a/tests/testbench/com/vaadin/tests/vaadincontext/BootstrapModifyUI.html
+++ b/uitest/src/com/vaadin/tests/vaadincontext/BootstrapModifyUI.html
diff --git a/tests/testbench/com/vaadin/tests/vaadincontext/BootstrapModifyUI.java b/uitest/src/com/vaadin/tests/vaadincontext/BootstrapModifyUI.java
index bc3d88e2bb..bc3d88e2bb 100644
--- a/tests/testbench/com/vaadin/tests/vaadincontext/BootstrapModifyUI.java
+++ b/uitest/src/com/vaadin/tests/vaadincontext/BootstrapModifyUI.java
diff --git a/tests/testbench/com/vaadin/tests/vaadincontext/TestAddonContextListener.java b/uitest/src/com/vaadin/tests/vaadincontext/TestAddonContextListener.java
index 9f3019b21c..9f3019b21c 100644
--- a/tests/testbench/com/vaadin/tests/vaadincontext/TestAddonContextListener.java
+++ b/uitest/src/com/vaadin/tests/vaadincontext/TestAddonContextListener.java
diff --git a/tests/testbench/com/vaadin/tests/validation/EmptyFieldErrorIndicators.html b/uitest/src/com/vaadin/tests/validation/EmptyFieldErrorIndicators.html
index c8fcb20411..c8fcb20411 100644
--- a/tests/testbench/com/vaadin/tests/validation/EmptyFieldErrorIndicators.html
+++ b/uitest/src/com/vaadin/tests/validation/EmptyFieldErrorIndicators.html
diff --git a/tests/testbench/com/vaadin/tests/validation/EmptyFieldErrorIndicators.java b/uitest/src/com/vaadin/tests/validation/EmptyFieldErrorIndicators.java
index 379ab2cfcd..379ab2cfcd 100644
--- a/tests/testbench/com/vaadin/tests/validation/EmptyFieldErrorIndicators.java
+++ b/uitest/src/com/vaadin/tests/validation/EmptyFieldErrorIndicators.java
diff --git a/tests/testbench/com/vaadin/tests/validation/RequiredErrorMessage.java b/uitest/src/com/vaadin/tests/validation/RequiredErrorMessage.java
index b63527ad60..b63527ad60 100644
--- a/tests/testbench/com/vaadin/tests/validation/RequiredErrorMessage.java
+++ b/uitest/src/com/vaadin/tests/validation/RequiredErrorMessage.java
diff --git a/tests/testbench/com/vaadin/tests/validation/RequiredIndicatorForReadOnly.java b/uitest/src/com/vaadin/tests/validation/RequiredIndicatorForReadOnly.java
index 6e806b60f4..6e806b60f4 100644
--- a/tests/testbench/com/vaadin/tests/validation/RequiredIndicatorForReadOnly.java
+++ b/uitest/src/com/vaadin/tests/validation/RequiredIndicatorForReadOnly.java
diff --git a/tests/testbench/com/vaadin/tests/validation/TestValidators.java b/uitest/src/com/vaadin/tests/validation/TestValidators.java
index 746a460da8..746a460da8 100644
--- a/tests/testbench/com/vaadin/tests/validation/TestValidators.java
+++ b/uitest/src/com/vaadin/tests/validation/TestValidators.java
diff --git a/tests/testbench/com/vaadin/tests/validation/ValidationOfRequiredEmptyFields.html b/uitest/src/com/vaadin/tests/validation/ValidationOfRequiredEmptyFields.html
index 62d972e89f..62d972e89f 100644
--- a/tests/testbench/com/vaadin/tests/validation/ValidationOfRequiredEmptyFields.html
+++ b/uitest/src/com/vaadin/tests/validation/ValidationOfRequiredEmptyFields.html
diff --git a/tests/testbench/com/vaadin/tests/validation/ValidationOfRequiredEmptyFields.java b/uitest/src/com/vaadin/tests/validation/ValidationOfRequiredEmptyFields.java
index dd1732023b..dd1732023b 100644
--- a/tests/testbench/com/vaadin/tests/validation/ValidationOfRequiredEmptyFields.java
+++ b/uitest/src/com/vaadin/tests/validation/ValidationOfRequiredEmptyFields.java
diff --git a/tests/testbench/com/vaadin/tests/widgetset/TestingWidgetSet.gwt.xml b/uitest/src/com/vaadin/tests/widgetset/TestingWidgetSet.gwt.xml
index c127d3bb21..c127d3bb21 100644
--- a/tests/testbench/com/vaadin/tests/widgetset/TestingWidgetSet.gwt.xml
+++ b/uitest/src/com/vaadin/tests/widgetset/TestingWidgetSet.gwt.xml
diff --git a/tests/testbench/com/vaadin/tests/widgetset/TestingWidgetSet.java b/uitest/src/com/vaadin/tests/widgetset/TestingWidgetSet.java
index 0464a53a95..0464a53a95 100644
--- a/tests/testbench/com/vaadin/tests/widgetset/TestingWidgetSet.java
+++ b/uitest/src/com/vaadin/tests/widgetset/TestingWidgetSet.java
diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/BasicExtensionTestConnector.java b/uitest/src/com/vaadin/tests/widgetset/client/BasicExtensionTestConnector.java
index 9d28b52ae5..9d28b52ae5 100644
--- a/tests/testbench/com/vaadin/tests/widgetset/client/BasicExtensionTestConnector.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/BasicExtensionTestConnector.java
diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/ComplexTestBean.java b/uitest/src/com/vaadin/tests/widgetset/client/ComplexTestBean.java
index af3a278559..af3a278559 100644
--- a/tests/testbench/com/vaadin/tests/widgetset/client/ComplexTestBean.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/ComplexTestBean.java
diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/DelegateConnector.java b/uitest/src/com/vaadin/tests/widgetset/client/DelegateConnector.java
index c46a5aa007..c46a5aa007 100644
--- a/tests/testbench/com/vaadin/tests/widgetset/client/DelegateConnector.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/DelegateConnector.java
diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/DelegateState.java b/uitest/src/com/vaadin/tests/widgetset/client/DelegateState.java
index e9ac8a1e61..e9ac8a1e61 100644
--- a/tests/testbench/com/vaadin/tests/widgetset/client/DelegateState.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/DelegateState.java
diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/DelegateWidget.java b/uitest/src/com/vaadin/tests/widgetset/client/DelegateWidget.java
index 4776eced9a..4776eced9a 100644
--- a/tests/testbench/com/vaadin/tests/widgetset/client/DelegateWidget.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/DelegateWidget.java
diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/DummyLabelConnector.java b/uitest/src/com/vaadin/tests/widgetset/client/DummyLabelConnector.java
index 601ec6db1f..601ec6db1f 100644
--- a/tests/testbench/com/vaadin/tests/widgetset/client/DummyLabelConnector.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/DummyLabelConnector.java
diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/LabelState.java b/uitest/src/com/vaadin/tests/widgetset/client/LabelState.java
index 91a269e33f..91a269e33f 100644
--- a/tests/testbench/com/vaadin/tests/widgetset/client/LabelState.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/LabelState.java
diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/MissingFromDefaultWidgetsetConnector.java b/uitest/src/com/vaadin/tests/widgetset/client/MissingFromDefaultWidgetsetConnector.java
index bc514047f9..bc514047f9 100644
--- a/tests/testbench/com/vaadin/tests/widgetset/client/MissingFromDefaultWidgetsetConnector.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/MissingFromDefaultWidgetsetConnector.java
diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/SerializerTestConnector.java b/uitest/src/com/vaadin/tests/widgetset/client/SerializerTestConnector.java
index 7783178a3b..7783178a3b 100644
--- a/tests/testbench/com/vaadin/tests/widgetset/client/SerializerTestConnector.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/SerializerTestConnector.java
diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/SerializerTestRpc.java b/uitest/src/com/vaadin/tests/widgetset/client/SerializerTestRpc.java
index 0d89976ca0..0d89976ca0 100644
--- a/tests/testbench/com/vaadin/tests/widgetset/client/SerializerTestRpc.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/SerializerTestRpc.java
diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/SimpleTestBean.java b/uitest/src/com/vaadin/tests/widgetset/client/SimpleTestBean.java
index 97e333c393..97e333c393 100644
--- a/tests/testbench/com/vaadin/tests/widgetset/client/SimpleTestBean.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/SimpleTestBean.java
diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/helloworldfeature/GreetAgainRpc.java b/uitest/src/com/vaadin/tests/widgetset/client/helloworldfeature/GreetAgainRpc.java
index 8bffbb8e5e..8bffbb8e5e 100644
--- a/tests/testbench/com/vaadin/tests/widgetset/client/helloworldfeature/GreetAgainRpc.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/helloworldfeature/GreetAgainRpc.java
diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldExtensionConnector.java b/uitest/src/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldExtensionConnector.java
index 76dbdd5370..76dbdd5370 100644
--- a/tests/testbench/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldExtensionConnector.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldExtensionConnector.java
diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldRpc.java b/uitest/src/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldRpc.java
index 968eb463e2..968eb463e2 100644
--- a/tests/testbench/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldRpc.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldRpc.java
diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldState.java b/uitest/src/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldState.java
index be90719279..be90719279 100644
--- a/tests/testbench/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldState.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldState.java
diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ComponentInStateState.java b/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ComponentInStateState.java
index 63947c2435..63947c2435 100644
--- a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ComponentInStateState.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ComponentInStateState.java
diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ComponentInStateStateConnector.java b/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ComponentInStateStateConnector.java
index 35469e7501..35469e7501 100644
--- a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ComponentInStateStateConnector.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ComponentInStateStateConnector.java
diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentClientRpc.java b/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentClientRpc.java
index f85d67da4b..f85d67da4b 100644
--- a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentClientRpc.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentClientRpc.java
diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentConnector.java b/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentConnector.java
index c80a4c88f0..c80a4c88f0 100644
--- a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentConnector.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentConnector.java
diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentServerRpc.java b/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentServerRpc.java
index 5571ffb701..5571ffb701 100644
--- a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentServerRpc.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentServerRpc.java
diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentState.java b/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentState.java
index 8b68331f30..8b68331f30 100644
--- a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentState.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentState.java
diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentWidget.java b/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentWidget.java
index 729a867f16..729a867f16 100644
--- a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentWidget.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentWidget.java
diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ResourceInStateConnector.java b/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ResourceInStateConnector.java
index 93b12dbc68..93b12dbc68 100644
--- a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ResourceInStateConnector.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ResourceInStateConnector.java
diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ResourceInStateState.java b/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ResourceInStateState.java
index 728f0ba5e1..728f0ba5e1 100644
--- a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ResourceInStateState.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ResourceInStateState.java
diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/VWidgetContainer.java b/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/VWidgetContainer.java
index 6ec0a6da7c..6ec0a6da7c 100644
--- a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/VWidgetContainer.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/VWidgetContainer.java
diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/WidgetContainerConnector.java b/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/WidgetContainerConnector.java
index fc65f6b2ae..fc65f6b2ae 100644
--- a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/WidgetContainerConnector.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/WidgetContainerConnector.java
diff --git a/tests/testbench/com/vaadin/tests/widgetset/server/DelegateToWidgetComponent.java b/uitest/src/com/vaadin/tests/widgetset/server/DelegateToWidgetComponent.java
index 34c9699f7f..34c9699f7f 100644
--- a/tests/testbench/com/vaadin/tests/widgetset/server/DelegateToWidgetComponent.java
+++ b/uitest/src/com/vaadin/tests/widgetset/server/DelegateToWidgetComponent.java
diff --git a/tests/testbench/com/vaadin/tests/widgetset/server/DummyLabel.java b/uitest/src/com/vaadin/tests/widgetset/server/DummyLabel.java
index bda36d64a8..bda36d64a8 100644
--- a/tests/testbench/com/vaadin/tests/widgetset/server/DummyLabel.java
+++ b/uitest/src/com/vaadin/tests/widgetset/server/DummyLabel.java
diff --git a/tests/testbench/com/vaadin/tests/widgetset/server/MissingFromDefaultWidgetsetComponent.java b/uitest/src/com/vaadin/tests/widgetset/server/MissingFromDefaultWidgetsetComponent.java
index 5987bfb539..5987bfb539 100644
--- a/tests/testbench/com/vaadin/tests/widgetset/server/MissingFromDefaultWidgetsetComponent.java
+++ b/uitest/src/com/vaadin/tests/widgetset/server/MissingFromDefaultWidgetsetComponent.java
diff --git a/tests/testbench/com/vaadin/tests/widgetset/server/SerializerTestExtension.java b/uitest/src/com/vaadin/tests/widgetset/server/SerializerTestExtension.java
index 978ed80ed5..978ed80ed5 100644
--- a/tests/testbench/com/vaadin/tests/widgetset/server/SerializerTestExtension.java
+++ b/uitest/src/com/vaadin/tests/widgetset/server/SerializerTestExtension.java
diff --git a/tests/test.xml b/uitest/test.xml
index 9b879ec789..9b879ec789 100644
--- a/tests/test.xml
+++ b/uitest/test.xml
diff --git a/tests/vaadin-server.xml b/uitest/vaadin-server.xml
index d4d23581ec..d4d23581ec 100644
--- a/tests/vaadin-server.xml
+++ b/uitest/vaadin-server.xml