Restructure test source directories and packages #7385

svn changeset:21440/svn branch:6.7

1079 files changed, 208 insertions, 246 deletions

diff --git a/tests/src/com/vaadin/tests/gwtadapter/applicationconnection/URLGeneration.java b/tests/client-side/com/vaadin/terminal/gwt/client/ApplicationConnectionTestURLGeneration.java
index 0ccc455379..fe3b724aaf 100644
--- a/tests/src/com/vaadin/tests/gwtadapter/applicationconnection/URLGeneration.java
+++ b/tests/client-side/com/vaadin/terminal/gwt/client/ApplicationConnectionTestURLGeneration.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.gwtadapter.applicationconnection;

+package com.vaadin.terminal.gwt.client;

 

 import static org.junit.Assert.assertEquals;

 

@@ -6,7 +6,7 @@ import org.junit.Test;
 

 import com.vaadin.terminal.gwt.client.ApplicationConnection;

 

-public class URLGeneration {

+public class ApplicationConnectionTestURLGeneration {

 

     private static final String[] URIS = new String[] {

             "http://demo.vaadin.com/", //

diff --git a/tests/src/com/vaadin/tests/server/BrowserUserAgentParser.java b/tests/client-side/com/vaadin/terminal/gwt/client/TestVBrowserDetailsUserAgentParser.java
index e5ce882ffd..183a4d0fe3 100644
--- a/tests/src/com/vaadin/tests/server/BrowserUserAgentParser.java
+++ b/tests/client-side/com/vaadin/terminal/gwt/client/TestVBrowserDetailsUserAgentParser.java
@@ -1,10 +1,10 @@
-package com.vaadin.tests.server;

+package com.vaadin.terminal.gwt.client;

 

 import junit.framework.TestCase;

 

 import com.vaadin.terminal.gwt.client.VBrowserDetails;

 

-public class BrowserUserAgentParser extends TestCase {

+public class TestVBrowserDetailsUserAgentParser extends TestCase {

 

     private static final String FIREFOX30_WINDOWS = "Mozilla/5.0 (Windows; U; Windows NT 6.1; en-GB; rv:1.9.0.6) Gecko/2009011913 Firefox/3.0.6";

     private static final String FIREFOX30_LINUX = "Mozilla/5.0 (X11; U; Linux x86_64; es-ES; rv:1.9.0.12) Gecko/2009070811 Ubuntu/9.04 (jaunty) Firefox/3.0.12";

diff --git a/tests/src/com/vaadin/tests/server/container/AbstractBeanContainerTest.java b/tests/server-side/com/vaadin/data/util/AbstractBeanContainerTest.java
index f11cd60f96..3c74a45bd7 100644
--- a/tests/src/com/vaadin/tests/server/container/AbstractBeanContainerTest.java
+++ b/tests/server-side/com/vaadin/data/util/AbstractBeanContainerTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.server.container;
+package com.vaadin.data.util;
 
 import com.vaadin.data.util.AbstractBeanContainer;
 import com.vaadin.data.util.BeanContainer;
diff --git a/tests/src/com/vaadin/tests/server/container/AbstractContainerTest.java b/tests/server-side/com/vaadin/data/util/AbstractContainerTest.java
index a83fcfc0f7..8f6fb0ab8a 100644
--- a/tests/src/com/vaadin/tests/server/container/AbstractContainerTest.java
+++ b/tests/server-side/com/vaadin/data/util/AbstractContainerTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.server.container;

+package com.vaadin.data.util;

 

 import java.util.ArrayList;

 import java.util.List;

diff --git a/tests/src/com/vaadin/tests/server/container/AbstractHierarchicalContainerTest.java b/tests/server-side/com/vaadin/data/util/AbstractHierarchicalContainerTest.java
index 5c4dfc658f..6ab624b8ff 100644
--- a/tests/src/com/vaadin/tests/server/container/AbstractHierarchicalContainerTest.java
+++ b/tests/server-side/com/vaadin/data/util/AbstractHierarchicalContainerTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.server.container;

+package com.vaadin.data.util;

 

 import java.util.Collection;

 

diff --git a/tests/src/com/vaadin/tests/server/container/AbstractInMemoryContainerTest.java b/tests/server-side/com/vaadin/data/util/AbstractInMemoryContainerTest.java
index 68db547ccb..bbad33c5bc 100644
--- a/tests/src/com/vaadin/tests/server/container/AbstractInMemoryContainerTest.java
+++ b/tests/server-side/com/vaadin/data/util/AbstractInMemoryContainerTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.server.container;
+package com.vaadin.data.util;
 
 public abstract class AbstractInMemoryContainerTest extends
         AbstractContainerTest {
diff --git a/tests/src/com/vaadin/tests/server/container/BeanContainerTest.java b/tests/server-side/com/vaadin/data/util/BeanContainerTest.java
index 1b3bf69745..5a753e19d0 100644
--- a/tests/src/com/vaadin/tests/server/container/BeanContainerTest.java
+++ b/tests/server-side/com/vaadin/data/util/BeanContainerTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.server.container;
+package com.vaadin.data.util;
 
 import java.util.Arrays;
 import java.util.LinkedHashMap;
diff --git a/tests/src/com/vaadin/tests/server/container/BeanItemContainerSortTest.java b/tests/server-side/com/vaadin/data/util/BeanItemContainerSortTest.java
index 8c9654709b..38f317fef1 100644
--- a/tests/src/com/vaadin/tests/server/container/BeanItemContainerSortTest.java
+++ b/tests/server-side/com/vaadin/data/util/BeanItemContainerSortTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.server.container;
+package com.vaadin.data.util;
 
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/tests/src/com/vaadin/tests/server/container/BeanItemContainerTest.java b/tests/server-side/com/vaadin/data/util/BeanItemContainerTest.java
index 09062fa138..29043b1670 100644
--- a/tests/src/com/vaadin/tests/server/container/BeanItemContainerTest.java
+++ b/tests/server-side/com/vaadin/data/util/BeanItemContainerTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.server.container;
+package com.vaadin.data.util;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/tests/src/com/vaadin/tests/server/container/BeanItemTest.java b/tests/server-side/com/vaadin/data/util/BeanItemTest.java
index 70c419fbbd..044a410803 100644
--- a/tests/src/com/vaadin/tests/server/container/BeanItemTest.java
+++ b/tests/server-side/com/vaadin/data/util/BeanItemTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.server.container;
+package com.vaadin.data.util;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
diff --git a/tests/src/com/vaadin/tests/server/container/NestedMethodPropertyTest.java b/tests/server-side/com/vaadin/data/util/NestedMethodPropertyTest.java
index 80d5236919..b110ea1c6b 100644
--- a/tests/src/com/vaadin/tests/server/container/NestedMethodPropertyTest.java
+++ b/tests/server-side/com/vaadin/data/util/NestedMethodPropertyTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.server.container;
+package com.vaadin.data.util;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
diff --git a/tests/src/com/vaadin/tests/server/container/ObjectPropertyTest.java b/tests/server-side/com/vaadin/data/util/ObjectPropertyTest.java
index 0cdd659afd..a934b40dce 100644
--- a/tests/src/com/vaadin/tests/server/container/ObjectPropertyTest.java
+++ b/tests/server-side/com/vaadin/data/util/ObjectPropertyTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.server.container;

+package com.vaadin.data.util;

 

 import junit.framework.TestCase;

 

diff --git a/tests/src/com/vaadin/tests/server/container/PerformanceTestIndexedContainer.java b/tests/server-side/com/vaadin/data/util/PerformanceTestIndexedContainer.java
index 62e6d88e72..c4ed12efc0 100644
--- a/tests/src/com/vaadin/tests/server/container/PerformanceTestIndexedContainer.java
+++ b/tests/server-side/com/vaadin/data/util/PerformanceTestIndexedContainer.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.server.container;
+package com.vaadin.data.util;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/tests/src/com/vaadin/tests/server/container/PropertyDescriptorTest.java b/tests/server-side/com/vaadin/data/util/PropertyDescriptorTest.java
index c66d36ce8e..c3621fa99b 100644
--- a/tests/src/com/vaadin/tests/server/container/PropertyDescriptorTest.java
+++ b/tests/server-side/com/vaadin/data/util/PropertyDescriptorTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.server.container;
+package com.vaadin.data.util;
 
 import java.beans.Introspector;
 import java.beans.PropertyDescriptor;
@@ -14,7 +14,7 @@ import com.vaadin.data.Property;
 import com.vaadin.data.util.MethodPropertyDescriptor;
 import com.vaadin.data.util.NestedPropertyDescriptor;
 import com.vaadin.data.util.VaadinPropertyDescriptor;
-import com.vaadin.tests.server.container.NestedMethodPropertyTest.Person;
+import com.vaadin.data.util.NestedMethodPropertyTest.Person;
 
 public class PropertyDescriptorTest extends TestCase {
     public void testMethodPropertyDescriptorSerialization() throws Exception {
diff --git a/tests/src/com/vaadin/tests/server/container/PropertySetItemTest.java b/tests/server-side/com/vaadin/data/util/PropertySetItemTest.java
index 5a2af14b7e..4516e8d109 100644
--- a/tests/src/com/vaadin/tests/server/container/PropertySetItemTest.java
+++ b/tests/server-side/com/vaadin/data/util/PropertySetItemTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.server.container;
+package com.vaadin.data.util;
 
 import java.util.Iterator;
 
diff --git a/tests/src/com/vaadin/tests/server/container/TestContainerHierarchicalWrapper.java b/tests/server-side/com/vaadin/data/util/TestContainerHierarchicalWrapper.java
index 88251ebca0..ec0fe1de37 100644
--- a/tests/src/com/vaadin/tests/server/container/TestContainerHierarchicalWrapper.java
+++ b/tests/server-side/com/vaadin/data/util/TestContainerHierarchicalWrapper.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.server.container;

+package com.vaadin.data.util;

 

 import java.util.Collection;

 

diff --git a/tests/src/com/vaadin/tests/server/container/TestContainerSorting.java b/tests/server-side/com/vaadin/data/util/TestContainerSorting.java
index fee398feeb..dbfea7d75d 100644
--- a/tests/src/com/vaadin/tests/server/container/TestContainerSorting.java
+++ b/tests/server-side/com/vaadin/data/util/TestContainerSorting.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.server.container;

+package com.vaadin.data.util;

 

 import java.util.HashMap;

 import java.util.Iterator;

diff --git a/tests/src/com/vaadin/tests/server/container/TestHierarchicalContainer.java b/tests/server-side/com/vaadin/data/util/TestHierarchicalContainer.java
index 5ca8194646..5bbb72fe36 100644
--- a/tests/src/com/vaadin/tests/server/container/TestHierarchicalContainer.java
+++ b/tests/server-side/com/vaadin/data/util/TestHierarchicalContainer.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.server.container;

+package com.vaadin.data.util;

 

 import com.vaadin.data.Container.Filter;

 import com.vaadin.data.Item;

diff --git a/tests/src/com/vaadin/tests/server/container/TestIndexedContainer.java b/tests/server-side/com/vaadin/data/util/TestIndexedContainer.java
index 5cab89ca9b..99bd4838cf 100644
--- a/tests/src/com/vaadin/tests/server/container/TestIndexedContainer.java
+++ b/tests/server-side/com/vaadin/data/util/TestIndexedContainer.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.server.container;

+package com.vaadin.data.util;

 

 import com.vaadin.data.Item;

 import com.vaadin.data.util.IndexedContainer;

diff --git a/tests/src/com/vaadin/tests/server/container/filter/AbstractFilterTest.java b/tests/server-side/com/vaadin/data/util/filter/AbstractFilterTest.java
index 2e913857a8..beaa1c4e8f 100644
--- a/tests/src/com/vaadin/tests/server/container/filter/AbstractFilterTest.java
+++ b/tests/server-side/com/vaadin/data/util/filter/AbstractFilterTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.server.container.filter;
+package com.vaadin.data.util.filter;
 
 import junit.framework.TestCase;
 
diff --git a/tests/src/com/vaadin/tests/server/container/filter/AndOrFilterTest.java b/tests/server-side/com/vaadin/data/util/filter/AndOrFilterTest.java
index 45f4921c35..bdd852bd41 100644
--- a/tests/src/com/vaadin/tests/server/container/filter/AndOrFilterTest.java
+++ b/tests/server-side/com/vaadin/data/util/filter/AndOrFilterTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.server.container.filter;
+package com.vaadin.data.util.filter;
 
 import junit.framework.Assert;
 
diff --git a/tests/src/com/vaadin/tests/server/container/filter/CompareFilterTest.java b/tests/server-side/com/vaadin/data/util/filter/CompareFilterTest.java
index d6e4ffe567..4cd683bfde 100644
--- a/tests/src/com/vaadin/tests/server/container/filter/CompareFilterTest.java
+++ b/tests/server-side/com/vaadin/data/util/filter/CompareFilterTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.server.container.filter;
+package com.vaadin.data.util.filter;
 
 import java.util.Date;
 
diff --git a/tests/src/com/vaadin/tests/server/container/filter/IsNullFilterTest.java b/tests/server-side/com/vaadin/data/util/filter/IsNullFilterTest.java
index b5167592d2..24d5152cf7 100644
--- a/tests/src/com/vaadin/tests/server/container/filter/IsNullFilterTest.java
+++ b/tests/server-side/com/vaadin/data/util/filter/IsNullFilterTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.server.container.filter;
+package com.vaadin.data.util.filter;
 
 import junit.framework.Assert;
 
diff --git a/tests/src/com/vaadin/tests/server/container/filter/NotFilterTest.java b/tests/server-side/com/vaadin/data/util/filter/NotFilterTest.java
index 02488fe063..be6417ccdf 100644
--- a/tests/src/com/vaadin/tests/server/container/filter/NotFilterTest.java
+++ b/tests/server-side/com/vaadin/data/util/filter/NotFilterTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.server.container.filter;
+package com.vaadin.data.util.filter;
 
 import junit.framework.Assert;
 
diff --git a/tests/src/com/vaadin/tests/server/container/filter/SimpleStringFilterTest.java b/tests/server-side/com/vaadin/data/util/filter/SimpleStringFilterTest.java
index dbc803be24..c36a764a54 100644
--- a/tests/src/com/vaadin/tests/server/container/filter/SimpleStringFilterTest.java
+++ b/tests/server-side/com/vaadin/data/util/filter/SimpleStringFilterTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.server.container.filter;
+package com.vaadin.data.util.filter;
 
 import junit.framework.Assert;
 
diff --git a/tests/src/com/vaadin/tests/server/container/sqlcontainer/AllTests.java b/tests/server-side/com/vaadin/data/util/sqlcontainer/AllTests.java
index 5191fcc341..057527307f 100644
--- a/tests/src/com/vaadin/tests/server/container/sqlcontainer/AllTests.java
+++ b/tests/server-side/com/vaadin/data/util/sqlcontainer/AllTests.java
@@ -1,21 +1,21 @@
-package com.vaadin.tests.server.container.sqlcontainer;
+package com.vaadin.data.util.sqlcontainer;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
 
+import com.vaadin.data.util.sqlcontainer.connection.J2EEConnectionPoolTest;
+import com.vaadin.data.util.sqlcontainer.connection.SimpleJDBCConnectionPoolTest;
+import com.vaadin.data.util.sqlcontainer.filters.BetweenTest;
+import com.vaadin.data.util.sqlcontainer.filters.LikeTest;
+import com.vaadin.data.util.sqlcontainer.generator.SQLGeneratorsTest;
+import com.vaadin.data.util.sqlcontainer.query.FreeformQueryTest;
+import com.vaadin.data.util.sqlcontainer.query.QueryBuilderTest;
+import com.vaadin.data.util.sqlcontainer.query.TableQueryTest;
 import com.vaadin.data.util.sqlcontainer.query.generator.DefaultSQLGenerator;
 import com.vaadin.data.util.sqlcontainer.query.generator.MSSQLGenerator;
 import com.vaadin.data.util.sqlcontainer.query.generator.OracleGenerator;
 import com.vaadin.data.util.sqlcontainer.query.generator.SQLGenerator;
-import com.vaadin.tests.server.container.sqlcontainer.connection.J2EEConnectionPoolTest;
-import com.vaadin.tests.server.container.sqlcontainer.connection.SimpleJDBCConnectionPoolTest;
-import com.vaadin.tests.server.container.sqlcontainer.filters.BetweenTest;
-import com.vaadin.tests.server.container.sqlcontainer.filters.LikeTest;
-import com.vaadin.tests.server.container.sqlcontainer.generator.SQLGeneratorsTest;
-import com.vaadin.tests.server.container.sqlcontainer.query.FreeformQueryTest;
-import com.vaadin.tests.server.container.sqlcontainer.query.QueryBuilderTest;
-import com.vaadin.tests.server.container.sqlcontainer.query.TableQueryTest;
 
 @RunWith(Suite.class)
 @SuiteClasses({ SimpleJDBCConnectionPoolTest.class,
diff --git a/tests/src/com/vaadin/tests/server/container/sqlcontainer/ColumnPropertyTest.java b/tests/server-side/com/vaadin/data/util/sqlcontainer/ColumnPropertyTest.java
index 464c65d9ce..fac9fc98db 100644
--- a/tests/src/com/vaadin/tests/server/container/sqlcontainer/ColumnPropertyTest.java
+++ b/tests/server-side/com/vaadin/data/util/sqlcontainer/ColumnPropertyTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.server.container.sqlcontainer;
+package com.vaadin.data.util.sqlcontainer;
 
 import java.util.Arrays;
 
@@ -7,10 +7,7 @@ import org.junit.Assert;
 import org.junit.Test;
 
 import com.vaadin.data.Property.ReadOnlyException;
-import com.vaadin.data.util.sqlcontainer.ColumnProperty;
-import com.vaadin.data.util.sqlcontainer.RowId;
-import com.vaadin.data.util.sqlcontainer.RowItem;
-import com.vaadin.data.util.sqlcontainer.SQLContainer;
+import com.vaadin.data.util.sqlcontainer.ColumnProperty.NotNullableException;
 
 public class ColumnPropertyTest {
 
@@ -38,10 +35,6 @@ public class ColumnPropertyTest {
         Assert.assertEquals("Ville", cp.getValue());
     }
 
-    /*-
-     * TODO Removed test since currently the Vaadin test package structure
-     * does not allow testing protected methods. When it has been fixed
-     * then re-enable test.
     @Test
     public void setValue_readWriteNullable_returnsKalle() {
         ColumnProperty cp = new ColumnProperty("NAME", false, true, true,
@@ -55,7 +48,6 @@ public class ColumnPropertyTest {
         Assert.assertEquals("Kalle", cp.getValue());
         EasyMock.verify(container);
     }
-     */
 
     @Test(expected = ReadOnlyException.class)
     public void setValue_readOnlyNullable_shouldFail() {
@@ -68,10 +60,6 @@ public class ColumnPropertyTest {
         EasyMock.verify(container);
     }
 
-    /*-
-     * TODO Removed test since currently the Vaadin test package structure
-     * does not allow testing protected methods. When it has been fixed
-     * then re-enable test.
     @Test
     public void setValue_readWriteNullable_nullShouldWork() {
         ColumnProperty cp = new ColumnProperty("NAME", false, true, true,
@@ -85,7 +73,6 @@ public class ColumnPropertyTest {
         Assert.assertNull(cp.getValue());
         EasyMock.verify(container);
     }
-    
 
     @Test(expected = NotNullableException.class)
     public void setValue_readWriteNotNullable_nullShouldFail() {
@@ -100,7 +87,6 @@ public class ColumnPropertyTest {
         Assert.assertNotNull(cp.getValue());
         EasyMock.verify(container);
     }
-     */
 
     @Test
     public void getType_normal_returnsStringClass() {
@@ -146,10 +132,6 @@ public class ColumnPropertyTest {
         Assert.assertEquals("NAME", cp.getPropertyId());
     }
 
-    /*-
-     * TODO Removed test since currently the Vaadin test package structure
-     * does not allow testing protected methods. When it has been fixed
-     * then re-enable test.
     @Test
     public void isModified_valueModified_returnsTrue() {
         ColumnProperty cp = new ColumnProperty("NAME", false, true, true,
@@ -164,7 +146,6 @@ public class ColumnPropertyTest {
         Assert.assertTrue(cp.isModified());
         EasyMock.verify(container);
     }
-     */
 
     @Test
     public void isModified_valueNotModified_returnsFalse() {
diff --git a/tests/src/com/vaadin/tests/server/container/sqlcontainer/DataGenerator.java b/tests/server-side/com/vaadin/data/util/sqlcontainer/DataGenerator.java
index 49f08bc798..6fa807b007 100644
--- a/tests/src/com/vaadin/tests/server/container/sqlcontainer/DataGenerator.java
+++ b/tests/server-side/com/vaadin/data/util/sqlcontainer/DataGenerator.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.server.container.sqlcontainer;
+package com.vaadin.data.util.sqlcontainer;
 
 import java.sql.Connection;
 import java.sql.ResultSet;
@@ -8,8 +8,8 @@ import java.sql.Statement;
 import org.junit.Assert;
 import org.junit.Test;
 
+import com.vaadin.data.util.sqlcontainer.AllTests.DB;
 import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool;
-import com.vaadin.tests.server.container.sqlcontainer.AllTests.DB;
 
 public class DataGenerator {
 	
diff --git a/tests/src/com/vaadin/tests/server/container/sqlcontainer/FreeformQueryUtil.java b/tests/server-side/com/vaadin/data/util/sqlcontainer/FreeformQueryUtil.java
index e85183be89..2579a38aa1 100644
--- a/tests/src/com/vaadin/tests/server/container/sqlcontainer/FreeformQueryUtil.java
+++ b/tests/server-side/com/vaadin/data/util/sqlcontainer/FreeformQueryUtil.java
@@ -1,13 +1,13 @@
-package com.vaadin.tests.server.container.sqlcontainer;
+package com.vaadin.data.util.sqlcontainer;
 
 import java.util.List;
 
 import org.junit.Test;
 
 import com.vaadin.data.Container.Filter;
+import com.vaadin.data.util.sqlcontainer.AllTests.DB;
 import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper;
 import com.vaadin.data.util.sqlcontainer.query.generator.filter.QueryBuilder;
-import com.vaadin.tests.server.container.sqlcontainer.AllTests.DB;
 
 public class FreeformQueryUtil {
 
diff --git a/tests/src/com/vaadin/tests/server/container/sqlcontainer/ReadOnlyRowIdTest.java b/tests/server-side/com/vaadin/data/util/sqlcontainer/ReadOnlyRowIdTest.java
index c395bc42bf..d2b6ee2555 100644
--- a/tests/src/com/vaadin/tests/server/container/sqlcontainer/ReadOnlyRowIdTest.java
+++ b/tests/server-side/com/vaadin/data/util/sqlcontainer/ReadOnlyRowIdTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.server.container.sqlcontainer;
+package com.vaadin.data.util.sqlcontainer;
 
 import junit.framework.Assert;
 
diff --git a/tests/src/com/vaadin/tests/server/container/sqlcontainer/RowIdTest.java b/tests/server-side/com/vaadin/data/util/sqlcontainer/RowIdTest.java
index f243c43ec2..399db06869 100644
--- a/tests/src/com/vaadin/tests/server/container/sqlcontainer/RowIdTest.java
+++ b/tests/server-side/com/vaadin/data/util/sqlcontainer/RowIdTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.server.container.sqlcontainer;
+package com.vaadin.data.util.sqlcontainer;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/tests/src/com/vaadin/tests/server/container/sqlcontainer/SQLContainerTableQueryTest.java b/tests/server-side/com/vaadin/data/util/sqlcontainer/SQLContainerTableQueryTest.java
index 0451607e64..58ac123c14 100644
--- a/tests/src/com/vaadin/tests/server/container/sqlcontainer/SQLContainerTableQueryTest.java
+++ b/tests/server-side/com/vaadin/data/util/sqlcontainer/SQLContainerTableQueryTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.server.container.sqlcontainer;

+package com.vaadin.data.util.sqlcontainer;

 

 import java.math.BigDecimal;

 import java.sql.Connection;

@@ -18,14 +18,11 @@ import com.vaadin.data.Container.ItemSetChangeEvent;
 import com.vaadin.data.Container.ItemSetChangeListener;

 import com.vaadin.data.Item;

 import com.vaadin.data.util.filter.Like;

-import com.vaadin.data.util.sqlcontainer.RowId;

-import com.vaadin.data.util.sqlcontainer.SQLContainer;

-import com.vaadin.data.util.sqlcontainer.TemporaryRowId;

+import com.vaadin.data.util.sqlcontainer.AllTests.DB;

 import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool;

 import com.vaadin.data.util.sqlcontainer.connection.SimpleJDBCConnectionPool;

 import com.vaadin.data.util.sqlcontainer.query.OrderBy;

 import com.vaadin.data.util.sqlcontainer.query.TableQuery;

-import com.vaadin.tests.server.container.sqlcontainer.AllTests.DB;

 

 public class SQLContainerTableQueryTest {

 

@@ -1175,10 +1172,6 @@ public class SQLContainerTableQueryTest {
                 container.lastItemId(), "NAME").getValue()));

     }

 

-    /*-

-     * TODO Removed test since currently the Vaadin test package structure

-     * does not allow testing protected methods. When it has been fixed

-     * then re-enable test.

     @Test

     public void itemChangeNotification_table_isModifiedReturnsTrue()

             throws SQLException {

@@ -1188,9 +1181,7 @@ public class SQLContainerTableQueryTest {
         RowItem last = (RowItem) container.getItem(container.lastItemId());

         container.itemChangeNotification(last);

         Assert.assertTrue(container.isModified());

-        Util.shakeBodyElement()

     }

-    -*/

 

     @Test

     public void itemSetChangeListeners_table_shouldFire() throws SQLException {

diff --git a/tests/src/com/vaadin/tests/server/container/sqlcontainer/SQLContainerTest.java b/tests/server-side/com/vaadin/data/util/sqlcontainer/SQLContainerTest.java
index 095e4a2345..d82909041f 100644
--- a/tests/src/com/vaadin/tests/server/container/sqlcontainer/SQLContainerTest.java
+++ b/tests/server-side/com/vaadin/data/util/sqlcontainer/SQLContainerTest.java
@@ -1,11 +1,10 @@
-package com.vaadin.tests.server.container.sqlcontainer;
+package com.vaadin.data.util.sqlcontainer;
 
 import java.math.BigDecimal;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 
@@ -22,10 +21,7 @@ import com.vaadin.data.Container.ItemSetChangeListener;
 import com.vaadin.data.Item;
 import com.vaadin.data.util.filter.Compare.Equal;
 import com.vaadin.data.util.filter.Like;
-import com.vaadin.data.util.sqlcontainer.RowId;
-import com.vaadin.data.util.sqlcontainer.RowItem;
-import com.vaadin.data.util.sqlcontainer.SQLContainer;
-import com.vaadin.data.util.sqlcontainer.TemporaryRowId;
+import com.vaadin.data.util.sqlcontainer.AllTests.DB;
 import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool;
 import com.vaadin.data.util.sqlcontainer.connection.SimpleJDBCConnectionPool;
 import com.vaadin.data.util.sqlcontainer.query.FreeformQuery;
@@ -37,7 +33,6 @@ import com.vaadin.data.util.sqlcontainer.query.generator.OracleGenerator;
 import com.vaadin.data.util.sqlcontainer.query.generator.SQLGenerator;
 import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper;
 import com.vaadin.data.util.sqlcontainer.query.generator.filter.QueryBuilder;
-import com.vaadin.tests.server.container.sqlcontainer.AllTests.DB;
 
 public class SQLContainerTest {
     private static final int offset = AllTests.offset;
@@ -68,14 +63,14 @@ public class SQLContainerTest {
     public void constructor_withFreeformQuery_shouldSucceed()
             throws SQLException {
         new SQLContainer(new FreeformQuery("SELECT * FROM people",
-                Arrays.asList("ID"), connectionPool));
+                connectionPool, "ID"));
     }
 
     @Test(expected = SQLException.class)
     public void constructor_withIllegalFreeformQuery_shouldFail()
             throws SQLException {
         SQLContainer c = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM asdf", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM asdf", connectionPool, "ID"));
         c.getItem(c.firstItemId());
     }
 
@@ -83,7 +78,7 @@ public class SQLContainerTest {
     public void containsId_withFreeformQueryAndExistingId_returnsTrue()
             throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         Assert.assertTrue(container.containsId(new RowId(new Object[] { 1 })));
     }
 
@@ -91,7 +86,7 @@ public class SQLContainerTest {
     public void containsId_withFreeformQueryAndNonexistingId_returnsFalse()
             throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         Assert.assertFalse(container
                 .containsId(new RowId(new Object[] { 1337 })));
     }
@@ -100,7 +95,7 @@ public class SQLContainerTest {
     public void getContainerProperty_freeformExistingItemIdAndPropertyId_returnsProperty()
             throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         if (AllTests.db == DB.ORACLE) {
             Assert.assertEquals(
                     "Ville",
@@ -121,7 +116,7 @@ public class SQLContainerTest {
     public void getContainerProperty_freeformExistingItemIdAndNonexistingPropertyId_returnsNull()
             throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         Assert.assertNull(container.getContainerProperty(new RowId(
                 new Object[] { 1 + offset }), "asdf"));
     }
@@ -130,7 +125,7 @@ public class SQLContainerTest {
     public void getContainerProperty_freeformNonexistingItemId_returnsNull()
             throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         Assert.assertNull(container.getContainerProperty(new RowId(
                 new Object[] { 1337 + offset }), "NAME"));
     }
@@ -139,7 +134,7 @@ public class SQLContainerTest {
     public void getContainerPropertyIds_freeform_returnsIDAndNAME()
             throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         Collection<?> propertyIds = container.getContainerPropertyIds();
         Assert.assertEquals(3, propertyIds.size());
         Assert.assertArrayEquals(new String[] { "ID", "NAME", "AGE" },
@@ -150,7 +145,7 @@ public class SQLContainerTest {
     public void getItem_freeformExistingItemId_returnsItem()
             throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         Item item;
         if (AllTests.db == DB.ORACLE) {
             item = container.getItem(new RowId(new Object[] { new BigDecimal(
@@ -167,7 +162,7 @@ public class SQLContainerTest {
             throws SQLException {
         DataGenerator.addFiveThousandPeople(connectionPool);
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         Item item;
         if (AllTests.db == DB.ORACLE) {
             item = container.getItem(new RowId(new Object[] { new BigDecimal(
@@ -189,7 +184,7 @@ public class SQLContainerTest {
     public void getItemIds_freeform_returnsItemIdsWithKeys0through3()
             throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         Collection<?> itemIds = container.getItemIds();
         Assert.assertEquals(4, itemIds.size());
         RowId zero = new RowId(new Object[] { 0 + offset });
@@ -213,7 +208,7 @@ public class SQLContainerTest {
     public void getType_freeformNAMEPropertyId_returnsString()
             throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         Assert.assertEquals(String.class, container.getType("NAME"));
     }
 
@@ -221,7 +216,7 @@ public class SQLContainerTest {
     public void getType_freeformIDPropertyId_returnsInteger()
             throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         if (AllTests.db == DB.ORACLE) {
             Assert.assertEquals(BigDecimal.class, container.getType("ID"));
         } else {
@@ -233,14 +228,14 @@ public class SQLContainerTest {
     public void getType_freeformNonexistingPropertyId_returnsNull()
             throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         Assert.assertNull(container.getType("asdf"));
     }
 
     @Test
     public void size_freeform_returnsFour() throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         Assert.assertEquals(4, container.size());
     }
 
@@ -259,7 +254,7 @@ public class SQLContainerTest {
         connectionPool.releaseConnection(conn);
 
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         Assert.assertEquals(5, container.size());
     }
 
@@ -267,7 +262,7 @@ public class SQLContainerTest {
     public void indexOfId_freeformWithParameterThree_returnsThree()
             throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         if (AllTests.db == DB.ORACLE) {
             Assert.assertEquals(3, container.indexOfId(new RowId(
                     new Object[] { new BigDecimal(3 + offset) })));
@@ -282,8 +277,8 @@ public class SQLContainerTest {
             throws SQLException {
         DataGenerator.addFiveThousandPeople(connectionPool);
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people ORDER BY \"ID\" ASC",
-                Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people ORDER BY \"ID\" ASC", connectionPool,
+                "ID"));
         if (AllTests.db == DB.ORACLE) {
             container.getItem(new RowId(new Object[] { new BigDecimal(
                     1337 + offset) }));
@@ -301,8 +296,8 @@ public class SQLContainerTest {
             throws SQLException {
         DataGenerator.addFiveThousandPeople(connectionPool);
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people ORDER BY \"ID\" ASC",
-                Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people ORDER BY \"ID\" ASC", connectionPool,
+                "ID"));
         Object itemId = container.getIdByIndex(1337);
         if (AllTests.db == DB.ORACLE) {
             Assert.assertEquals(new RowId(new Object[] { new BigDecimal(
@@ -319,7 +314,7 @@ public class SQLContainerTest {
             throws SQLException {
         DataGenerator.addFiveThousandPeople(connectionPool);
         FreeformQuery query = new FreeformQuery("SELECT * FROM people",
-                Arrays.asList("ID"), connectionPool);
+                connectionPool, "ID");
         FreeformQueryDelegate delegate = EasyMock
                 .createMock(FreeformQueryDelegate.class);
         EasyMock.expect(
@@ -383,8 +378,8 @@ public class SQLContainerTest {
             throws SQLException {
         DataGenerator.addFiveThousandPeople(connectionPool);
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people ORDER BY \"ID\" ASC",
-                Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people ORDER BY \"ID\" ASC", connectionPool,
+                "ID"));
         Object itemId = container.getIdByIndex(1337);
         if (AllTests.db == DB.ORACLE) {
             Assert.assertEquals(
@@ -401,8 +396,8 @@ public class SQLContainerTest {
             throws SQLException {
         DataGenerator.addFiveThousandPeople(connectionPool);
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people ORDER BY \"ID\" ASC",
-                Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people ORDER BY \"ID\" ASC", connectionPool,
+                "ID"));
         Object itemId = container.getIdByIndex(1337);
         if (AllTests.db == DB.ORACLE) {
             Assert.assertEquals(
@@ -417,7 +412,7 @@ public class SQLContainerTest {
     @Test
     public void firstItemId_freeform_returnsItemId0() throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         if (AllTests.db == DB.ORACLE) {
             Assert.assertEquals(
                     new RowId(new Object[] { 0 + offset }).toString(),
@@ -434,8 +429,8 @@ public class SQLContainerTest {
         DataGenerator.addFiveThousandPeople(connectionPool);
 
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people ORDER BY \"ID\" ASC",
-                Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people ORDER BY \"ID\" ASC", connectionPool,
+                "ID"));
         if (AllTests.db == DB.ORACLE) {
             Assert.assertEquals(
                     new RowId(new Object[] { 4999 + offset }).toString(),
@@ -450,7 +445,7 @@ public class SQLContainerTest {
     public void isFirstId_freeformActualFirstId_returnsTrue()
             throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         if (AllTests.db == DB.ORACLE) {
             Assert.assertTrue(container.isFirstId(new RowId(
                     new Object[] { new BigDecimal(0 + offset) })));
@@ -463,7 +458,7 @@ public class SQLContainerTest {
     @Test
     public void isFirstId_freeformSecondId_returnsFalse() throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         if (AllTests.db == DB.ORACLE) {
             Assert.assertFalse(container.isFirstId(new RowId(
                     new Object[] { new BigDecimal(1 + offset) })));
@@ -476,7 +471,7 @@ public class SQLContainerTest {
     @Test
     public void isLastId_freeformSecondId_returnsFalse() throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         if (AllTests.db == DB.ORACLE) {
             Assert.assertFalse(container.isLastId(new RowId(
                     new Object[] { new BigDecimal(1 + offset) })));
@@ -489,7 +484,7 @@ public class SQLContainerTest {
     @Test
     public void isLastId_freeformLastId_returnsTrue() throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         if (AllTests.db == DB.ORACLE) {
             Assert.assertTrue(container.isLastId(new RowId(
                     new Object[] { new BigDecimal(3 + offset) })));
@@ -504,8 +499,8 @@ public class SQLContainerTest {
             throws SQLException {
         DataGenerator.addFiveThousandPeople(connectionPool);
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people ORDER BY \"ID\" ASC",
-                Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people ORDER BY \"ID\" ASC", connectionPool,
+                "ID"));
         if (AllTests.db == DB.ORACLE) {
             Assert.assertTrue(container.isLastId(new RowId(
                     new Object[] { new BigDecimal(4999 + offset) })));
@@ -518,7 +513,7 @@ public class SQLContainerTest {
     @Test
     public void refresh_freeform_sizeShouldUpdate() throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         Assert.assertEquals(4, container.size());
         DataGenerator.addFiveThousandPeople(connectionPool);
         container.refresh();
@@ -533,7 +528,7 @@ public class SQLContainerTest {
         // make sure that the refresh method actually refreshes stuff and isn't
         // a NOP.
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         Assert.assertEquals(4, container.size());
         DataGenerator.addFiveThousandPeople(connectionPool);
         Assert.assertEquals(4, container.size());
@@ -542,7 +537,7 @@ public class SQLContainerTest {
     @Test
     public void setAutoCommit_freeform_shouldSucceed() throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         container.setAutoCommit(true);
         Assert.assertTrue(container.isAutoCommit());
         container.setAutoCommit(false);
@@ -552,14 +547,14 @@ public class SQLContainerTest {
     @Test
     public void getPageLength_freeform_returnsDefault100() throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         Assert.assertEquals(100, container.getPageLength());
     }
 
     @Test
     public void setPageLength_freeform_shouldSucceed() throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         container.setPageLength(20);
         Assert.assertEquals(20, container.getPageLength());
         container.setPageLength(200);
@@ -569,7 +564,7 @@ public class SQLContainerTest {
     @Test(expected = UnsupportedOperationException.class)
     public void addContainerProperty_normal_isUnsupported() throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         container.addContainerProperty("asdf", String.class, "");
     }
 
@@ -577,14 +572,14 @@ public class SQLContainerTest {
     public void removeContainerProperty_normal_isUnsupported()
             throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         container.removeContainerProperty("asdf");
     }
 
     @Test(expected = UnsupportedOperationException.class)
     public void addItemObject_normal_isUnsupported() throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         container.addItem("asdf");
     }
 
@@ -592,28 +587,28 @@ public class SQLContainerTest {
     public void addItemAfterObjectObject_normal_isUnsupported()
             throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         container.addItemAfter("asdf", "foo");
     }
 
     @Test(expected = UnsupportedOperationException.class)
     public void addItemAtIntObject_normal_isUnsupported() throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         container.addItemAt(2, "asdf");
     }
 
     @Test(expected = UnsupportedOperationException.class)
     public void addItemAtInt_normal_isUnsupported() throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         container.addItemAt(2);
     }
 
     @Test(expected = UnsupportedOperationException.class)
     public void addItemAfterObject_normal_isUnsupported() throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         container.addItemAfter("asdf");
     }
 
@@ -621,7 +616,7 @@ public class SQLContainerTest {
     public void addItem_freeformAddOneNewItem_returnsItemId()
             throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         Object itemId = container.addItem();
         Assert.assertNotNull(itemId);
     }
@@ -630,7 +625,7 @@ public class SQLContainerTest {
     public void addItem_freeformAddOneNewItem_shouldChangeSize()
             throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         int size = container.size();
         container.addItem();
         Assert.assertEquals(size + 1, container.size());
@@ -640,7 +635,7 @@ public class SQLContainerTest {
     public void addItem_freeformAddTwoNewItems_shouldChangeSize()
             throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         int size = container.size();
         Object id1 = container.addItem();
         Object id2 = container.addItem();
@@ -653,7 +648,7 @@ public class SQLContainerTest {
     public void nextItemId_freeformNewlyAddedItem_returnsNewlyAdded()
             throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         Object lastId = container.lastItemId();
         Object id = container.addItem();
         Assert.assertEquals(id, container.nextItemId(lastId));
@@ -663,7 +658,7 @@ public class SQLContainerTest {
     public void lastItemId_freeformNewlyAddedItem_returnsNewlyAdded()
             throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         Object lastId = container.lastItemId();
         Object id = container.addItem();
         Assert.assertEquals(id, container.lastItemId());
@@ -674,7 +669,7 @@ public class SQLContainerTest {
     public void indexOfId_freeformNewlyAddedItem_returnsFour()
             throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         Object id = container.addItem();
         Assert.assertEquals(4, container.indexOfId(id));
     }
@@ -683,7 +678,7 @@ public class SQLContainerTest {
     public void getItem_freeformNewlyAddedItem_returnsNewlyAdded()
             throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         Object id = container.addItem();
         Assert.assertNotNull(container.getItem(id));
     }
@@ -692,7 +687,7 @@ public class SQLContainerTest {
     public void getItem_freeformNewlyAddedItemAndFiltered_returnsNull()
             throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         container.addContainerFilter(new Equal("NAME", "asdf"));
         Object id = container.addItem();
         Assert.assertNull(container.getItem(id));
@@ -702,7 +697,7 @@ public class SQLContainerTest {
     public void getItemUnfiltered_freeformNewlyAddedItemAndFiltered_returnsNewlyAdded()
             throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         container.addContainerFilter(new Equal("NAME", "asdf"));
         Object id = container.addItem();
         Assert.assertNotNull(container.getItemUnfiltered(id));
@@ -712,7 +707,7 @@ public class SQLContainerTest {
     public void getItemIds_freeformNewlyAddedItem_containsNewlyAdded()
             throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         Object id = container.addItem();
         Assert.assertTrue(container.getItemIds().contains(id));
     }
@@ -721,7 +716,7 @@ public class SQLContainerTest {
     public void getContainerProperty_freeformNewlyAddedItem_returnsPropertyOfNewlyAddedItem()
             throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         Object id = container.addItem();
         Item item = container.getItem(id);
         item.getItemProperty("NAME").setValue("asdf");
@@ -733,7 +728,7 @@ public class SQLContainerTest {
     public void containsId_freeformNewlyAddedItem_returnsTrue()
             throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         Object id = container.addItem();
         Assert.assertTrue(container.containsId(id));
     }
@@ -742,7 +737,7 @@ public class SQLContainerTest {
     public void prevItemId_freeformTwoNewlyAddedItems_returnsFirstAddedItem()
             throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         Object id1 = container.addItem();
         Object id2 = container.addItem();
         Assert.assertEquals(id1, container.prevItemId(id2));
@@ -753,7 +748,7 @@ public class SQLContainerTest {
             throws SQLException {
         DataGenerator.createGarbage(connectionPool);
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM GARBAGE", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM GARBAGE", connectionPool, "ID"));
         Object id = container.addItem();
         Assert.assertSame(id, container.firstItemId());
     }
@@ -763,7 +758,7 @@ public class SQLContainerTest {
             throws SQLException {
         DataGenerator.createGarbage(connectionPool);
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM GARBAGE", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM GARBAGE", connectionPool, "ID"));
         Object id = container.addItem();
         Assert.assertTrue(container.isFirstId(id));
     }
@@ -772,7 +767,7 @@ public class SQLContainerTest {
     public void isLastId_freeformOneItemAdded_returnsTrueForAddedItem()
             throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         Object id = container.addItem();
         Assert.assertTrue(container.isLastId(id));
     }
@@ -781,7 +776,7 @@ public class SQLContainerTest {
     public void isLastId_freeformTwoItemsAdded_returnsTrueForLastAddedItem()
             throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         container.addItem();
         Object id2 = container.addItem();
         Assert.assertTrue(container.isLastId(id2));
@@ -791,7 +786,7 @@ public class SQLContainerTest {
     public void getIdByIndex_freeformOneItemAddedLastIndexInContainer_returnsAddedItem()
             throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         Object id = container.addItem();
         Assert.assertEquals(id, container.getIdByIndex(container.size() - 1));
     }
@@ -800,7 +795,7 @@ public class SQLContainerTest {
     public void removeItem_freeformNoAddedItems_removesItemFromContainer()
             throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         int size = container.size();
         Object id = container.firstItemId();
         Assert.assertTrue(container.removeItem(id));
@@ -812,7 +807,7 @@ public class SQLContainerTest {
     public void containsId_freeformRemovedItem_returnsFalse()
             throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         Object id = container.firstItemId();
         Assert.assertTrue(container.removeItem(id));
         Assert.assertFalse(container.containsId(id));
@@ -822,7 +817,7 @@ public class SQLContainerTest {
     public void removeItem_freeformOneAddedItem_removesTheAddedItem()
             throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         Object id = container.addItem();
         int size = container.size();
         Assert.assertTrue(container.removeItem(id));
@@ -833,7 +828,7 @@ public class SQLContainerTest {
     @Test
     public void getItem_freeformItemRemoved_returnsNull() throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         Object id = container.firstItemId();
         Assert.assertTrue(container.removeItem(id));
         Assert.assertNull(container.getItem(id));
@@ -843,7 +838,7 @@ public class SQLContainerTest {
     public void getItem_freeformAddedItemRemoved_returnsNull()
             throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         Object id = container.addItem();
         Assert.assertNotNull(container.getItem(id));
         Assert.assertTrue(container.removeItem(id));
@@ -854,7 +849,7 @@ public class SQLContainerTest {
     public void getItemIds_freeformItemRemoved_shouldNotContainRemovedItem()
             throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         Object id = container.firstItemId();
         Assert.assertTrue(container.getItemIds().contains(id));
         Assert.assertTrue(container.removeItem(id));
@@ -865,7 +860,7 @@ public class SQLContainerTest {
     public void getItemIds_freeformAddedItemRemoved_shouldNotContainRemovedItem()
             throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         Object id = container.addItem();
         Assert.assertTrue(container.getItemIds().contains(id));
         Assert.assertTrue(container.removeItem(id));
@@ -876,7 +871,7 @@ public class SQLContainerTest {
     public void containsId_freeformItemRemoved_returnsFalse()
             throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         Object id = container.firstItemId();
         Assert.assertTrue(container.containsId(id));
         Assert.assertTrue(container.removeItem(id));
@@ -887,7 +882,7 @@ public class SQLContainerTest {
     public void containsId_freeformAddedItemRemoved_returnsFalse()
             throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         Object id = container.addItem();
         Assert.assertTrue(container.containsId(id));
         Assert.assertTrue(container.removeItem(id));
@@ -898,7 +893,7 @@ public class SQLContainerTest {
     public void nextItemId_freeformItemRemoved_skipsRemovedItem()
             throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         Object first = container.getIdByIndex(0);
         Object second = container.getIdByIndex(1);
         Object third = container.getIdByIndex(2);
@@ -910,7 +905,7 @@ public class SQLContainerTest {
     public void nextItemId_freeformAddedItemRemoved_skipsRemovedItem()
             throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         Object first = container.lastItemId();
         Object second = container.addItem();
         Object third = container.addItem();
@@ -922,7 +917,7 @@ public class SQLContainerTest {
     public void prevItemId_freeformItemRemoved_skipsRemovedItem()
             throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         Object first = container.getIdByIndex(0);
         Object second = container.getIdByIndex(1);
         Object third = container.getIdByIndex(2);
@@ -934,7 +929,7 @@ public class SQLContainerTest {
     public void prevItemId_freeformAddedItemRemoved_skipsRemovedItem()
             throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         Object first = container.lastItemId();
         Object second = container.addItem();
         Object third = container.addItem();
@@ -946,7 +941,7 @@ public class SQLContainerTest {
     public void firstItemId_freeformFirstItemRemoved_resultChanges()
             throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         Object first = container.firstItemId();
         Assert.assertTrue(container.removeItem(first));
         Assert.assertNotSame(first, container.firstItemId());
@@ -957,7 +952,7 @@ public class SQLContainerTest {
             throws SQLException {
         DataGenerator.createGarbage(connectionPool);
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM GARBAGE", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM GARBAGE", connectionPool, "ID"));
         Object first = container.addItem();
         Object second = container.addItem();
         Assert.assertSame(first, container.firstItemId());
@@ -969,7 +964,7 @@ public class SQLContainerTest {
     public void lastItemId_freeformLastItemRemoved_resultChanges()
             throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         Object last = container.lastItemId();
         Assert.assertTrue(container.removeItem(last));
         Assert.assertNotSame(last, container.lastItemId());
@@ -979,7 +974,7 @@ public class SQLContainerTest {
     public void lastItemId_freeformAddedLastItemRemoved_resultChanges()
             throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         Object last = container.addItem();
         Assert.assertSame(last, container.lastItemId());
         Assert.assertTrue(container.removeItem(last));
@@ -990,7 +985,7 @@ public class SQLContainerTest {
     public void isFirstId_freeformFirstItemRemoved_returnsFalse()
             throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         Object first = container.firstItemId();
         Assert.assertTrue(container.removeItem(first));
         Assert.assertFalse(container.isFirstId(first));
@@ -1001,7 +996,7 @@ public class SQLContainerTest {
             throws SQLException {
         DataGenerator.createGarbage(connectionPool);
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM GARBAGE", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM GARBAGE", connectionPool, "ID"));
         Object first = container.addItem();
         container.addItem();
         Assert.assertSame(first, container.firstItemId());
@@ -1013,7 +1008,7 @@ public class SQLContainerTest {
     public void isLastId_freeformLastItemRemoved_returnsFalse()
             throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         Object last = container.lastItemId();
         Assert.assertTrue(container.removeItem(last));
         Assert.assertFalse(container.isLastId(last));
@@ -1023,7 +1018,7 @@ public class SQLContainerTest {
     public void isLastId_freeformAddedLastItemRemoved_returnsFalse()
             throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         Object last = container.addItem();
         Assert.assertSame(last, container.lastItemId());
         Assert.assertTrue(container.removeItem(last));
@@ -1034,7 +1029,7 @@ public class SQLContainerTest {
     public void indexOfId_freeformItemRemoved_returnsNegOne()
             throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         Object id = container.getIdByIndex(2);
         Assert.assertTrue(container.removeItem(id));
         Assert.assertEquals(-1, container.indexOfId(id));
@@ -1044,7 +1039,7 @@ public class SQLContainerTest {
     public void indexOfId_freeformAddedItemRemoved_returnsNegOne()
             throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         Object id = container.addItem();
         Assert.assertTrue(container.indexOfId(id) != -1);
         Assert.assertTrue(container.removeItem(id));
@@ -1055,7 +1050,7 @@ public class SQLContainerTest {
     public void getIdByIndex_freeformItemRemoved_resultChanges()
             throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         Object id = container.getIdByIndex(2);
         Assert.assertTrue(container.removeItem(id));
         Assert.assertNotSame(id, container.getIdByIndex(2));
@@ -1065,7 +1060,7 @@ public class SQLContainerTest {
     public void getIdByIndex_freeformAddedItemRemoved_resultChanges()
             throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         Object id = container.addItem();
         container.addItem();
         int index = container.indexOfId(id);
@@ -1076,7 +1071,7 @@ public class SQLContainerTest {
     @Test
     public void removeAllItems_freeform_shouldSucceed() throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         Assert.assertTrue(container.removeAllItems());
         Assert.assertEquals(0, container.size());
     }
@@ -1085,7 +1080,7 @@ public class SQLContainerTest {
     public void removeAllItems_freeformAddedItems_shouldSucceed()
             throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         container.addItem();
         container.addItem();
         Assert.assertTrue(container.removeAllItems());
@@ -1174,7 +1169,7 @@ public class SQLContainerTest {
                 .andThrow(new UnsupportedOperationException()).anyTimes();
 
         FreeformQuery query = new FreeformQuery("SELECT * FROM people",
-                Arrays.asList("ID"), connectionPool);
+                connectionPool, "ID");
         query.setDelegate(delegate);
         EasyMock.replay(delegate);
         SQLContainer container = new SQLContainer(query);
@@ -1273,7 +1268,7 @@ public class SQLContainerTest {
                 .andThrow(new UnsupportedOperationException()).anyTimes();
 
         FreeformQuery query = new FreeformQuery("SELECT * FROM people",
-                Arrays.asList("ID"), connectionPool);
+                connectionPool, "ID");
         query.setDelegate(delegate);
         EasyMock.replay(delegate);
         SQLContainer container = new SQLContainer(query);
@@ -1363,7 +1358,7 @@ public class SQLContainerTest {
                 .andThrow(new UnsupportedOperationException()).anyTimes();
 
         FreeformQuery query = new FreeformQuery("SELECT * FROM people",
-                Arrays.asList("ID"), connectionPool);
+                connectionPool, "ID");
         query.setDelegate(delegate);
         EasyMock.replay(delegate);
         SQLContainer container = new SQLContainer(query);
@@ -1443,7 +1438,7 @@ public class SQLContainerTest {
                 .andThrow(new UnsupportedOperationException()).anyTimes();
 
         FreeformQuery query = new FreeformQuery("SELECT * FROM people",
-                Arrays.asList("ID"), connectionPool);
+                connectionPool, "ID");
         query.setDelegate(delegate);
         EasyMock.replay(delegate);
         SQLContainer container = new SQLContainer(query);
@@ -1460,7 +1455,7 @@ public class SQLContainerTest {
     public void rollback_freeformItemAdded_discardsAddedItem()
             throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         int size = container.size();
         Object id = container.addItem();
         container.getContainerProperty(id, "NAME").setValue("foo");
@@ -1475,7 +1470,7 @@ public class SQLContainerTest {
     public void rollback_freeformItemRemoved_restoresRemovedItem()
             throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         int size = container.size();
         Object last = container.lastItemId();
         container.removeItem(last);
@@ -1489,7 +1484,7 @@ public class SQLContainerTest {
     public void rollback_freeformItemChanged_discardsChanges()
             throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         Object last = container.lastItemId();
         container.getContainerProperty(last, "NAME").setValue("foo");
         container.rollback();
@@ -1497,27 +1492,22 @@ public class SQLContainerTest {
                 container.lastItemId(), "NAME").getValue()));
     }
 
-    /*-
-     * TODO Removed test since currently the Vaadin test package structure
-     * does not allow testing protected methods. When it has been fixed
-     * then re-enable test.
     @Test
     public void itemChangeNotification_freeform_isModifiedReturnsTrue()
             throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         Assert.assertFalse(container.isModified());
         RowItem last = (RowItem) container.getItem(container.lastItemId());
         container.itemChangeNotification(last);
         Assert.assertTrue(container.isModified());
     }
-    */
 
     @Test
     public void itemSetChangeListeners_freeform_shouldFire()
             throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         ItemSetChangeListener listener = EasyMock
                 .createMock(ItemSetChangeListener.class);
         listener.containerItemSetChange(EasyMock.isA(ItemSetChangeEvent.class));
@@ -1533,7 +1523,7 @@ public class SQLContainerTest {
     public void itemSetChangeListeners_freeformItemRemoved_shouldFire()
             throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         ItemSetChangeListener listener = EasyMock
                 .createMock(ItemSetChangeListener.class);
         listener.containerItemSetChange(EasyMock.isA(ItemSetChangeEvent.class));
@@ -1549,7 +1539,7 @@ public class SQLContainerTest {
     @Test
     public void removeListener_freeform_shouldNotFire() throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         ItemSetChangeListener listener = EasyMock
                 .createMock(ItemSetChangeListener.class);
         EasyMock.replay(listener);
@@ -1565,7 +1555,7 @@ public class SQLContainerTest {
     public void isModified_freeformRemovedItem_returnsTrue()
             throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         Assert.assertFalse(container.isModified());
         container.removeItem(container.lastItemId());
         Assert.assertTrue(container.isModified());
@@ -1574,7 +1564,7 @@ public class SQLContainerTest {
     @Test
     public void isModified_freeformAddedItem_returnsTrue() throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         Assert.assertFalse(container.isModified());
         container.addItem();
         Assert.assertTrue(container.isModified());
@@ -1584,7 +1574,7 @@ public class SQLContainerTest {
     public void isModified_freeformChangedItem_returnsTrue()
             throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         Assert.assertFalse(container.isModified());
         container.getContainerProperty(container.lastItemId(), "NAME")
                 .setValue("foo");
@@ -1595,7 +1585,7 @@ public class SQLContainerTest {
     public void getSortableContainerPropertyIds_freeform_returnsAllPropertyIds()
             throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         Collection<?> sortableIds = container.getSortableContainerPropertyIds();
         Assert.assertTrue(sortableIds.contains("ID"));
         Assert.assertTrue(sortableIds.contains("NAME"));
@@ -1607,7 +1597,7 @@ public class SQLContainerTest {
     @Test
     public void addOrderBy_freeform_shouldReorderResults() throws SQLException {
         FreeformQuery query = new FreeformQuery("SELECT * FROM people",
-                Arrays.asList("ID"), connectionPool);
+                connectionPool, "ID");
         FreeformQueryDelegate delegate = EasyMock
                 .createMock(FreeformQueryDelegate.class);
         final ArrayList<OrderBy> orderBys = new ArrayList<OrderBy>();
@@ -1711,7 +1701,7 @@ public class SQLContainerTest {
     public void addOrderBy_freeformIllegalColumn_shouldFail()
             throws SQLException {
         SQLContainer container = new SQLContainer(new FreeformQuery(
-                "SELECT * FROM people", Arrays.asList("ID"), connectionPool));
+                "SELECT * FROM people", connectionPool, "ID"));
         container.addOrderBy(new OrderBy("asdf", true));
     }
 
@@ -1719,7 +1709,7 @@ public class SQLContainerTest {
     @Test
     public void sort_freeform_sortsByName() throws SQLException {
         FreeformQuery query = new FreeformQuery("SELECT * FROM people",
-                Arrays.asList("ID"), connectionPool);
+                connectionPool, "ID");
         FreeformQueryDelegate delegate = EasyMock
                 .createMock(FreeformQueryDelegate.class);
         final ArrayList<OrderBy> orderBys = new ArrayList<OrderBy>();
@@ -1824,7 +1814,7 @@ public class SQLContainerTest {
     @Test
     public void addFilter_freeform_filtersResults() throws SQLException {
         FreeformQuery query = new FreeformQuery("SELECT * FROM people",
-                Arrays.asList("ID"), connectionPool);
+                connectionPool, "ID");
         FreeformStatementDelegate delegate = EasyMock
                 .createMock(FreeformStatementDelegate.class);
         final ArrayList<Filter> filters = new ArrayList<Filter>();
@@ -1863,8 +1853,8 @@ public class SQLContainerTest {
                         StringBuffer query = new StringBuffer(
                                 "SELECT COUNT(*) FROM people");
                         if (!filters.isEmpty()) {
-                            query.append(QueryBuilder
-                                    .getWhereStringForFilters(filters, sh));
+                            query.append(QueryBuilder.getWhereStringForFilters(
+                                    filters, sh));
                         }
                         sh.setQueryString(query.toString());
                         return sh;
@@ -1894,7 +1884,7 @@ public class SQLContainerTest {
     @Test
     public void addContainerFilter_filtersResults() throws SQLException {
         FreeformQuery query = new FreeformQuery("SELECT * FROM people",
-                Arrays.asList("ID"), connectionPool);
+                connectionPool, "ID");
         FreeformStatementDelegate delegate = EasyMock
                 .createMock(FreeformStatementDelegate.class);
         final ArrayList<Filter> filters = new ArrayList<Filter>();
@@ -1933,8 +1923,8 @@ public class SQLContainerTest {
                         StringBuffer query = new StringBuffer(
                                 "SELECT COUNT(*) FROM people");
                         if (!filters.isEmpty()) {
-                            query.append(QueryBuilder
-                                    .getWhereStringForFilters(filters, sh));
+                            query.append(QueryBuilder.getWhereStringForFilters(
+                                    filters, sh));
                         }
                         sh.setQueryString(query.toString());
                         return sh;
@@ -1963,7 +1953,7 @@ public class SQLContainerTest {
     public void addContainerFilter_ignoreCase_filtersResults()
             throws SQLException {
         FreeformQuery query = new FreeformQuery("SELECT * FROM people",
-                Arrays.asList("ID"), connectionPool);
+                connectionPool, "ID");
         FreeformStatementDelegate delegate = EasyMock
                 .createMock(FreeformStatementDelegate.class);
         final ArrayList<Filter> filters = new ArrayList<Filter>();
@@ -2001,8 +1991,8 @@ public class SQLContainerTest {
                         StringBuffer query = new StringBuffer(
                                 "SELECT COUNT(*) FROM people");
                         if (!filters.isEmpty()) {
-                            query.append(QueryBuilder
-                                    .getWhereStringForFilters(filters, sh));
+                            query.append(QueryBuilder.getWhereStringForFilters(
+                                    filters, sh));
                         }
                         sh.setQueryString(query.toString());
                         return sh;
@@ -2032,7 +2022,7 @@ public class SQLContainerTest {
     public void removeAllContainerFilters_freeform_noFiltering()
             throws SQLException {
         FreeformQuery query = new FreeformQuery("SELECT * FROM people",
-                Arrays.asList("ID"), connectionPool);
+                connectionPool, "ID");
         FreeformStatementDelegate delegate = EasyMock
                 .createMock(FreeformStatementDelegate.class);
         final ArrayList<Filter> filters = new ArrayList<Filter>();
@@ -2071,8 +2061,8 @@ public class SQLContainerTest {
                         StringBuffer query = new StringBuffer(
                                 "SELECT COUNT(*) FROM people");
                         if (!filters.isEmpty()) {
-                            query.append(QueryBuilder
-                                    .getWhereStringForFilters(filters, sh));
+                            query.append(QueryBuilder.getWhereStringForFilters(
+                                    filters, sh));
                         }
                         sh.setQueryString(query.toString());
                         return sh;
@@ -2108,7 +2098,7 @@ public class SQLContainerTest {
     public void removeContainerFilters_freeform_noFiltering()
             throws SQLException {
         FreeformQuery query = new FreeformQuery("SELECT * FROM people",
-                Arrays.asList("ID"), connectionPool);
+                connectionPool, "ID");
         FreeformStatementDelegate delegate = EasyMock
                 .createMock(FreeformStatementDelegate.class);
         final ArrayList<Filter> filters = new ArrayList<Filter>();
@@ -2147,8 +2137,8 @@ public class SQLContainerTest {
                         StringBuffer query = new StringBuffer(
                                 "SELECT COUNT(*) FROM people");
                         if (!filters.isEmpty()) {
-                            query.append(QueryBuilder
-                                    .getWhereStringForFilters(filters, sh));
+                            query.append(QueryBuilder.getWhereStringForFilters(
+                                    filters, sh));
                         }
                         sh.setQueryString(query.toString());
                         return sh;
@@ -2184,7 +2174,7 @@ public class SQLContainerTest {
     public void addFilter_freeformBufferedItems_alsoFiltersBufferedItems()
             throws SQLException {
         FreeformQuery query = new FreeformQuery("SELECT * FROM people",
-                Arrays.asList("ID"), connectionPool);
+                connectionPool, "ID");
         FreeformStatementDelegate delegate = EasyMock
                 .createMock(FreeformStatementDelegate.class);
         final ArrayList<Filter> filters = new ArrayList<Filter>();
@@ -2223,8 +2213,8 @@ public class SQLContainerTest {
                         StringBuffer query = new StringBuffer(
                                 "SELECT COUNT(*) FROM people");
                         if (!filters.isEmpty()) {
-                            query.append(QueryBuilder
-                                    .getWhereStringForFilters(filters, sh));
+                            query.append(QueryBuilder.getWhereStringForFilters(
+                                    filters, sh));
                         }
                         sh.setQueryString(query.toString());
                         return sh;
@@ -2286,7 +2276,7 @@ public class SQLContainerTest {
     public void sort_freeformBufferedItems_sortsBufferedItemsLastInOrderAdded()
             throws SQLException {
         FreeformQuery query = new FreeformQuery("SELECT * FROM people",
-                Arrays.asList("ID"), connectionPool);
+                connectionPool, "ID");
         FreeformQueryDelegate delegate = EasyMock
                 .createMock(FreeformQueryDelegate.class);
         final ArrayList<OrderBy> orderBys = new ArrayList<OrderBy>();
diff --git a/tests/src/com/vaadin/tests/server/container/sqlcontainer/TicketTests.java b/tests/server-side/com/vaadin/data/util/sqlcontainer/TicketTests.java
index 8c86bc8df1..75ab455678 100644
--- a/tests/src/com/vaadin/tests/server/container/sqlcontainer/TicketTests.java
+++ b/tests/server-side/com/vaadin/data/util/sqlcontainer/TicketTests.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.server.container.sqlcontainer;
+package com.vaadin.data.util.sqlcontainer;
 
 import java.math.BigDecimal;
 import java.sql.SQLException;
@@ -16,13 +16,13 @@ import com.vaadin.data.Container.Filter;
 import com.vaadin.data.Item;
 import com.vaadin.data.util.filter.Compare.Equal;
 import com.vaadin.data.util.sqlcontainer.SQLContainer;
+import com.vaadin.data.util.sqlcontainer.AllTests.DB;
 import com.vaadin.data.util.sqlcontainer.connection.SimpleJDBCConnectionPool;
 import com.vaadin.data.util.sqlcontainer.query.FreeformQuery;
 import com.vaadin.data.util.sqlcontainer.query.FreeformStatementDelegate;
 import com.vaadin.data.util.sqlcontainer.query.TableQuery;
 import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper;
 import com.vaadin.data.util.sqlcontainer.query.generator.filter.QueryBuilder;
-import com.vaadin.tests.server.container.sqlcontainer.AllTests.DB;
 import com.vaadin.ui.Table;
 import com.vaadin.ui.Window;
 
diff --git a/tests/src/com/vaadin/tests/server/container/sqlcontainer/UtilTest.java b/tests/server-side/com/vaadin/data/util/sqlcontainer/UtilTest.java
index a8d4e48004..d6a6a72300 100644
--- a/tests/src/com/vaadin/tests/server/container/sqlcontainer/UtilTest.java
+++ b/tests/server-side/com/vaadin/data/util/sqlcontainer/UtilTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.server.container.sqlcontainer;
+package com.vaadin.data.util.sqlcontainer;
 
 import junit.framework.Assert;
 
diff --git a/tests/src/com/vaadin/tests/server/container/sqlcontainer/connection/J2EEConnectionPoolTest.java b/tests/server-side/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPoolTest.java
index fd0c5b9af7..7855d2a166 100644
--- a/tests/src/com/vaadin/tests/server/container/sqlcontainer/connection/J2EEConnectionPoolTest.java
+++ b/tests/server-side/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPoolTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.server.container.sqlcontainer.connection;
+package com.vaadin.data.util.sqlcontainer.connection;
 
 import java.sql.Connection;
 import java.sql.SQLException;
diff --git a/tests/src/com/vaadin/tests/server/container/sqlcontainer/connection/MockInitialContextFactory.java b/tests/server-side/com/vaadin/data/util/sqlcontainer/connection/MockInitialContextFactory.java
index c16cfb746b..19019eed0b 100644
--- a/tests/src/com/vaadin/tests/server/container/sqlcontainer/connection/MockInitialContextFactory.java
+++ b/tests/server-side/com/vaadin/data/util/sqlcontainer/connection/MockInitialContextFactory.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.server.container.sqlcontainer.connection;
+package com.vaadin.data.util.sqlcontainer.connection;
 
 import javax.naming.Context;
 import javax.naming.NamingException;
diff --git a/tests/src/com/vaadin/tests/server/container/sqlcontainer/connection/SimpleJDBCConnectionPoolTest.java b/tests/server-side/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPoolTest.java
index c05b3cbf1b..147319643d 100644
--- a/tests/src/com/vaadin/tests/server/container/sqlcontainer/connection/SimpleJDBCConnectionPoolTest.java
+++ b/tests/server-side/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPoolTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.server.container.sqlcontainer.connection;
+package com.vaadin.data.util.sqlcontainer.connection;
 
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -9,9 +9,9 @@ import org.easymock.EasyMock;
 import org.junit.Before;
 import org.junit.Test;
 
+import com.vaadin.data.util.sqlcontainer.AllTests;
 import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool;
 import com.vaadin.data.util.sqlcontainer.connection.SimpleJDBCConnectionPool;
-import com.vaadin.tests.server.container.sqlcontainer.AllTests;
 
 public class SimpleJDBCConnectionPoolTest {
     private JDBCConnectionPool connectionPool;
diff --git a/tests/src/com/vaadin/tests/server/container/sqlcontainer/filters/BetweenTest.java b/tests/server-side/com/vaadin/data/util/sqlcontainer/filters/BetweenTest.java
index f86ca6dd00..5faa859b67 100644
--- a/tests/src/com/vaadin/tests/server/container/sqlcontainer/filters/BetweenTest.java
+++ b/tests/server-side/com/vaadin/data/util/sqlcontainer/filters/BetweenTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.server.container.sqlcontainer.filters;
+package com.vaadin.data.util.sqlcontainer.filters;
 
 import junit.framework.Assert;
 
diff --git a/tests/src/com/vaadin/tests/server/container/sqlcontainer/filters/LikeTest.java b/tests/server-side/com/vaadin/data/util/sqlcontainer/filters/LikeTest.java
index 07dd499331..f1130aad80 100644
--- a/tests/src/com/vaadin/tests/server/container/sqlcontainer/filters/LikeTest.java
+++ b/tests/server-side/com/vaadin/data/util/sqlcontainer/filters/LikeTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.server.container.sqlcontainer.filters;
+package com.vaadin.data.util.sqlcontainer.filters;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/tests/src/com/vaadin/tests/server/container/sqlcontainer/generator/SQLGeneratorsTest.java b/tests/server-side/com/vaadin/data/util/sqlcontainer/generator/SQLGeneratorsTest.java
index 06873d4aff..58dcdb3227 100644
--- a/tests/src/com/vaadin/tests/server/container/sqlcontainer/generator/SQLGeneratorsTest.java
+++ b/tests/server-side/com/vaadin/data/util/sqlcontainer/generator/SQLGeneratorsTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.server.container.sqlcontainer.generator;

+package com.vaadin.data.util.sqlcontainer.generator;

 

 import java.sql.SQLException;

 import java.util.ArrayList;

@@ -13,6 +13,8 @@ import org.junit.Test;
 import com.vaadin.data.Container.Filter;

 import com.vaadin.data.util.filter.Like;

 import com.vaadin.data.util.filter.Or;

+import com.vaadin.data.util.sqlcontainer.AllTests;

+import com.vaadin.data.util.sqlcontainer.DataGenerator;

 import com.vaadin.data.util.sqlcontainer.RowItem;

 import com.vaadin.data.util.sqlcontainer.SQLContainer;

 import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool;

@@ -24,8 +26,6 @@ import com.vaadin.data.util.sqlcontainer.query.generator.MSSQLGenerator;
 import com.vaadin.data.util.sqlcontainer.query.generator.OracleGenerator;

 import com.vaadin.data.util.sqlcontainer.query.generator.SQLGenerator;

 import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper;

-import com.vaadin.tests.server.container.sqlcontainer.AllTests;

-import com.vaadin.tests.server.container.sqlcontainer.DataGenerator;

 

 public class SQLGeneratorsTest {

     private JDBCConnectionPool connectionPool;

diff --git a/tests/src/com/vaadin/tests/server/container/sqlcontainer/query/FreeformQueryTest.java b/tests/server-side/com/vaadin/data/util/sqlcontainer/query/FreeformQueryTest.java
index cc213f764f..9b38655186 100644
--- a/tests/src/com/vaadin/tests/server/container/sqlcontainer/query/FreeformQueryTest.java
+++ b/tests/server-side/com/vaadin/data/util/sqlcontainer/query/FreeformQueryTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.server.container.sqlcontainer.query;
+package com.vaadin.data.util.sqlcontainer.query;
 
 import java.sql.Connection;
 import java.sql.ResultSet;
@@ -16,17 +16,17 @@ import org.junit.Test;
 
 import com.vaadin.data.Container.Filter;
 import com.vaadin.data.util.filter.Like;
+import com.vaadin.data.util.sqlcontainer.AllTests;
+import com.vaadin.data.util.sqlcontainer.DataGenerator;
 import com.vaadin.data.util.sqlcontainer.RowId;
 import com.vaadin.data.util.sqlcontainer.RowItem;
 import com.vaadin.data.util.sqlcontainer.SQLContainer;
+import com.vaadin.data.util.sqlcontainer.AllTests.DB;
 import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool;
 import com.vaadin.data.util.sqlcontainer.connection.SimpleJDBCConnectionPool;
 import com.vaadin.data.util.sqlcontainer.query.FreeformQuery;
 import com.vaadin.data.util.sqlcontainer.query.FreeformQueryDelegate;
 import com.vaadin.data.util.sqlcontainer.query.OrderBy;
-import com.vaadin.tests.server.container.sqlcontainer.AllTests;
-import com.vaadin.tests.server.container.sqlcontainer.AllTests.DB;
-import com.vaadin.tests.server.container.sqlcontainer.DataGenerator;
 
 public class FreeformQueryTest {
 
diff --git a/tests/src/com/vaadin/tests/server/container/sqlcontainer/query/QueryBuilderTest.java b/tests/server-side/com/vaadin/data/util/sqlcontainer/query/QueryBuilderTest.java
index 02130fab83..f635b23ebd 100644
--- a/tests/src/com/vaadin/tests/server/container/sqlcontainer/query/QueryBuilderTest.java
+++ b/tests/server-side/com/vaadin/data/util/sqlcontainer/query/QueryBuilderTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.server.container.sqlcontainer.query;
+package com.vaadin.data.util.sqlcontainer.query;
 
 import java.util.ArrayList;
 
diff --git a/tests/src/com/vaadin/tests/server/container/sqlcontainer/query/TableQueryTest.java b/tests/server-side/com/vaadin/data/util/sqlcontainer/query/TableQueryTest.java
index d6f5ce1cbc..52f7e273c6 100644
--- a/tests/src/com/vaadin/tests/server/container/sqlcontainer/query/TableQueryTest.java
+++ b/tests/server-side/com/vaadin/data/util/sqlcontainer/query/TableQueryTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.server.container.sqlcontainer.query;

+package com.vaadin.data.util.sqlcontainer.query;

 

 import java.sql.Connection;

 import java.sql.PreparedStatement;

@@ -17,17 +17,17 @@ import org.junit.Test;
 import com.vaadin.data.Container.Filter;

 import com.vaadin.data.util.filter.Compare.Equal;

 import com.vaadin.data.util.filter.Like;

+import com.vaadin.data.util.sqlcontainer.AllTests;

+import com.vaadin.data.util.sqlcontainer.DataGenerator;

 import com.vaadin.data.util.sqlcontainer.OptimisticLockException;

 import com.vaadin.data.util.sqlcontainer.RowItem;

 import com.vaadin.data.util.sqlcontainer.SQLContainer;

+import com.vaadin.data.util.sqlcontainer.AllTests.DB;

 import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool;

 import com.vaadin.data.util.sqlcontainer.connection.SimpleJDBCConnectionPool;

 import com.vaadin.data.util.sqlcontainer.query.OrderBy;

 import com.vaadin.data.util.sqlcontainer.query.TableQuery;

 import com.vaadin.data.util.sqlcontainer.query.generator.DefaultSQLGenerator;

-import com.vaadin.tests.server.container.sqlcontainer.AllTests;

-import com.vaadin.tests.server.container.sqlcontainer.AllTests.DB;

-import com.vaadin.tests.server.container.sqlcontainer.DataGenerator;

 

 public class TableQueryTest {

     private static final int offset = AllTests.offset;

diff --git a/tests/src/com/vaadin/tests/server/applicationservlet/TestStaticFilesLocation.java b/tests/server-side/com/vaadin/terminal/gwt/server/TestAbstractApplicationServletStaticFilesLocation.java
index 29ef40e546..fcd9970717 100644
--- a/tests/src/com/vaadin/tests/server/applicationservlet/TestStaticFilesLocation.java
+++ b/tests/server-side/com/vaadin/terminal/gwt/server/TestAbstractApplicationServletStaticFilesLocation.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.server.applicationservlet;
+package com.vaadin.terminal.gwt.server;
 
 import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.expect;
@@ -20,7 +20,7 @@ import junit.framework.TestCase;
 import com.vaadin.terminal.gwt.server.AbstractApplicationServlet;
 import com.vaadin.terminal.gwt.server.ApplicationServlet;
 
-public class TestStaticFilesLocation extends TestCase {
+public class TestAbstractApplicationServletStaticFilesLocation extends TestCase {
 
     ApplicationServlet servlet;
 
diff --git a/tests/src/com/vaadin/tests/server/IndexedContainerListeners.java b/tests/server-side/com/vaadin/tests/server/IndexedContainerListeners.java
index 2dc0caade3..2dc0caade3 100644
--- a/tests/src/com/vaadin/tests/server/IndexedContainerListeners.java
+++ b/tests/server-side/com/vaadin/tests/server/IndexedContainerListeners.java
diff --git a/tests/src/com/vaadin/tests/server/LicenseInJavaFiles.java b/tests/server-side/com/vaadin/tests/server/LicenseInJavaFiles.java
index f6b53f682b..f6b53f682b 100644
--- a/tests/src/com/vaadin/tests/server/LicenseInJavaFiles.java
+++ b/tests/server-side/com/vaadin/tests/server/LicenseInJavaFiles.java
diff --git a/tests/src/com/vaadin/tests/server/PropertysetItemListeners.java b/tests/server-side/com/vaadin/tests/server/PropertysetItemListeners.java
index 69cbbbfb7c..69cbbbfb7c 100644
--- a/tests/src/com/vaadin/tests/server/PropertysetItemListeners.java
+++ b/tests/server-side/com/vaadin/tests/server/PropertysetItemListeners.java
diff --git a/tests/src/com/vaadin/tests/server/TestAbstractBeanContainerListeners.java b/tests/server-side/com/vaadin/tests/server/TestAbstractBeanContainerListeners.java
index ae70757b3e..ae70757b3e 100644
--- a/tests/src/com/vaadin/tests/server/TestAbstractBeanContainerListeners.java
+++ b/tests/server-side/com/vaadin/tests/server/TestAbstractBeanContainerListeners.java
diff --git a/tests/src/com/vaadin/tests/server/TestAbstractContainerListeners.java b/tests/server-side/com/vaadin/tests/server/TestAbstractContainerListeners.java
index d10c5d7791..d10c5d7791 100644
--- a/tests/src/com/vaadin/tests/server/TestAbstractContainerListeners.java
+++ b/tests/server-side/com/vaadin/tests/server/TestAbstractContainerListeners.java
diff --git a/tests/src/com/vaadin/tests/server/TestAbstractInMemoryContainerListeners.java b/tests/server-side/com/vaadin/tests/server/TestAbstractInMemoryContainerListeners.java
index 754f152936..754f152936 100644
--- a/tests/src/com/vaadin/tests/server/TestAbstractInMemoryContainerListeners.java
+++ b/tests/server-side/com/vaadin/tests/server/TestAbstractInMemoryContainerListeners.java
diff --git a/tests/src/com/vaadin/tests/server/TestAbstractPropertyListeners.java b/tests/server-side/com/vaadin/tests/server/TestAbstractPropertyListeners.java
index 58dee08643..58dee08643 100644
--- a/tests/src/com/vaadin/tests/server/TestAbstractPropertyListeners.java
+++ b/tests/server-side/com/vaadin/tests/server/TestAbstractPropertyListeners.java
diff --git a/tests/src/com/vaadin/tests/server/TestClassesSerializable.java b/tests/server-side/com/vaadin/tests/server/TestClassesSerializable.java
index f7beafb927..f7beafb927 100644
--- a/tests/src/com/vaadin/tests/server/TestClassesSerializable.java
+++ b/tests/server-side/com/vaadin/tests/server/TestClassesSerializable.java
diff --git a/tests/src/com/vaadin/tests/server/TestEventRouter.java b/tests/server-side/com/vaadin/tests/server/TestEventRouter.java
index dc388a66ac..dc388a66ac 100644
--- a/tests/src/com/vaadin/tests/server/TestEventRouter.java
+++ b/tests/server-side/com/vaadin/tests/server/TestEventRouter.java
diff --git a/tests/src/com/vaadin/tests/server/TestFileTypeResolver.java b/tests/server-side/com/vaadin/tests/server/TestFileTypeResolver.java
index 8a368ead53..8a368ead53 100644
--- a/tests/src/com/vaadin/tests/server/TestFileTypeResolver.java
+++ b/tests/server-side/com/vaadin/tests/server/TestFileTypeResolver.java
diff --git a/tests/src/com/vaadin/tests/server/TestKeyMapper.java b/tests/server-side/com/vaadin/tests/server/TestKeyMapper.java
index 02ea45ce7c..02ea45ce7c 100644
--- a/tests/src/com/vaadin/tests/server/TestKeyMapper.java
+++ b/tests/server-side/com/vaadin/tests/server/TestKeyMapper.java
diff --git a/tests/src/com/vaadin/tests/server/TestMimeTypes.java b/tests/server-side/com/vaadin/tests/server/TestMimeTypes.java
index 8231030666..8231030666 100644
--- a/tests/src/com/vaadin/tests/server/TestMimeTypes.java
+++ b/tests/server-side/com/vaadin/tests/server/TestMimeTypes.java
diff --git a/tests/src/com/vaadin/tests/server/TestSerialization.java b/tests/server-side/com/vaadin/tests/server/TestSerialization.java
index 03a9d3e262..03a9d3e262 100644
--- a/tests/src/com/vaadin/tests/server/TestSerialization.java
+++ b/tests/server-side/com/vaadin/tests/server/TestSerialization.java
diff --git a/tests/src/com/vaadin/tests/server/TestSimpleMultiPartInputStream.java b/tests/server-side/com/vaadin/tests/server/TestSimpleMultiPartInputStream.java
index 65455eba37..65455eba37 100644
--- a/tests/src/com/vaadin/tests/server/TestSimpleMultiPartInputStream.java
+++ b/tests/server-side/com/vaadin/tests/server/TestSimpleMultiPartInputStream.java
diff --git a/tests/src/com/vaadin/tests/server/TransactionListenersConcurrency.java b/tests/server-side/com/vaadin/tests/server/TransactionListenersConcurrency.java
index 3f16bb262b..3f16bb262b 100644
--- a/tests/src/com/vaadin/tests/server/TransactionListenersConcurrency.java
+++ b/tests/server-side/com/vaadin/tests/server/TransactionListenersConcurrency.java
diff --git a/tests/src/com/vaadin/tests/server/component/AbstractListenerMethodsTest.java b/tests/server-side/com/vaadin/tests/server/component/AbstractListenerMethodsTest.java
index 355f5167d7..355f5167d7 100644
--- a/tests/src/com/vaadin/tests/server/component/AbstractListenerMethodsTest.java
+++ b/tests/server-side/com/vaadin/tests/server/component/AbstractListenerMethodsTest.java
diff --git a/tests/src/com/vaadin/tests/server/component/FinalMethodTest.java b/tests/server-side/com/vaadin/tests/server/component/FinalMethodTest.java
index ad80007882..ad80007882 100644
--- a/tests/src/com/vaadin/tests/server/component/FinalMethodTest.java
+++ b/tests/server-side/com/vaadin/tests/server/component/FinalMethodTest.java
diff --git a/tests/src/com/vaadin/tests/server/component/absolutelayout/AbsoluteLayoutListeners.java b/tests/server-side/com/vaadin/tests/server/component/absolutelayout/AbsoluteLayoutListeners.java
index a569ea03e9..a569ea03e9 100644
--- a/tests/src/com/vaadin/tests/server/component/absolutelayout/AbsoluteLayoutListeners.java
+++ b/tests/server-side/com/vaadin/tests/server/component/absolutelayout/AbsoluteLayoutListeners.java
diff --git a/tests/src/com/vaadin/tests/server/component/absolutelayout/ComponentPosition.java b/tests/server-side/com/vaadin/tests/server/component/absolutelayout/ComponentPosition.java
index 6fc7fbba0d..6fc7fbba0d 100644
--- a/tests/src/com/vaadin/tests/server/component/absolutelayout/ComponentPosition.java
+++ b/tests/server-side/com/vaadin/tests/server/component/absolutelayout/ComponentPosition.java
diff --git a/tests/src/com/vaadin/tests/server/component/abstractcomponent/TestAbstractComponentStyleNames.java b/tests/server-side/com/vaadin/tests/server/component/abstractcomponent/TestAbstractComponentStyleNames.java
index b1c4a8f4be..b1c4a8f4be 100644
--- a/tests/src/com/vaadin/tests/server/component/abstractcomponent/TestAbstractComponentStyleNames.java
+++ b/tests/server-side/com/vaadin/tests/server/component/abstractcomponent/TestAbstractComponentStyleNames.java
diff --git a/tests/src/com/vaadin/tests/server/component/abstractcomponentcontainer/TestAbstractComponentContainerListeners.java b/tests/server-side/com/vaadin/tests/server/component/abstractcomponentcontainer/TestAbstractComponentContainerListeners.java
index adf9c8d72e..adf9c8d72e 100644
--- a/tests/src/com/vaadin/tests/server/component/abstractcomponentcontainer/TestAbstractComponentContainerListeners.java
+++ b/tests/server-side/com/vaadin/tests/server/component/abstractcomponentcontainer/TestAbstractComponentContainerListeners.java
diff --git a/tests/src/com/vaadin/tests/server/component/abstractfield/TestAbstractFieldListeners.java b/tests/server-side/com/vaadin/tests/server/component/abstractfield/TestAbstractFieldListeners.java
index 63536baf68..63536baf68 100644
--- a/tests/src/com/vaadin/tests/server/component/abstractfield/TestAbstractFieldListeners.java
+++ b/tests/server-side/com/vaadin/tests/server/component/abstractfield/TestAbstractFieldListeners.java
diff --git a/tests/src/com/vaadin/tests/server/component/abstractorderedlayout/TestAbstractOrderedLayoutListeners.java b/tests/server-side/com/vaadin/tests/server/component/abstractorderedlayout/TestAbstractOrderedLayoutListeners.java
index 05dfc47126..05dfc47126 100644
--- a/tests/src/com/vaadin/tests/server/component/abstractorderedlayout/TestAbstractOrderedLayoutListeners.java
+++ b/tests/server-side/com/vaadin/tests/server/component/abstractorderedlayout/TestAbstractOrderedLayoutListeners.java
diff --git a/tests/src/com/vaadin/tests/server/component/abstractselect/TestAbstractSelectListeners.java b/tests/server-side/com/vaadin/tests/server/component/abstractselect/TestAbstractSelectListeners.java
index c1886943fd..c1886943fd 100644
--- a/tests/src/com/vaadin/tests/server/component/abstractselect/TestAbstractSelectListeners.java
+++ b/tests/server-side/com/vaadin/tests/server/component/abstractselect/TestAbstractSelectListeners.java
diff --git a/tests/src/com/vaadin/tests/server/component/abstractsplitpanel/TestAbstractSplitPanelListeners.java b/tests/server-side/com/vaadin/tests/server/component/abstractsplitpanel/TestAbstractSplitPanelListeners.java
index 4f66d1446b..4f66d1446b 100644
--- a/tests/src/com/vaadin/tests/server/component/abstractsplitpanel/TestAbstractSplitPanelListeners.java
+++ b/tests/server-side/com/vaadin/tests/server/component/abstractsplitpanel/TestAbstractSplitPanelListeners.java
diff --git a/tests/src/com/vaadin/tests/server/component/abstracttextfield/TestAbstractTextFieldListeners.java b/tests/server-side/com/vaadin/tests/server/component/abstracttextfield/TestAbstractTextFieldListeners.java
index fb8eb65f55..fb8eb65f55 100644
--- a/tests/src/com/vaadin/tests/server/component/abstracttextfield/TestAbstractTextFieldListeners.java
+++ b/tests/server-side/com/vaadin/tests/server/component/abstracttextfield/TestAbstractTextFieldListeners.java
diff --git a/tests/src/com/vaadin/tests/server/component/button/ButtonListeners.java b/tests/server-side/com/vaadin/tests/server/component/button/ButtonListeners.java
index 59ddad4efe..59ddad4efe 100644
--- a/tests/src/com/vaadin/tests/server/component/button/ButtonListeners.java
+++ b/tests/server-side/com/vaadin/tests/server/component/button/ButtonListeners.java
diff --git a/tests/src/com/vaadin/tests/server/component/csslayout/CssLayoutListeners.java b/tests/server-side/com/vaadin/tests/server/component/csslayout/CssLayoutListeners.java
index e646467cb2..e646467cb2 100644
--- a/tests/src/com/vaadin/tests/server/component/csslayout/CssLayoutListeners.java
+++ b/tests/server-side/com/vaadin/tests/server/component/csslayout/CssLayoutListeners.java
diff --git a/tests/src/com/vaadin/tests/server/component/datefield/DateFieldListeners.java b/tests/server-side/com/vaadin/tests/server/component/datefield/DateFieldListeners.java
index 1d7f729868..1d7f729868 100644
--- a/tests/src/com/vaadin/tests/server/component/datefield/DateFieldListeners.java
+++ b/tests/server-side/com/vaadin/tests/server/component/datefield/DateFieldListeners.java
diff --git a/tests/src/com/vaadin/tests/server/component/datefield/WeekNumberCalculation.java b/tests/server-side/com/vaadin/tests/server/component/datefield/WeekNumberCalculation.java
index 428a8634b3..428a8634b3 100644
--- a/tests/src/com/vaadin/tests/server/component/datefield/WeekNumberCalculation.java
+++ b/tests/server-side/com/vaadin/tests/server/component/datefield/WeekNumberCalculation.java
diff --git a/tests/src/com/vaadin/tests/server/component/embedded/EmbeddedListeners.java b/tests/server-side/com/vaadin/tests/server/component/embedded/EmbeddedListeners.java
index 66a9a2b5d5..66a9a2b5d5 100644
--- a/tests/src/com/vaadin/tests/server/component/embedded/EmbeddedListeners.java
+++ b/tests/server-side/com/vaadin/tests/server/component/embedded/EmbeddedListeners.java
diff --git a/tests/src/com/vaadin/tests/server/component/gridlayout/GridLayoutListeners.java b/tests/server-side/com/vaadin/tests/server/component/gridlayout/GridLayoutListeners.java
index 24db0856da..24db0856da 100644
--- a/tests/src/com/vaadin/tests/server/component/gridlayout/GridLayoutListeners.java
+++ b/tests/server-side/com/vaadin/tests/server/component/gridlayout/GridLayoutListeners.java
diff --git a/tests/src/com/vaadin/tests/server/component/label/LabelListeners.java b/tests/server-side/com/vaadin/tests/server/component/label/LabelListeners.java
index a25309b32f..a25309b32f 100644
--- a/tests/src/com/vaadin/tests/server/component/label/LabelListeners.java
+++ b/tests/server-side/com/vaadin/tests/server/component/label/LabelListeners.java
diff --git a/tests/src/com/vaadin/tests/server/component/loginform/LoginFormListeners.java b/tests/server-side/com/vaadin/tests/server/component/loginform/LoginFormListeners.java
index a8e7d76710..a8e7d76710 100644
--- a/tests/src/com/vaadin/tests/server/component/loginform/LoginFormListeners.java
+++ b/tests/server-side/com/vaadin/tests/server/component/loginform/LoginFormListeners.java
diff --git a/tests/src/com/vaadin/tests/server/component/menubar/MenuBarIds.java b/tests/server-side/com/vaadin/tests/server/component/menubar/MenuBarIds.java
index 9ce55361bd..9ce55361bd 100644
--- a/tests/src/com/vaadin/tests/server/component/menubar/MenuBarIds.java
+++ b/tests/server-side/com/vaadin/tests/server/component/menubar/MenuBarIds.java
diff --git a/tests/src/com/vaadin/tests/server/component/optiongroup/OptionGroupListeners.java b/tests/server-side/com/vaadin/tests/server/component/optiongroup/OptionGroupListeners.java
index a4c2289da4..a4c2289da4 100644
--- a/tests/src/com/vaadin/tests/server/component/optiongroup/OptionGroupListeners.java
+++ b/tests/server-side/com/vaadin/tests/server/component/optiongroup/OptionGroupListeners.java
diff --git a/tests/src/com/vaadin/tests/server/component/orderedlayout/TestOrderedLayout.java b/tests/server-side/com/vaadin/tests/server/component/orderedlayout/TestOrderedLayout.java
index e17fb284dc..e17fb284dc 100644
--- a/tests/src/com/vaadin/tests/server/component/orderedlayout/TestOrderedLayout.java
+++ b/tests/server-side/com/vaadin/tests/server/component/orderedlayout/TestOrderedLayout.java
diff --git a/tests/src/com/vaadin/tests/server/component/panel/PanelListeners.java b/tests/server-side/com/vaadin/tests/server/component/panel/PanelListeners.java
index e6094225e2..e6094225e2 100644
--- a/tests/src/com/vaadin/tests/server/component/panel/PanelListeners.java
+++ b/tests/server-side/com/vaadin/tests/server/component/panel/PanelListeners.java
diff --git a/tests/src/com/vaadin/tests/server/component/popupview/PopupViewListeners.java b/tests/server-side/com/vaadin/tests/server/component/popupview/PopupViewListeners.java
index 5b5fc2eb31..5b5fc2eb31 100644
--- a/tests/src/com/vaadin/tests/server/component/popupview/PopupViewListeners.java
+++ b/tests/server-side/com/vaadin/tests/server/component/popupview/PopupViewListeners.java
diff --git a/tests/src/com/vaadin/tests/server/component/select/SelectListeners.java b/tests/server-side/com/vaadin/tests/server/component/select/SelectListeners.java
index 8f90f2021e..8f90f2021e 100644
--- a/tests/src/com/vaadin/tests/server/component/select/SelectListeners.java
+++ b/tests/server-side/com/vaadin/tests/server/component/select/SelectListeners.java
diff --git a/tests/src/com/vaadin/tests/server/component/table/TableColumnAlignments.java b/tests/server-side/com/vaadin/tests/server/component/table/TableColumnAlignments.java
index 04f436f5c4..04f436f5c4 100644
--- a/tests/src/com/vaadin/tests/server/component/table/TableColumnAlignments.java
+++ b/tests/server-side/com/vaadin/tests/server/component/table/TableColumnAlignments.java
diff --git a/tests/src/com/vaadin/tests/server/component/table/TableGenerator.java b/tests/server-side/com/vaadin/tests/server/component/table/TableGenerator.java
index 0e63049944..0e63049944 100644
--- a/tests/src/com/vaadin/tests/server/component/table/TableGenerator.java
+++ b/tests/server-side/com/vaadin/tests/server/component/table/TableGenerator.java
diff --git a/tests/src/com/vaadin/tests/server/component/table/TableListeners.java b/tests/server-side/com/vaadin/tests/server/component/table/TableListeners.java
index 75ec839823..75ec839823 100644
--- a/tests/src/com/vaadin/tests/server/component/table/TableListeners.java
+++ b/tests/server-side/com/vaadin/tests/server/component/table/TableListeners.java
diff --git a/tests/src/com/vaadin/tests/server/component/table/TableVisibleColumns.java b/tests/server-side/com/vaadin/tests/server/component/table/TableVisibleColumns.java
index be312044db..be312044db 100644
--- a/tests/src/com/vaadin/tests/server/component/table/TableVisibleColumns.java
+++ b/tests/server-side/com/vaadin/tests/server/component/table/TableVisibleColumns.java
diff --git a/tests/src/com/vaadin/tests/server/component/table/TestFooter.java b/tests/server-side/com/vaadin/tests/server/component/table/TestFooter.java
index 647d13855b..647d13855b 100644
--- a/tests/src/com/vaadin/tests/server/component/table/TestFooter.java
+++ b/tests/server-side/com/vaadin/tests/server/component/table/TestFooter.java
diff --git a/tests/src/com/vaadin/tests/server/component/table/TestMultipleSelection.java b/tests/server-side/com/vaadin/tests/server/component/table/TestMultipleSelection.java
index 767b651b68..767b651b68 100644
--- a/tests/src/com/vaadin/tests/server/component/table/TestMultipleSelection.java
+++ b/tests/server-side/com/vaadin/tests/server/component/table/TestMultipleSelection.java
diff --git a/tests/src/com/vaadin/tests/server/component/tabsheet/TabSheetListeners.java b/tests/server-side/com/vaadin/tests/server/component/tabsheet/TabSheetListeners.java
index 30dcbca155..30dcbca155 100644
--- a/tests/src/com/vaadin/tests/server/component/tabsheet/TabSheetListeners.java
+++ b/tests/server-side/com/vaadin/tests/server/component/tabsheet/TabSheetListeners.java
diff --git a/tests/src/com/vaadin/tests/server/component/tabsheet/TestTabSheet.java b/tests/server-side/com/vaadin/tests/server/component/tabsheet/TestTabSheet.java
index 873bb1c030..873bb1c030 100644
--- a/tests/src/com/vaadin/tests/server/component/tabsheet/TestTabSheet.java
+++ b/tests/server-side/com/vaadin/tests/server/component/tabsheet/TestTabSheet.java
diff --git a/tests/src/com/vaadin/tests/server/component/tree/TestListeners.java b/tests/server-side/com/vaadin/tests/server/component/tree/TestListeners.java
index 391ef02e3c..391ef02e3c 100644
--- a/tests/src/com/vaadin/tests/server/component/tree/TestListeners.java
+++ b/tests/server-side/com/vaadin/tests/server/component/tree/TestListeners.java
diff --git a/tests/src/com/vaadin/tests/server/component/tree/TreeListeners.java b/tests/server-side/com/vaadin/tests/server/component/tree/TreeListeners.java
index 8ba2e1de4d..8ba2e1de4d 100644
--- a/tests/src/com/vaadin/tests/server/component/tree/TreeListeners.java
+++ b/tests/server-side/com/vaadin/tests/server/component/tree/TreeListeners.java
diff --git a/tests/src/com/vaadin/tests/server/component/treetable/EmptyTreeTable.java b/tests/server-side/com/vaadin/tests/server/component/treetable/EmptyTreeTable.java
index 535ed8e860..535ed8e860 100644
--- a/tests/src/com/vaadin/tests/server/component/treetable/EmptyTreeTable.java
+++ b/tests/server-side/com/vaadin/tests/server/component/treetable/EmptyTreeTable.java
diff --git a/tests/src/com/vaadin/tests/server/component/upload/UploadListeners.java b/tests/server-side/com/vaadin/tests/server/component/upload/UploadListeners.java
index ea5fa94326..ea5fa94326 100644
--- a/tests/src/com/vaadin/tests/server/component/upload/UploadListeners.java
+++ b/tests/server-side/com/vaadin/tests/server/component/upload/UploadListeners.java
diff --git a/tests/src/com/vaadin/tests/server/component/urifragmentutility/UriFragmentUtilityListeners.java b/tests/server-side/com/vaadin/tests/server/component/urifragmentutility/UriFragmentUtilityListeners.java
index fe400e55b9..fe400e55b9 100644
--- a/tests/src/com/vaadin/tests/server/component/urifragmentutility/UriFragmentUtilityListeners.java
+++ b/tests/server-side/com/vaadin/tests/server/component/urifragmentutility/UriFragmentUtilityListeners.java
diff --git a/tests/src/com/vaadin/tests/server/component/window/AddRemoveSubWindow.java b/tests/server-side/com/vaadin/tests/server/component/window/AddRemoveSubWindow.java
index afc050b981..afc050b981 100644
--- a/tests/src/com/vaadin/tests/server/component/window/AddRemoveSubWindow.java
+++ b/tests/server-side/com/vaadin/tests/server/component/window/AddRemoveSubWindow.java
diff --git a/tests/src/com/vaadin/tests/server/component/window/WindowListeners.java b/tests/server-side/com/vaadin/tests/server/component/window/WindowListeners.java
index b8d9579dae..b8d9579dae 100644
--- a/tests/src/com/vaadin/tests/server/component/window/WindowListeners.java
+++ b/tests/server-side/com/vaadin/tests/server/component/window/WindowListeners.java
diff --git a/tests/src/com/vaadin/tests/server/componentcontainer/AddRemoveComponentTest.java b/tests/server-side/com/vaadin/tests/server/componentcontainer/AddRemoveComponentTest.java
index 828404bd5a..828404bd5a 100644
--- a/tests/src/com/vaadin/tests/server/componentcontainer/AddRemoveComponentTest.java
+++ b/tests/server-side/com/vaadin/tests/server/componentcontainer/AddRemoveComponentTest.java
diff --git a/tests/src/com/vaadin/tests/server/components/AbstractTestFieldValueChange.java b/tests/server-side/com/vaadin/tests/server/components/AbstractTestFieldValueChange.java
index 3aebd5bf9d..3aebd5bf9d 100644
--- a/tests/src/com/vaadin/tests/server/components/AbstractTestFieldValueChange.java
+++ b/tests/server-side/com/vaadin/tests/server/components/AbstractTestFieldValueChange.java
diff --git a/tests/src/com/vaadin/tests/server/components/ComponentAttachDetachListenerTest.java b/tests/server-side/com/vaadin/tests/server/components/ComponentAttachDetachListenerTest.java
index 1e01d9a55f..1e01d9a55f 100644
--- a/tests/src/com/vaadin/tests/server/components/ComponentAttachDetachListenerTest.java
+++ b/tests/server-side/com/vaadin/tests/server/components/ComponentAttachDetachListenerTest.java
diff --git a/tests/src/com/vaadin/tests/server/components/TestComboBoxValueChange.java b/tests/server-side/com/vaadin/tests/server/components/TestComboBoxValueChange.java
index cb73199fb8..cb73199fb8 100644
--- a/tests/src/com/vaadin/tests/server/components/TestComboBoxValueChange.java
+++ b/tests/server-side/com/vaadin/tests/server/components/TestComboBoxValueChange.java
diff --git a/tests/src/com/vaadin/tests/server/components/TestGridLayoutLastRowRemoval.java b/tests/server-side/com/vaadin/tests/server/components/TestGridLayoutLastRowRemoval.java
index 92664917fd..92664917fd 100644
--- a/tests/src/com/vaadin/tests/server/components/TestGridLayoutLastRowRemoval.java
+++ b/tests/server-side/com/vaadin/tests/server/components/TestGridLayoutLastRowRemoval.java
diff --git a/tests/src/com/vaadin/tests/server/components/TestTextFieldValueChange.java b/tests/server-side/com/vaadin/tests/server/components/TestTextFieldValueChange.java
index 1144caf805..1144caf805 100644
--- a/tests/src/com/vaadin/tests/server/components/TestTextFieldValueChange.java
+++ b/tests/server-side/com/vaadin/tests/server/components/TestTextFieldValueChange.java
diff --git a/tests/src/com/vaadin/tests/server/components/TestWindow.java b/tests/server-side/com/vaadin/tests/server/components/TestWindow.java
index 05604aba61..05604aba61 100644
--- a/tests/src/com/vaadin/tests/server/components/TestWindow.java
+++ b/tests/server-side/com/vaadin/tests/server/components/TestWindow.java
diff --git a/tests/src/com/vaadin/tests/validation/TestReadOnlyValidation.java b/tests/server-side/com/vaadin/tests/server/validation/TestReadOnlyValidation.java
index 2765bf6b13..6939ce27d2 100644
--- a/tests/src/com/vaadin/tests/validation/TestReadOnlyValidation.java
+++ b/tests/server-side/com/vaadin/tests/server/validation/TestReadOnlyValidation.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.validation;

+package com.vaadin.tests.server.validation;

 

 import org.junit.Test;

 

diff --git a/tests/test.xml b/tests/test.xml
index 2b52c74af3..4addbf3b4a 100644
--- a/tests/test.xml
+++ b/tests/test.xml
@@ -42,10 +42,10 @@
 		<fileset dir="${com.vaadin.testbench.lib.dir}" includes="**/*.jar" />
 	</path>
 
-	<!-- fileset containing all tests to run -->
+	<!-- fileset containing all TestBench tests to run -->
 	<fileset dir=".." id="html-test-files">
 		<include name="tests/**/**.html" />
-		<include name="src/com/vaadin/tests/**/**.html" />
+		<include name="testbench/com/vaadin/tests/**/**.html" />
 		<exclude name="tests/integration-testscripts/**" />
 	</fileset>
 
@@ -76,7 +76,7 @@
 
 
 	<!-- ================================================================== -->
-	<!-- Toolkit Server Management                                          -->
+	<!-- Vaadin Server Management                                           -->
 	<!-- ================================================================== -->
 
 	<target name="server-start">
@@ -90,7 +90,7 @@
 		<echo>Testing area: ${testing.testarea}</echo>
 
 		<exec executable="python" searchpath="true" dir=".." resultproperty="server.start.result">
-			<arg value="build/testing/toolkit-server.py" />
+			<arg value="build/testing/vaadin-server.py" />
 			<arg value="start" />
 			<arg value="${package.name}" />
 			<arg value="${package.filename}" />
@@ -105,7 +105,7 @@
 
 	<target name="server-stop">
 		<exec executable="python" dir=".." searchpath="true" resultproperty="server.stop.result">
-			<arg value="build/testing/toolkit-server.py" />
+			<arg value="build/testing/vaadin-server.py" />
 			<arg value="stop" />
 		</exec>
 	</target>
diff --git a/tests/src/com/vaadin/tests/Components.java b/tests/testbench/com/vaadin/tests/Components.java
index 6987c04a54..6987c04a54 100644
--- a/tests/src/com/vaadin/tests/Components.java
+++ b/tests/testbench/com/vaadin/tests/Components.java
diff --git a/tests/src/com/vaadin/tests/CustomLayoutDemo.java b/tests/testbench/com/vaadin/tests/CustomLayoutDemo.java
index c81491a8be..c81491a8be 100644
--- a/tests/src/com/vaadin/tests/CustomLayoutDemo.java
+++ b/tests/testbench/com/vaadin/tests/CustomLayoutDemo.java
diff --git a/tests/src/com/vaadin/tests/FocusingComponents.java b/tests/testbench/com/vaadin/tests/FocusingComponents.java
index e74a935830..e74a935830 100644
--- a/tests/src/com/vaadin/tests/FocusingComponents.java
+++ b/tests/testbench/com/vaadin/tests/FocusingComponents.java
diff --git a/tests/src/com/vaadin/tests/LayoutDemo.java b/tests/testbench/com/vaadin/tests/LayoutDemo.java
index a06e7e4da2..a06e7e4da2 100644
--- a/tests/src/com/vaadin/tests/LayoutDemo.java
+++ b/tests/testbench/com/vaadin/tests/LayoutDemo.java
diff --git a/tests/src/com/vaadin/tests/ListenerOrder.java b/tests/testbench/com/vaadin/tests/ListenerOrder.java
index c1d6245222..c1d6245222 100644
--- a/tests/src/com/vaadin/tests/ListenerOrder.java
+++ b/tests/testbench/com/vaadin/tests/ListenerOrder.java
diff --git a/tests/src/com/vaadin/tests/ModalWindow.java b/tests/testbench/com/vaadin/tests/ModalWindow.java
index 4ace9f889e..4ace9f889e 100644
--- a/tests/src/com/vaadin/tests/ModalWindow.java
+++ b/tests/testbench/com/vaadin/tests/ModalWindow.java
diff --git a/tests/src/com/vaadin/tests/NativeWindowing.java b/tests/testbench/com/vaadin/tests/NativeWindowing.java
index 877aeceae1..877aeceae1 100644
--- a/tests/src/com/vaadin/tests/NativeWindowing.java
+++ b/tests/testbench/com/vaadin/tests/NativeWindowing.java
diff --git a/tests/src/com/vaadin/tests/OrderedLayoutSwapComponents.java b/tests/testbench/com/vaadin/tests/OrderedLayoutSwapComponents.java
index 34ec439010..34ec439010 100644
--- a/tests/src/com/vaadin/tests/OrderedLayoutSwapComponents.java
+++ b/tests/testbench/com/vaadin/tests/OrderedLayoutSwapComponents.java
diff --git a/tests/src/com/vaadin/tests/Parameters.java b/tests/testbench/com/vaadin/tests/Parameters.java
index 34b32a8808..34b32a8808 100644
--- a/tests/src/com/vaadin/tests/Parameters.java
+++ b/tests/testbench/com/vaadin/tests/Parameters.java
diff --git a/tests/src/com/vaadin/tests/PerformanceTestBasicComponentRendering.java b/tests/testbench/com/vaadin/tests/PerformanceTestBasicComponentRendering.java
index 7258df1879..7258df1879 100644
--- a/tests/src/com/vaadin/tests/PerformanceTestBasicComponentRendering.java
+++ b/tests/testbench/com/vaadin/tests/PerformanceTestBasicComponentRendering.java
diff --git a/tests/src/com/vaadin/tests/PerformanceTestLabelsAndOrderedLayouts.java b/tests/testbench/com/vaadin/tests/PerformanceTestLabelsAndOrderedLayouts.java
index ff2ed51c57..ff2ed51c57 100644
--- a/tests/src/com/vaadin/tests/PerformanceTestLabelsAndOrderedLayouts.java
+++ b/tests/testbench/com/vaadin/tests/PerformanceTestLabelsAndOrderedLayouts.java
diff --git a/tests/src/com/vaadin/tests/PerformanceTestSubTreeCaching.java b/tests/testbench/com/vaadin/tests/PerformanceTestSubTreeCaching.java
index a746ed45bf..a746ed45bf 100644
--- a/tests/src/com/vaadin/tests/PerformanceTestSubTreeCaching.java
+++ b/tests/testbench/com/vaadin/tests/PerformanceTestSubTreeCaching.java
diff --git a/tests/src/com/vaadin/tests/RandomLayoutStress.java b/tests/testbench/com/vaadin/tests/RandomLayoutStress.java
index 7e4daa47dc..7e4daa47dc 100644
--- a/tests/src/com/vaadin/tests/RandomLayoutStress.java
+++ b/tests/testbench/com/vaadin/tests/RandomLayoutStress.java
diff --git a/tests/src/com/vaadin/tests/ScrollbarStressTest.java b/tests/testbench/com/vaadin/tests/ScrollbarStressTest.java
index a66274a635..a66274a635 100644
--- a/tests/src/com/vaadin/tests/ScrollbarStressTest.java
+++ b/tests/testbench/com/vaadin/tests/ScrollbarStressTest.java
diff --git a/tests/src/com/vaadin/tests/StressComponentsInTable.java b/tests/testbench/com/vaadin/tests/StressComponentsInTable.java
index 75b4916b37..75b4916b37 100644
--- a/tests/src/com/vaadin/tests/StressComponentsInTable.java
+++ b/tests/testbench/com/vaadin/tests/StressComponentsInTable.java
diff --git a/tests/src/com/vaadin/tests/TableChangingDatasource.java b/tests/testbench/com/vaadin/tests/TableChangingDatasource.java
index 2b9639b32d..2b9639b32d 100644
--- a/tests/src/com/vaadin/tests/TableChangingDatasource.java
+++ b/tests/testbench/com/vaadin/tests/TableChangingDatasource.java
diff --git a/tests/src/com/vaadin/tests/TableSelectTest.java b/tests/testbench/com/vaadin/tests/TableSelectTest.java
index d5196d2a2a..d5196d2a2a 100644
--- a/tests/src/com/vaadin/tests/TableSelectTest.java
+++ b/tests/testbench/com/vaadin/tests/TableSelectTest.java
diff --git a/tests/src/com/vaadin/tests/TestBench.java b/tests/testbench/com/vaadin/tests/TestBench.java
index 98c6cd41f8..98c6cd41f8 100644
--- a/tests/src/com/vaadin/tests/TestBench.java
+++ b/tests/testbench/com/vaadin/tests/TestBench.java
diff --git a/tests/src/com/vaadin/tests/TestCaptionWrapper.java b/tests/testbench/com/vaadin/tests/TestCaptionWrapper.java
index f63c148892..f63c148892 100644
--- a/tests/src/com/vaadin/tests/TestCaptionWrapper.java
+++ b/tests/testbench/com/vaadin/tests/TestCaptionWrapper.java
diff --git a/tests/src/com/vaadin/tests/TestComponentAddAndRecursion.java b/tests/testbench/com/vaadin/tests/TestComponentAddAndRecursion.java
index 5203a7055f..5203a7055f 100644
--- a/tests/src/com/vaadin/tests/TestComponentAddAndRecursion.java
+++ b/tests/testbench/com/vaadin/tests/TestComponentAddAndRecursion.java
diff --git a/tests/src/com/vaadin/tests/TestContainerChanges.java b/tests/testbench/com/vaadin/tests/TestContainerChanges.java
index c3a1a98665..c3a1a98665 100644
--- a/tests/src/com/vaadin/tests/TestContainerChanges.java
+++ b/tests/testbench/com/vaadin/tests/TestContainerChanges.java
diff --git a/tests/src/com/vaadin/tests/TestDateField.java b/tests/testbench/com/vaadin/tests/TestDateField.java
index 287007bad6..287007bad6 100644
--- a/tests/src/com/vaadin/tests/TestDateField.java
+++ b/tests/testbench/com/vaadin/tests/TestDateField.java
diff --git a/tests/src/com/vaadin/tests/TestForAlignments.java b/tests/testbench/com/vaadin/tests/TestForAlignments.java
index 4296744224..4296744224 100644
--- a/tests/src/com/vaadin/tests/TestForAlignments.java
+++ b/tests/testbench/com/vaadin/tests/TestForAlignments.java
diff --git a/tests/src/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java b/tests/testbench/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java
index b15949518a..b15949518a 100644
--- a/tests/src/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java
+++ b/tests/testbench/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java
diff --git a/tests/src/com/vaadin/tests/TestForBasicApplicationLayout.java b/tests/testbench/com/vaadin/tests/TestForBasicApplicationLayout.java
index e4b7592398..e4b7592398 100644
--- a/tests/src/com/vaadin/tests/TestForBasicApplicationLayout.java
+++ b/tests/testbench/com/vaadin/tests/TestForBasicApplicationLayout.java
diff --git a/tests/src/com/vaadin/tests/TestForChildComponentRendering.java b/tests/testbench/com/vaadin/tests/TestForChildComponentRendering.java
index 2aafe6b38c..2aafe6b38c 100644
--- a/tests/src/com/vaadin/tests/TestForChildComponentRendering.java
+++ b/tests/testbench/com/vaadin/tests/TestForChildComponentRendering.java
diff --git a/tests/src/com/vaadin/tests/TestForContainerFilterable.java b/tests/testbench/com/vaadin/tests/TestForContainerFilterable.java
index 7b5124b4f3..7b5124b4f3 100644
--- a/tests/src/com/vaadin/tests/TestForContainerFilterable.java
+++ b/tests/testbench/com/vaadin/tests/TestForContainerFilterable.java
diff --git a/tests/src/com/vaadin/tests/TestForGridLayoutChildComponentRendering.java b/tests/testbench/com/vaadin/tests/TestForGridLayoutChildComponentRendering.java
index 5c121dd3d3..5c121dd3d3 100644
--- a/tests/src/com/vaadin/tests/TestForGridLayoutChildComponentRendering.java
+++ b/tests/testbench/com/vaadin/tests/TestForGridLayoutChildComponentRendering.java
diff --git a/tests/src/com/vaadin/tests/TestForMultipleStyleNames.java b/tests/testbench/com/vaadin/tests/TestForMultipleStyleNames.java
index 7bad629913..7bad629913 100644
--- a/tests/src/com/vaadin/tests/TestForMultipleStyleNames.java
+++ b/tests/testbench/com/vaadin/tests/TestForMultipleStyleNames.java
diff --git a/tests/src/com/vaadin/tests/TestForNativeWindowing.java b/tests/testbench/com/vaadin/tests/TestForNativeWindowing.java
index 38fbb42aa2..38fbb42aa2 100644
--- a/tests/src/com/vaadin/tests/TestForNativeWindowing.java
+++ b/tests/testbench/com/vaadin/tests/TestForNativeWindowing.java
diff --git a/tests/src/com/vaadin/tests/TestForPreconfiguredComponents.java b/tests/testbench/com/vaadin/tests/TestForPreconfiguredComponents.java
index e009489683..e009489683 100644
--- a/tests/src/com/vaadin/tests/TestForPreconfiguredComponents.java
+++ b/tests/testbench/com/vaadin/tests/TestForPreconfiguredComponents.java
diff --git a/tests/src/com/vaadin/tests/TestForRichTextEditor.java b/tests/testbench/com/vaadin/tests/TestForRichTextEditor.java
index 50b7be91ef..50b7be91ef 100644
--- a/tests/src/com/vaadin/tests/TestForRichTextEditor.java
+++ b/tests/testbench/com/vaadin/tests/TestForRichTextEditor.java
diff --git a/tests/src/com/vaadin/tests/TestForStyledUpload.java b/tests/testbench/com/vaadin/tests/TestForStyledUpload.java
index 6a6ae130e5..6a6ae130e5 100644
--- a/tests/src/com/vaadin/tests/TestForStyledUpload.java
+++ b/tests/testbench/com/vaadin/tests/TestForStyledUpload.java
diff --git a/tests/src/com/vaadin/tests/TestForTabSheet.java b/tests/testbench/com/vaadin/tests/TestForTabSheet.java
index 938bf43115..938bf43115 100644
--- a/tests/src/com/vaadin/tests/TestForTabSheet.java
+++ b/tests/testbench/com/vaadin/tests/TestForTabSheet.java
diff --git a/tests/src/com/vaadin/tests/TestForTablesInitialColumnWidthLogicRendering.java b/tests/testbench/com/vaadin/tests/TestForTablesInitialColumnWidthLogicRendering.java
index d849ab37a0..d849ab37a0 100644
--- a/tests/src/com/vaadin/tests/TestForTablesInitialColumnWidthLogicRendering.java
+++ b/tests/testbench/com/vaadin/tests/TestForTablesInitialColumnWidthLogicRendering.java
diff --git a/tests/src/com/vaadin/tests/TestForTrees.java b/tests/testbench/com/vaadin/tests/TestForTrees.java
index 32139511e1..32139511e1 100644
--- a/tests/src/com/vaadin/tests/TestForTrees.java
+++ b/tests/testbench/com/vaadin/tests/TestForTrees.java
diff --git a/tests/src/com/vaadin/tests/TestForUpload.java b/tests/testbench/com/vaadin/tests/TestForUpload.java
index 3fed6b233e..3fed6b233e 100644
--- a/tests/src/com/vaadin/tests/TestForUpload.java
+++ b/tests/testbench/com/vaadin/tests/TestForUpload.java
diff --git a/tests/src/com/vaadin/tests/TestForWindowOpen.java b/tests/testbench/com/vaadin/tests/TestForWindowOpen.java
index 74e3af46ea..74e3af46ea 100644
--- a/tests/src/com/vaadin/tests/TestForWindowOpen.java
+++ b/tests/testbench/com/vaadin/tests/TestForWindowOpen.java
diff --git a/tests/src/com/vaadin/tests/TestForWindowing.java b/tests/testbench/com/vaadin/tests/TestForWindowing.java
index fb7c388567..fb7c388567 100644
--- a/tests/src/com/vaadin/tests/TestForWindowing.java
+++ b/tests/testbench/com/vaadin/tests/TestForWindowing.java
diff --git a/tests/src/com/vaadin/tests/TestIFrames.java b/tests/testbench/com/vaadin/tests/TestIFrames.java
index ea93398206..ea93398206 100644
--- a/tests/src/com/vaadin/tests/TestIFrames.java
+++ b/tests/testbench/com/vaadin/tests/TestIFrames.java
diff --git a/tests/src/com/vaadin/tests/TestMethodProperty.java b/tests/testbench/com/vaadin/tests/TestMethodProperty.java
index 49a3c110fa..49a3c110fa 100644
--- a/tests/src/com/vaadin/tests/TestMethodProperty.java
+++ b/tests/testbench/com/vaadin/tests/TestMethodProperty.java
diff --git a/tests/src/com/vaadin/tests/TestSelectAndDatefieldInDeepLayouts.java b/tests/testbench/com/vaadin/tests/TestSelectAndDatefieldInDeepLayouts.java
index 5a72a34be9..5a72a34be9 100644
--- a/tests/src/com/vaadin/tests/TestSelectAndDatefieldInDeepLayouts.java
+++ b/tests/testbench/com/vaadin/tests/TestSelectAndDatefieldInDeepLayouts.java
diff --git a/tests/src/com/vaadin/tests/TestSetVisibleAndCaching.java b/tests/testbench/com/vaadin/tests/TestSetVisibleAndCaching.java
index 479a7602ef..479a7602ef 100644
--- a/tests/src/com/vaadin/tests/TestSetVisibleAndCaching.java
+++ b/tests/testbench/com/vaadin/tests/TestSetVisibleAndCaching.java
diff --git a/tests/src/com/vaadin/tests/TestSizeableIncomponents.java b/tests/testbench/com/vaadin/tests/TestSizeableIncomponents.java
index 5d82c9d0ee..5d82c9d0ee 100644
--- a/tests/src/com/vaadin/tests/TestSizeableIncomponents.java
+++ b/tests/testbench/com/vaadin/tests/TestSizeableIncomponents.java
diff --git a/tests/src/com/vaadin/tests/TestSplitPanel.java b/tests/testbench/com/vaadin/tests/TestSplitPanel.java
index d2665cc971..d2665cc971 100644
--- a/tests/src/com/vaadin/tests/TestSplitPanel.java
+++ b/tests/testbench/com/vaadin/tests/TestSplitPanel.java
diff --git a/tests/src/com/vaadin/tests/TreeFilesystem.java b/tests/testbench/com/vaadin/tests/TreeFilesystem.java
index 9b05bbce1c..9b05bbce1c 100644
--- a/tests/src/com/vaadin/tests/TreeFilesystem.java
+++ b/tests/testbench/com/vaadin/tests/TreeFilesystem.java
diff --git a/tests/src/com/vaadin/tests/TreeFilesystemContainer.java b/tests/testbench/com/vaadin/tests/TreeFilesystemContainer.java
index 085abd1666..085abd1666 100644
--- a/tests/src/com/vaadin/tests/TreeFilesystemContainer.java
+++ b/tests/testbench/com/vaadin/tests/TreeFilesystemContainer.java
diff --git a/tests/src/com/vaadin/tests/UpgradingSample.java b/tests/testbench/com/vaadin/tests/UpgradingSample.java
index 55a17d705b..55a17d705b 100644
--- a/tests/src/com/vaadin/tests/UpgradingSample.java
+++ b/tests/testbench/com/vaadin/tests/UpgradingSample.java
diff --git a/tests/src/com/vaadin/tests/UsingCustomNewItemHandlerInSelect.java b/tests/testbench/com/vaadin/tests/UsingCustomNewItemHandlerInSelect.java
index b54bd3d184..b54bd3d184 100644
--- a/tests/src/com/vaadin/tests/UsingCustomNewItemHandlerInSelect.java
+++ b/tests/testbench/com/vaadin/tests/UsingCustomNewItemHandlerInSelect.java
diff --git a/tests/src/com/vaadin/tests/UsingObjectsInSelect.java b/tests/testbench/com/vaadin/tests/UsingObjectsInSelect.java
index c9b0939eef..c9b0939eef 100644
--- a/tests/src/com/vaadin/tests/UsingObjectsInSelect.java
+++ b/tests/testbench/com/vaadin/tests/UsingObjectsInSelect.java
diff --git a/tests/src/com/vaadin/tests/VaadinClasses.java b/tests/testbench/com/vaadin/tests/VaadinClasses.java
index 6f826402f4..6f826402f4 100644
--- a/tests/src/com/vaadin/tests/VaadinClasses.java
+++ b/tests/testbench/com/vaadin/tests/VaadinClasses.java
diff --git a/tests/src/com/vaadin/tests/appengine/GAESyncTest.java b/tests/testbench/com/vaadin/tests/appengine/GAESyncTest.java
index 2b6656f11a..2b6656f11a 100644
--- a/tests/src/com/vaadin/tests/appengine/GAESyncTest.java
+++ b/tests/testbench/com/vaadin/tests/appengine/GAESyncTest.java
diff --git a/tests/src/com/vaadin/tests/appengine/img1.png b/tests/testbench/com/vaadin/tests/appengine/img1.png
index d249324e0c..d249324e0c 100644
--- a/tests/src/com/vaadin/tests/appengine/img1.png
+++ b/tests/testbench/com/vaadin/tests/appengine/img1.png
diff --git a/tests/src/com/vaadin/tests/application/ApplicationCloseTest.java b/tests/testbench/com/vaadin/tests/application/ApplicationCloseTest.java
index b10752d26c..b10752d26c 100644
--- a/tests/src/com/vaadin/tests/application/ApplicationCloseTest.java
+++ b/tests/testbench/com/vaadin/tests/application/ApplicationCloseTest.java
diff --git a/tests/src/com/vaadin/tests/application/ErrorInUnloadEvent.html b/tests/testbench/com/vaadin/tests/application/ErrorInUnloadEvent.html
index ee200d7f5c..ee200d7f5c 100644
--- a/tests/src/com/vaadin/tests/application/ErrorInUnloadEvent.html
+++ b/tests/testbench/com/vaadin/tests/application/ErrorInUnloadEvent.html
diff --git a/tests/src/com/vaadin/tests/application/ErrorInUnloadEvent.java b/tests/testbench/com/vaadin/tests/application/ErrorInUnloadEvent.java
index f212e74ca3..f212e74ca3 100644
--- a/tests/src/com/vaadin/tests/application/ErrorInUnloadEvent.java
+++ b/tests/testbench/com/vaadin/tests/application/ErrorInUnloadEvent.java
diff --git a/tests/src/com/vaadin/tests/application/WebBrowserTest.html b/tests/testbench/com/vaadin/tests/application/WebBrowserTest.html
index 75cd03dce1..75cd03dce1 100644
--- a/tests/src/com/vaadin/tests/application/WebBrowserTest.html
+++ b/tests/testbench/com/vaadin/tests/application/WebBrowserTest.html
diff --git a/tests/src/com/vaadin/tests/application/WebBrowserTest.java b/tests/testbench/com/vaadin/tests/application/WebBrowserTest.java
index 08c9061d45..08c9061d45 100644
--- a/tests/src/com/vaadin/tests/application/WebBrowserTest.java
+++ b/tests/testbench/com/vaadin/tests/application/WebBrowserTest.java
diff --git a/tests/src/com/vaadin/tests/applicationcontext/ChangeSessionId.html b/tests/testbench/com/vaadin/tests/applicationcontext/ChangeSessionId.html
index 6d028f1fea..6d028f1fea 100644
--- a/tests/src/com/vaadin/tests/applicationcontext/ChangeSessionId.html
+++ b/tests/testbench/com/vaadin/tests/applicationcontext/ChangeSessionId.html
diff --git a/tests/src/com/vaadin/tests/applicationcontext/ChangeSessionId.java b/tests/testbench/com/vaadin/tests/applicationcontext/ChangeSessionId.java
index ddbbc49e68..ddbbc49e68 100644
--- a/tests/src/com/vaadin/tests/applicationcontext/ChangeSessionId.java
+++ b/tests/testbench/com/vaadin/tests/applicationcontext/ChangeSessionId.java
diff --git a/tests/src/com/vaadin/tests/applicationcontext/RemoveTransactionListener.java b/tests/testbench/com/vaadin/tests/applicationcontext/RemoveTransactionListener.java
index 8723e23a2a..8723e23a2a 100644
--- a/tests/src/com/vaadin/tests/applicationcontext/RemoveTransactionListener.java
+++ b/tests/testbench/com/vaadin/tests/applicationcontext/RemoveTransactionListener.java
diff --git a/tests/src/com/vaadin/tests/applicationservlet/NoMainWindow.java b/tests/testbench/com/vaadin/tests/applicationservlet/NoMainWindow.java
index 9097274236..9097274236 100644
--- a/tests/src/com/vaadin/tests/applicationservlet/NoMainWindow.java
+++ b/tests/testbench/com/vaadin/tests/applicationservlet/NoMainWindow.java
diff --git a/tests/src/com/vaadin/tests/components/AbstractComponentContainerTest.java b/tests/testbench/com/vaadin/tests/components/AbstractComponentContainerTest.java
index 0c9c9c4ae2..0c9c9c4ae2 100644
--- a/tests/src/com/vaadin/tests/components/AbstractComponentContainerTest.java
+++ b/tests/testbench/com/vaadin/tests/components/AbstractComponentContainerTest.java
diff --git a/tests/src/com/vaadin/tests/components/AbstractComponentTest.java b/tests/testbench/com/vaadin/tests/components/AbstractComponentTest.java
index 8344ed216a..8344ed216a 100644
--- a/tests/src/com/vaadin/tests/components/AbstractComponentTest.java
+++ b/tests/testbench/com/vaadin/tests/components/AbstractComponentTest.java
diff --git a/tests/src/com/vaadin/tests/components/AbstractComponentTestCase.java b/tests/testbench/com/vaadin/tests/components/AbstractComponentTestCase.java
index 1b04198da0..1b04198da0 100644
--- a/tests/src/com/vaadin/tests/components/AbstractComponentTestCase.java
+++ b/tests/testbench/com/vaadin/tests/components/AbstractComponentTestCase.java
diff --git a/tests/src/com/vaadin/tests/components/AbstractLayoutTest.java b/tests/testbench/com/vaadin/tests/components/AbstractLayoutTest.java
index f6b979c698..f6b979c698 100644
--- a/tests/src/com/vaadin/tests/components/AbstractLayoutTest.java
+++ b/tests/testbench/com/vaadin/tests/components/AbstractLayoutTest.java
diff --git a/tests/src/com/vaadin/tests/components/AbstractOrderedLayoutTest.java b/tests/testbench/com/vaadin/tests/components/AbstractOrderedLayoutTest.java
index d6cbe8590d..d6cbe8590d 100644
--- a/tests/src/com/vaadin/tests/components/AbstractOrderedLayoutTest.java
+++ b/tests/testbench/com/vaadin/tests/components/AbstractOrderedLayoutTest.java
diff --git a/tests/src/com/vaadin/tests/components/AbstractTestCase.java b/tests/testbench/com/vaadin/tests/components/AbstractTestCase.java
index ded579f58c..ded579f58c 100644
--- a/tests/src/com/vaadin/tests/components/AbstractTestCase.java
+++ b/tests/testbench/com/vaadin/tests/components/AbstractTestCase.java
diff --git a/tests/src/com/vaadin/tests/components/ComponentTestCase.java b/tests/testbench/com/vaadin/tests/components/ComponentTestCase.java
index 1e15f7a47b..1e15f7a47b 100644
--- a/tests/src/com/vaadin/tests/components/ComponentTestCase.java
+++ b/tests/testbench/com/vaadin/tests/components/ComponentTestCase.java
diff --git a/tests/src/com/vaadin/tests/components/CustomComponentwithUndefinedSize.java b/tests/testbench/com/vaadin/tests/components/CustomComponentwithUndefinedSize.java
index 57b81ddecc..57b81ddecc 100644
--- a/tests/src/com/vaadin/tests/components/CustomComponentwithUndefinedSize.java
+++ b/tests/testbench/com/vaadin/tests/components/CustomComponentwithUndefinedSize.java
diff --git a/tests/src/com/vaadin/tests/components/ErrorMessages.html b/tests/testbench/com/vaadin/tests/components/ErrorMessages.html
index a33cb484f9..a33cb484f9 100644
--- a/tests/src/com/vaadin/tests/components/ErrorMessages.html
+++ b/tests/testbench/com/vaadin/tests/components/ErrorMessages.html
diff --git a/tests/src/com/vaadin/tests/components/ErrorMessages.java b/tests/testbench/com/vaadin/tests/components/ErrorMessages.java
index d4008a4dfb..d4008a4dfb 100644
--- a/tests/src/com/vaadin/tests/components/ErrorMessages.java
+++ b/tests/testbench/com/vaadin/tests/components/ErrorMessages.java
diff --git a/tests/src/com/vaadin/tests/components/FocusAndBlurListeners.java b/tests/testbench/com/vaadin/tests/components/FocusAndBlurListeners.java
index 267807b16b..267807b16b 100644
--- a/tests/src/com/vaadin/tests/components/FocusAndBlurListeners.java
+++ b/tests/testbench/com/vaadin/tests/components/FocusAndBlurListeners.java
diff --git a/tests/src/com/vaadin/tests/components/FocusFromShortcutAction.java b/tests/testbench/com/vaadin/tests/components/FocusFromShortcutAction.java
index 124f2b9cdf..124f2b9cdf 100644
--- a/tests/src/com/vaadin/tests/components/FocusFromShortcutAction.java
+++ b/tests/testbench/com/vaadin/tests/components/FocusFromShortcutAction.java
diff --git a/tests/src/com/vaadin/tests/components/HierarchicalContainerSorting.java b/tests/testbench/com/vaadin/tests/components/HierarchicalContainerSorting.java
index 1f0f1bd923..1f0f1bd923 100644
--- a/tests/src/com/vaadin/tests/components/HierarchicalContainerSorting.java
+++ b/tests/testbench/com/vaadin/tests/components/HierarchicalContainerSorting.java
diff --git a/tests/src/com/vaadin/tests/components/LayoutAttachListenerInfo.html b/tests/testbench/com/vaadin/tests/components/LayoutAttachListenerInfo.html
index 10dd21d240..10dd21d240 100644
--- a/tests/src/com/vaadin/tests/components/LayoutAttachListenerInfo.html
+++ b/tests/testbench/com/vaadin/tests/components/LayoutAttachListenerInfo.html
diff --git a/tests/src/com/vaadin/tests/components/LayoutAttachListenerInfo.java b/tests/testbench/com/vaadin/tests/components/LayoutAttachListenerInfo.java
index 7ed44768fd..7ed44768fd 100644
--- a/tests/src/com/vaadin/tests/components/LayoutAttachListenerInfo.java
+++ b/tests/testbench/com/vaadin/tests/components/LayoutAttachListenerInfo.java
diff --git a/tests/src/com/vaadin/tests/components/LongTooltip.html b/tests/testbench/com/vaadin/tests/components/LongTooltip.html
index ac317380b8..ac317380b8 100644
--- a/tests/src/com/vaadin/tests/components/LongTooltip.html
+++ b/tests/testbench/com/vaadin/tests/components/LongTooltip.html
diff --git a/tests/src/com/vaadin/tests/components/LongTooltip.java b/tests/testbench/com/vaadin/tests/components/LongTooltip.java
index 87adaa673b..87adaa673b 100644
--- a/tests/src/com/vaadin/tests/components/LongTooltip.java
+++ b/tests/testbench/com/vaadin/tests/components/LongTooltip.java
diff --git a/tests/src/com/vaadin/tests/components/MultipleDebugIds.java b/tests/testbench/com/vaadin/tests/components/MultipleDebugIds.java
index ebfa29b9e9..ebfa29b9e9 100644
--- a/tests/src/com/vaadin/tests/components/MultipleDebugIds.java
+++ b/tests/testbench/com/vaadin/tests/components/MultipleDebugIds.java
diff --git a/tests/src/com/vaadin/tests/components/TestBase.java b/tests/testbench/com/vaadin/tests/components/TestBase.java
index 2156c512ce..2156c512ce 100644
--- a/tests/src/com/vaadin/tests/components/TestBase.java
+++ b/tests/testbench/com/vaadin/tests/components/TestBase.java
diff --git a/tests/src/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutClipping.html b/tests/testbench/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutClipping.html
index ff5c890abf..ff5c890abf 100644
--- a/tests/src/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutClipping.html
+++ b/tests/testbench/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutClipping.html
diff --git a/tests/src/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutClipping.java b/tests/testbench/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutClipping.java
index f6bff579a3..f6bff579a3 100644
--- a/tests/src/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutClipping.java
+++ b/tests/testbench/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutClipping.java
diff --git a/tests/src/com/vaadin/tests/components/absolutelayout/MoveComponentFromAbsoluteLayoutToInnerLayout.html b/tests/testbench/com/vaadin/tests/components/absolutelayout/MoveComponentFromAbsoluteLayoutToInnerLayout.html
index e1fbf29b37..e1fbf29b37 100644
--- a/tests/src/com/vaadin/tests/components/absolutelayout/MoveComponentFromAbsoluteLayoutToInnerLayout.html
+++ b/tests/testbench/com/vaadin/tests/components/absolutelayout/MoveComponentFromAbsoluteLayoutToInnerLayout.html
diff --git a/tests/src/com/vaadin/tests/components/absolutelayout/MoveComponentsFromAbsoluteLayoutToInnerLayout.java b/tests/testbench/com/vaadin/tests/components/absolutelayout/MoveComponentsFromAbsoluteLayoutToInnerLayout.java
index 9082842b1c..9082842b1c 100644
--- a/tests/src/com/vaadin/tests/components/absolutelayout/MoveComponentsFromAbsoluteLayoutToInnerLayout.java
+++ b/tests/testbench/com/vaadin/tests/components/absolutelayout/MoveComponentsFromAbsoluteLayoutToInnerLayout.java
diff --git a/tests/src/com/vaadin/tests/components/abstractcomponent/EnableState.html b/tests/testbench/com/vaadin/tests/components/abstractcomponent/EnableState.html
index f4bebcf859..f4bebcf859 100644
--- a/tests/src/com/vaadin/tests/components/abstractcomponent/EnableState.html
+++ b/tests/testbench/com/vaadin/tests/components/abstractcomponent/EnableState.html
diff --git a/tests/src/com/vaadin/tests/components/abstractcomponent/EnableState.java b/tests/testbench/com/vaadin/tests/components/abstractcomponent/EnableState.java
index 5d4f0f2acf..5d4f0f2acf 100644
--- a/tests/src/com/vaadin/tests/components/abstractcomponent/EnableState.java
+++ b/tests/testbench/com/vaadin/tests/components/abstractcomponent/EnableState.java
diff --git a/tests/src/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.html b/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.html
index 6a47032545..6a47032545 100644
--- a/tests/src/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.html
+++ b/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.html
diff --git a/tests/src/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.java b/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.java
index a08f8999a6..a08f8999a6 100644
--- a/tests/src/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.java
+++ b/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.java
diff --git a/tests/src/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.html b/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.html
index f99bdea946..f99bdea946 100644
--- a/tests/src/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.html
+++ b/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.html
diff --git a/tests/src/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.java b/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.java
index 2a2fc0153a..2a2fc0153a 100644
--- a/tests/src/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.java
+++ b/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.java
diff --git a/tests/src/com/vaadin/tests/components/abstractfield/AbstractFieldTest.java b/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractFieldTest.java
index 1c8e728908..1c8e728908 100644
--- a/tests/src/com/vaadin/tests/components/abstractfield/AbstractFieldTest.java
+++ b/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractFieldTest.java
diff --git a/tests/src/com/vaadin/tests/components/abstractfield/AbstractTextFieldTest.java b/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractTextFieldTest.java
index eb9adef8d2..eb9adef8d2 100644
--- a/tests/src/com/vaadin/tests/components/abstractfield/AbstractTextFieldTest.java
+++ b/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractTextFieldTest.java
diff --git a/tests/src/com/vaadin/tests/components/abstractfield/ShortcutAddAndRemove.html b/tests/testbench/com/vaadin/tests/components/abstractfield/ShortcutAddAndRemove.html
index e61f227939..e61f227939 100644
--- a/tests/src/com/vaadin/tests/components/abstractfield/ShortcutAddAndRemove.html
+++ b/tests/testbench/com/vaadin/tests/components/abstractfield/ShortcutAddAndRemove.html
diff --git a/tests/src/com/vaadin/tests/components/abstractfield/ShortcutAddAndRemove.java b/tests/testbench/com/vaadin/tests/components/abstractfield/ShortcutAddAndRemove.java
index 837256ff65..837256ff65 100644
--- a/tests/src/com/vaadin/tests/components/abstractfield/ShortcutAddAndRemove.java
+++ b/tests/testbench/com/vaadin/tests/components/abstractfield/ShortcutAddAndRemove.java
diff --git a/tests/src/com/vaadin/tests/components/accordion/AccordionInactiveTabSize.html b/tests/testbench/com/vaadin/tests/components/accordion/AccordionInactiveTabSize.html
index e4bb6c36be..e4bb6c36be 100644
--- a/tests/src/com/vaadin/tests/components/accordion/AccordionInactiveTabSize.html
+++ b/tests/testbench/com/vaadin/tests/components/accordion/AccordionInactiveTabSize.html
diff --git a/tests/src/com/vaadin/tests/components/accordion/AccordionInactiveTabSize.java b/tests/testbench/com/vaadin/tests/components/accordion/AccordionInactiveTabSize.java
index 387ec7857f..387ec7857f 100644
--- a/tests/src/com/vaadin/tests/components/accordion/AccordionInactiveTabSize.java
+++ b/tests/testbench/com/vaadin/tests/components/accordion/AccordionInactiveTabSize.java
diff --git a/tests/src/com/vaadin/tests/components/accordion/AccordionTest.java b/tests/testbench/com/vaadin/tests/components/accordion/AccordionTest.java
index 5c47610ae5..5c47610ae5 100644
--- a/tests/src/com/vaadin/tests/components/accordion/AccordionTest.java
+++ b/tests/testbench/com/vaadin/tests/components/accordion/AccordionTest.java
diff --git a/tests/src/com/vaadin/tests/components/accordion/RemoveTabs.html b/tests/testbench/com/vaadin/tests/components/accordion/RemoveTabs.html
index ec24ade8ce..ec24ade8ce 100644
--- a/tests/src/com/vaadin/tests/components/accordion/RemoveTabs.html
+++ b/tests/testbench/com/vaadin/tests/components/accordion/RemoveTabs.html
diff --git a/tests/src/com/vaadin/tests/components/accordion/RemoveTabs.java b/tests/testbench/com/vaadin/tests/components/accordion/RemoveTabs.java
index bc8bea1c56..bc8bea1c56 100644
--- a/tests/src/com/vaadin/tests/components/accordion/RemoveTabs.java
+++ b/tests/testbench/com/vaadin/tests/components/accordion/RemoveTabs.java
diff --git a/tests/src/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerGenerator.java b/tests/testbench/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerGenerator.java
index 254779f872..254779f872 100644
--- a/tests/src/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerGenerator.java
+++ b/tests/testbench/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerGenerator.java
diff --git a/tests/src/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerNullValues.html b/tests/testbench/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerNullValues.html
index e40be7dc15..e40be7dc15 100644
--- a/tests/src/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerNullValues.html
+++ b/tests/testbench/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerNullValues.html
diff --git a/tests/src/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerNullValues.java b/tests/testbench/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerNullValues.java
index 9045d18940..9045d18940 100644
--- a/tests/src/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerNullValues.java
+++ b/tests/testbench/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerNullValues.java
diff --git a/tests/src/com/vaadin/tests/components/beanitemcontainer/TestBeanItemContainerUsage.html b/tests/testbench/com/vaadin/tests/components/beanitemcontainer/TestBeanItemContainerUsage.html
index a37e8ea662..a37e8ea662 100644
--- a/tests/src/com/vaadin/tests/components/beanitemcontainer/TestBeanItemContainerUsage.html
+++ b/tests/testbench/com/vaadin/tests/components/beanitemcontainer/TestBeanItemContainerUsage.html
diff --git a/tests/src/com/vaadin/tests/components/beanitemcontainer/TestBeanItemContainerUsage.java b/tests/testbench/com/vaadin/tests/components/beanitemcontainer/TestBeanItemContainerUsage.java
index 20becea974..20becea974 100644
--- a/tests/src/com/vaadin/tests/components/beanitemcontainer/TestBeanItemContainerUsage.java
+++ b/tests/testbench/com/vaadin/tests/components/beanitemcontainer/TestBeanItemContainerUsage.java
diff --git a/tests/src/com/vaadin/tests/components/button/ButtonDisableOnClick.html b/tests/testbench/com/vaadin/tests/components/button/ButtonDisableOnClick.html
index 850d553b5b..850d553b5b 100644
--- a/tests/src/com/vaadin/tests/components/button/ButtonDisableOnClick.html
+++ b/tests/testbench/com/vaadin/tests/components/button/ButtonDisableOnClick.html
diff --git a/tests/src/com/vaadin/tests/components/button/ButtonErrorMessage.java b/tests/testbench/com/vaadin/tests/components/button/ButtonErrorMessage.java
index b543c69c51..b543c69c51 100644
--- a/tests/src/com/vaadin/tests/components/button/ButtonErrorMessage.java
+++ b/tests/testbench/com/vaadin/tests/components/button/ButtonErrorMessage.java
diff --git a/tests/src/com/vaadin/tests/components/button/ButtonMouseDetails.java b/tests/testbench/com/vaadin/tests/components/button/ButtonMouseDetails.java
index 40caf620a8..40caf620a8 100644
--- a/tests/src/com/vaadin/tests/components/button/ButtonMouseDetails.java
+++ b/tests/testbench/com/vaadin/tests/components/button/ButtonMouseDetails.java
diff --git a/tests/src/com/vaadin/tests/components/button/ButtonUndefinedWidth.html b/tests/testbench/com/vaadin/tests/components/button/ButtonUndefinedWidth.html
index 28fe12f5a2..28fe12f5a2 100644
--- a/tests/src/com/vaadin/tests/components/button/ButtonUndefinedWidth.html
+++ b/tests/testbench/com/vaadin/tests/components/button/ButtonUndefinedWidth.html
diff --git a/tests/src/com/vaadin/tests/components/button/ButtonUndefinedWidth.java b/tests/testbench/com/vaadin/tests/components/button/ButtonUndefinedWidth.java
index 852e41bd05..852e41bd05 100644
--- a/tests/src/com/vaadin/tests/components/button/ButtonUndefinedWidth.java
+++ b/tests/testbench/com/vaadin/tests/components/button/ButtonUndefinedWidth.java
diff --git a/tests/src/com/vaadin/tests/components/button/Buttons.html b/tests/testbench/com/vaadin/tests/components/button/Buttons.html
index 43e554bec5..43e554bec5 100644
--- a/tests/src/com/vaadin/tests/components/button/Buttons.html
+++ b/tests/testbench/com/vaadin/tests/components/button/Buttons.html
diff --git a/tests/src/com/vaadin/tests/components/button/Buttons.java b/tests/testbench/com/vaadin/tests/components/button/Buttons.java
index afbc90d197..afbc90d197 100644
--- a/tests/src/com/vaadin/tests/components/button/Buttons.java
+++ b/tests/testbench/com/vaadin/tests/components/button/Buttons.java
diff --git a/tests/src/com/vaadin/tests/components/button/Buttons2.java b/tests/testbench/com/vaadin/tests/components/button/Buttons2.java
index c18e736082..c18e736082 100644
--- a/tests/src/com/vaadin/tests/components/button/Buttons2.java
+++ b/tests/testbench/com/vaadin/tests/components/button/Buttons2.java
diff --git a/tests/src/com/vaadin/tests/components/button/DisabledButtons.html b/tests/testbench/com/vaadin/tests/components/button/DisabledButtons.html
index 65584fd4d0..65584fd4d0 100644
--- a/tests/src/com/vaadin/tests/components/button/DisabledButtons.html
+++ b/tests/testbench/com/vaadin/tests/components/button/DisabledButtons.html
diff --git a/tests/src/com/vaadin/tests/components/button/DisabledButtons.java b/tests/testbench/com/vaadin/tests/components/button/DisabledButtons.java
index 3e438a5d5b..3e438a5d5b 100644
--- a/tests/src/com/vaadin/tests/components/button/DisabledButtons.java
+++ b/tests/testbench/com/vaadin/tests/components/button/DisabledButtons.java
diff --git a/tests/src/com/vaadin/tests/components/button/IE7ButtonWithIcon.html b/tests/testbench/com/vaadin/tests/components/button/IE7ButtonWithIcon.html
index a05b439759..a05b439759 100644
--- a/tests/src/com/vaadin/tests/components/button/IE7ButtonWithIcon.html
+++ b/tests/testbench/com/vaadin/tests/components/button/IE7ButtonWithIcon.html
diff --git a/tests/src/com/vaadin/tests/components/button/IE7ButtonWithIcon.java b/tests/testbench/com/vaadin/tests/components/button/IE7ButtonWithIcon.java
index c6a0ae96a9..c6a0ae96a9 100644
--- a/tests/src/com/vaadin/tests/components/button/IE7ButtonWithIcon.java
+++ b/tests/testbench/com/vaadin/tests/components/button/IE7ButtonWithIcon.java
diff --git a/tests/src/com/vaadin/tests/components/button/ShortCutListenerModification.java b/tests/testbench/com/vaadin/tests/components/button/ShortCutListenerModification.java
index 3d4dfeda04..3d4dfeda04 100644
--- a/tests/src/com/vaadin/tests/components/button/ShortCutListenerModification.java
+++ b/tests/testbench/com/vaadin/tests/components/button/ShortCutListenerModification.java
diff --git a/tests/src/com/vaadin/tests/components/button/TooltipForDisabledButton.java b/tests/testbench/com/vaadin/tests/components/button/TooltipForDisabledButton.java
index 3fed5b9c02..3fed5b9c02 100644
--- a/tests/src/com/vaadin/tests/components/button/TooltipForDisabledButton.java
+++ b/tests/testbench/com/vaadin/tests/components/button/TooltipForDisabledButton.java
diff --git a/tests/src/com/vaadin/tests/components/caption/EmptyCaptions.html b/tests/testbench/com/vaadin/tests/components/caption/EmptyCaptions.html
index dc98bbacbb..dc98bbacbb 100644
--- a/tests/src/com/vaadin/tests/components/caption/EmptyCaptions.html
+++ b/tests/testbench/com/vaadin/tests/components/caption/EmptyCaptions.html
diff --git a/tests/src/com/vaadin/tests/components/caption/EmptyCaptions.java b/tests/testbench/com/vaadin/tests/components/caption/EmptyCaptions.java
index 86f0bd6b9d..86f0bd6b9d 100644
--- a/tests/src/com/vaadin/tests/components/caption/EmptyCaptions.java
+++ b/tests/testbench/com/vaadin/tests/components/caption/EmptyCaptions.java
diff --git a/tests/src/com/vaadin/tests/components/caption/IconsInCaption.java b/tests/testbench/com/vaadin/tests/components/caption/IconsInCaption.java
index 926088ff48..926088ff48 100644
--- a/tests/src/com/vaadin/tests/components/caption/IconsInCaption.java
+++ b/tests/testbench/com/vaadin/tests/components/caption/IconsInCaption.java
diff --git a/tests/src/com/vaadin/tests/components/caption/LargeCaptionIcon.html b/tests/testbench/com/vaadin/tests/components/caption/LargeCaptionIcon.html
index 7c94821e7f..7c94821e7f 100644
--- a/tests/src/com/vaadin/tests/components/caption/LargeCaptionIcon.html
+++ b/tests/testbench/com/vaadin/tests/components/caption/LargeCaptionIcon.html
diff --git a/tests/src/com/vaadin/tests/components/caption/LargeCaptionIcon.java b/tests/testbench/com/vaadin/tests/components/caption/LargeCaptionIcon.java
index 603fdf458b..603fdf458b 100644
--- a/tests/src/com/vaadin/tests/components/caption/LargeCaptionIcon.java
+++ b/tests/testbench/com/vaadin/tests/components/caption/LargeCaptionIcon.java
diff --git a/tests/src/com/vaadin/tests/components/checkbox/CheckBoxNullValue.html b/tests/testbench/com/vaadin/tests/components/checkbox/CheckBoxNullValue.html
index 9717ccec78..9717ccec78 100644
--- a/tests/src/com/vaadin/tests/components/checkbox/CheckBoxNullValue.html
+++ b/tests/testbench/com/vaadin/tests/components/checkbox/CheckBoxNullValue.html
diff --git a/tests/src/com/vaadin/tests/components/checkbox/CheckBoxNullValue.java b/tests/testbench/com/vaadin/tests/components/checkbox/CheckBoxNullValue.java
index a961b48426..a961b48426 100644
--- a/tests/src/com/vaadin/tests/components/checkbox/CheckBoxNullValue.java
+++ b/tests/testbench/com/vaadin/tests/components/checkbox/CheckBoxNullValue.java
diff --git a/tests/src/com/vaadin/tests/components/checkbox/CheckBoxes.html b/tests/testbench/com/vaadin/tests/components/checkbox/CheckBoxes.html
index 40596a49fd..40596a49fd 100644
--- a/tests/src/com/vaadin/tests/components/checkbox/CheckBoxes.html
+++ b/tests/testbench/com/vaadin/tests/components/checkbox/CheckBoxes.html
diff --git a/tests/src/com/vaadin/tests/components/checkbox/CheckBoxes.java b/tests/testbench/com/vaadin/tests/components/checkbox/CheckBoxes.java
index 0efa8bc818..0efa8bc818 100644
--- a/tests/src/com/vaadin/tests/components/checkbox/CheckBoxes.java
+++ b/tests/testbench/com/vaadin/tests/components/checkbox/CheckBoxes.java
diff --git a/tests/src/com/vaadin/tests/components/checkbox/CheckBoxes2.java b/tests/testbench/com/vaadin/tests/components/checkbox/CheckBoxes2.java
index 20f1ece65e..20f1ece65e 100644
--- a/tests/src/com/vaadin/tests/components/checkbox/CheckBoxes2.java
+++ b/tests/testbench/com/vaadin/tests/components/checkbox/CheckBoxes2.java
diff --git a/tests/src/com/vaadin/tests/components/checkbox/CheckboxCaptionWrapping.html b/tests/testbench/com/vaadin/tests/components/checkbox/CheckboxCaptionWrapping.html
index 26ecc95721..26ecc95721 100644
--- a/tests/src/com/vaadin/tests/components/checkbox/CheckboxCaptionWrapping.html
+++ b/tests/testbench/com/vaadin/tests/components/checkbox/CheckboxCaptionWrapping.html
diff --git a/tests/src/com/vaadin/tests/components/checkbox/CheckboxCaptionWrapping.java b/tests/testbench/com/vaadin/tests/components/checkbox/CheckboxCaptionWrapping.java
index 540af083c4..540af083c4 100644
--- a/tests/src/com/vaadin/tests/components/checkbox/CheckboxCaptionWrapping.java
+++ b/tests/testbench/com/vaadin/tests/components/checkbox/CheckboxCaptionWrapping.java
diff --git a/tests/src/com/vaadin/tests/components/checkbox/CheckboxIcon.java b/tests/testbench/com/vaadin/tests/components/checkbox/CheckboxIcon.java
index 1f96a05084..1f96a05084 100644
--- a/tests/src/com/vaadin/tests/components/checkbox/CheckboxIcon.java
+++ b/tests/testbench/com/vaadin/tests/components/checkbox/CheckboxIcon.java
diff --git a/tests/src/com/vaadin/tests/components/combobox/ComboBoxClosePopupRetainText.html b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxClosePopupRetainText.html
index 9248938b28..9248938b28 100644
--- a/tests/src/com/vaadin/tests/components/combobox/ComboBoxClosePopupRetainText.html
+++ b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxClosePopupRetainText.html
diff --git a/tests/src/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcut.html b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcut.html
index 1689c7c1fc..1689c7c1fc 100644
--- a/tests/src/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcut.html
+++ b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcut.html
diff --git a/tests/src/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcut.java b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcut.java
index 88a403b1b6..88a403b1b6 100644
--- a/tests/src/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcut.java
+++ b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcut.java
diff --git a/tests/src/com/vaadin/tests/components/combobox/ComboBoxDataSourceChange.html b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxDataSourceChange.html
index cab8bbc996..cab8bbc996 100644
--- a/tests/src/com/vaadin/tests/components/combobox/ComboBoxDataSourceChange.html
+++ b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxDataSourceChange.html
diff --git a/tests/src/com/vaadin/tests/components/combobox/ComboBoxDataSourceChange.java b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxDataSourceChange.java
index adeaede187..adeaede187 100644
--- a/tests/src/com/vaadin/tests/components/combobox/ComboBoxDataSourceChange.java
+++ b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxDataSourceChange.java
diff --git a/tests/src/com/vaadin/tests/components/combobox/ComboBoxEnablesComboBox.java b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxEnablesComboBox.java
index 6178d25a2a..6178d25a2a 100644
--- a/tests/src/com/vaadin/tests/components/combobox/ComboBoxEnablesComboBox.java
+++ b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxEnablesComboBox.java
diff --git a/tests/src/com/vaadin/tests/components/combobox/ComboBoxInPopupView.java b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxInPopupView.java
index 5a488e5dc5..5a488e5dc5 100644
--- a/tests/src/com/vaadin/tests/components/combobox/ComboBoxInPopupView.java
+++ b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxInPopupView.java
diff --git a/tests/src/com/vaadin/tests/components/combobox/ComboBoxInvalidNullSelection.html b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxInvalidNullSelection.html
index bbe5d5d717..bbe5d5d717 100644
--- a/tests/src/com/vaadin/tests/components/combobox/ComboBoxInvalidNullSelection.html
+++ b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxInvalidNullSelection.html
diff --git a/tests/src/com/vaadin/tests/components/combobox/ComboBoxInvalidNullSelection.java b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxInvalidNullSelection.java
index 2fcb44d4f2..2fcb44d4f2 100644
--- a/tests/src/com/vaadin/tests/components/combobox/ComboBoxInvalidNullSelection.java
+++ b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxInvalidNullSelection.java
diff --git a/tests/src/com/vaadin/tests/components/combobox/ComboBoxItemIcon.html b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxItemIcon.html
index 6e6e87bc7e..6e6e87bc7e 100644
--- a/tests/src/com/vaadin/tests/components/combobox/ComboBoxItemIcon.html
+++ b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxItemIcon.html
diff --git a/tests/src/com/vaadin/tests/components/combobox/ComboBoxItemIcon.java b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxItemIcon.java
index 75325b798f..75325b798f 100644
--- a/tests/src/com/vaadin/tests/components/combobox/ComboBoxItemIcon.java
+++ b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxItemIcon.java
diff --git a/tests/src/com/vaadin/tests/components/combobox/ComboBoxLargeIcons.html b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxLargeIcons.html
index a46f48fcfc..a46f48fcfc 100644
--- a/tests/src/com/vaadin/tests/components/combobox/ComboBoxLargeIcons.html
+++ b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxLargeIcons.html
diff --git a/tests/src/com/vaadin/tests/components/combobox/ComboBoxLargeIcons.java b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxLargeIcons.java
index 0f8124ca20..0f8124ca20 100644
--- a/tests/src/com/vaadin/tests/components/combobox/ComboBoxLargeIcons.java
+++ b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxLargeIcons.java
diff --git a/tests/src/com/vaadin/tests/components/combobox/ComboBoxNavigation.html b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxNavigation.html
index 03de00a6f1..03de00a6f1 100644
--- a/tests/src/com/vaadin/tests/components/combobox/ComboBoxNavigation.html
+++ b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxNavigation.html
diff --git a/tests/src/com/vaadin/tests/components/combobox/ComboBoxNavigation.java b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxNavigation.java
index 245fc123df..245fc123df 100644
--- a/tests/src/com/vaadin/tests/components/combobox/ComboBoxNavigation.java
+++ b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxNavigation.java
diff --git a/tests/src/com/vaadin/tests/components/combobox/ComboBoxNoTextInput.html b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxNoTextInput.html
index 2066da47c1..2066da47c1 100644
--- a/tests/src/com/vaadin/tests/components/combobox/ComboBoxNoTextInput.html
+++ b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxNoTextInput.html
diff --git a/tests/src/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.html b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.html
index 50b95bfdc2..50b95bfdc2 100644
--- a/tests/src/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.html
+++ b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.html
diff --git a/tests/src/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java
index 0e295231c5..0e295231c5 100644
--- a/tests/src/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java
+++ b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java
diff --git a/tests/src/com/vaadin/tests/components/combobox/ComboBoxRemoveAllItems.html b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxRemoveAllItems.html
index eec15d0b40..eec15d0b40 100644
--- a/tests/src/com/vaadin/tests/components/combobox/ComboBoxRemoveAllItems.html
+++ b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxRemoveAllItems.html
diff --git a/tests/src/com/vaadin/tests/components/combobox/ComboBoxSlowInFF.java b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxSlowInFF.java
index 5c1dad4a30..5c1dad4a30 100644
--- a/tests/src/com/vaadin/tests/components/combobox/ComboBoxSlowInFF.java
+++ b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxSlowInFF.java
diff --git a/tests/src/com/vaadin/tests/components/combobox/ComboBoxSuggestionOnDetach.html b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxSuggestionOnDetach.html
index ba251e5cc0..ba251e5cc0 100644
--- a/tests/src/com/vaadin/tests/components/combobox/ComboBoxSuggestionOnDetach.html
+++ b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxSuggestionOnDetach.html
diff --git a/tests/src/com/vaadin/tests/components/combobox/ComboBoxSuggestionOnDetach.java b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxSuggestionOnDetach.java
index 134e13e49c..134e13e49c 100644
--- a/tests/src/com/vaadin/tests/components/combobox/ComboBoxSuggestionOnDetach.java
+++ b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxSuggestionOnDetach.java
diff --git a/tests/src/com/vaadin/tests/components/combobox/ComboBoxTextFieldEventOrder.java b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxTextFieldEventOrder.java
index 31979a6a90..31979a6a90 100644
--- a/tests/src/com/vaadin/tests/components/combobox/ComboBoxTextFieldEventOrder.java
+++ b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxTextFieldEventOrder.java
diff --git a/tests/src/com/vaadin/tests/components/combobox/ComboBoxUndefinedWidthAndIcon.html b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxUndefinedWidthAndIcon.html
index ae0dfec828..ae0dfec828 100644
--- a/tests/src/com/vaadin/tests/components/combobox/ComboBoxUndefinedWidthAndIcon.html
+++ b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxUndefinedWidthAndIcon.html
diff --git a/tests/src/com/vaadin/tests/components/combobox/ComboBoxUndefinedWidthAndIcon.java b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxUndefinedWidthAndIcon.java
index fd5f7d47f8..fd5f7d47f8 100644
--- a/tests/src/com/vaadin/tests/components/combobox/ComboBoxUndefinedWidthAndIcon.java
+++ b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxUndefinedWidthAndIcon.java
diff --git a/tests/src/com/vaadin/tests/components/combobox/ComboBoxValueInput.html b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxValueInput.html
index 2aab40f13f..2aab40f13f 100644
--- a/tests/src/com/vaadin/tests/components/combobox/ComboBoxValueInput.html
+++ b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxValueInput.html
diff --git a/tests/src/com/vaadin/tests/components/combobox/ComboBoxValueInput.java b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxValueInput.java
index 177b3542a4..177b3542a4 100644
--- a/tests/src/com/vaadin/tests/components/combobox/ComboBoxValueInput.java
+++ b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxValueInput.java
diff --git a/tests/src/com/vaadin/tests/components/combobox/ComboBoxValueUpdate.java b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxValueUpdate.java
index b8f7a9758d..b8f7a9758d 100644
--- a/tests/src/com/vaadin/tests/components/combobox/ComboBoxValueUpdate.java
+++ b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxValueUpdate.java
diff --git a/tests/src/com/vaadin/tests/components/combobox/ComboBoxes2.java b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxes2.java
index 8befbb4612..8befbb4612 100644
--- a/tests/src/com/vaadin/tests/components/combobox/ComboBoxes2.java
+++ b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxes2.java
diff --git a/tests/src/com/vaadin/tests/components/combobox/ComboFocusBlurEvents.html b/tests/testbench/com/vaadin/tests/components/combobox/ComboFocusBlurEvents.html
index 4d91ce7838..4d91ce7838 100644
--- a/tests/src/com/vaadin/tests/components/combobox/ComboFocusBlurEvents.html
+++ b/tests/testbench/com/vaadin/tests/components/combobox/ComboFocusBlurEvents.html
diff --git a/tests/src/com/vaadin/tests/components/combobox/ComboFocusBlurEvents.java b/tests/testbench/com/vaadin/tests/components/combobox/ComboFocusBlurEvents.java
index 6681342ea6..6681342ea6 100644
--- a/tests/src/com/vaadin/tests/components/combobox/ComboFocusBlurEvents.java
+++ b/tests/testbench/com/vaadin/tests/components/combobox/ComboFocusBlurEvents.java
diff --git a/tests/src/com/vaadin/tests/components/combobox/Comboboxes.html b/tests/testbench/com/vaadin/tests/components/combobox/Comboboxes.html
index 1affc9a8a9..1affc9a8a9 100644
--- a/tests/src/com/vaadin/tests/components/combobox/Comboboxes.html
+++ b/tests/testbench/com/vaadin/tests/components/combobox/Comboboxes.html
diff --git a/tests/src/com/vaadin/tests/components/combobox/Comboboxes.java b/tests/testbench/com/vaadin/tests/components/combobox/Comboboxes.java
index 94ab20df43..94ab20df43 100644
--- a/tests/src/com/vaadin/tests/components/combobox/Comboboxes.java
+++ b/tests/testbench/com/vaadin/tests/components/combobox/Comboboxes.java
diff --git a/tests/src/com/vaadin/tests/components/combobox/ComboxBoxErrorMessage.java b/tests/testbench/com/vaadin/tests/components/combobox/ComboxBoxErrorMessage.java
index a6eaf7d3e6..a6eaf7d3e6 100644
--- a/tests/src/com/vaadin/tests/components/combobox/ComboxBoxErrorMessage.java
+++ b/tests/testbench/com/vaadin/tests/components/combobox/ComboxBoxErrorMessage.java
diff --git a/tests/src/com/vaadin/tests/components/combobox/NewItemsESCPress.java b/tests/testbench/com/vaadin/tests/components/combobox/NewItemsESCPress.java
index d93db563e3..d93db563e3 100644
--- a/tests/src/com/vaadin/tests/components/combobox/NewItemsESCPress.java
+++ b/tests/testbench/com/vaadin/tests/components/combobox/NewItemsESCPress.java
diff --git a/tests/src/com/vaadin/tests/components/combobox/fi.gif b/tests/testbench/com/vaadin/tests/components/combobox/fi.gif
index 8d3a191828..8d3a191828 100755
--- a/tests/src/com/vaadin/tests/components/combobox/fi.gif
+++ b/tests/testbench/com/vaadin/tests/components/combobox/fi.gif
diff --git a/tests/src/com/vaadin/tests/components/combobox/se.gif b/tests/testbench/com/vaadin/tests/components/combobox/se.gif
index 80f6285228..80f6285228 100755
--- a/tests/src/com/vaadin/tests/components/combobox/se.gif
+++ b/tests/testbench/com/vaadin/tests/components/combobox/se.gif
diff --git a/tests/src/com/vaadin/tests/components/customcomponent/ClipContent.java b/tests/testbench/com/vaadin/tests/components/customcomponent/ClipContent.java
index cc7320ad03..cc7320ad03 100644
--- a/tests/src/com/vaadin/tests/components/customcomponent/ClipContent.java
+++ b/tests/testbench/com/vaadin/tests/components/customcomponent/ClipContent.java
diff --git a/tests/src/com/vaadin/tests/components/customcomponent/CustomComponentGrowingContent.html b/tests/testbench/com/vaadin/tests/components/customcomponent/CustomComponentGrowingContent.html
index 0a1b7212c9..0a1b7212c9 100644
--- a/tests/src/com/vaadin/tests/components/customcomponent/CustomComponentGrowingContent.html
+++ b/tests/testbench/com/vaadin/tests/components/customcomponent/CustomComponentGrowingContent.html
diff --git a/tests/src/com/vaadin/tests/components/customcomponent/CustomComponentGrowingContent.java b/tests/testbench/com/vaadin/tests/components/customcomponent/CustomComponentGrowingContent.java
index 9a559f7414..9a559f7414 100644
--- a/tests/src/com/vaadin/tests/components/customcomponent/CustomComponentGrowingContent.java
+++ b/tests/testbench/com/vaadin/tests/components/customcomponent/CustomComponentGrowingContent.java
diff --git a/tests/src/com/vaadin/tests/components/customcomponent/CustomComponentSizeUpdate.java b/tests/testbench/com/vaadin/tests/components/customcomponent/CustomComponentSizeUpdate.java
index 575a1651e3..575a1651e3 100644
--- a/tests/src/com/vaadin/tests/components/customcomponent/CustomComponentSizeUpdate.java
+++ b/tests/testbench/com/vaadin/tests/components/customcomponent/CustomComponentSizeUpdate.java
diff --git a/tests/src/com/vaadin/tests/components/customcomponent/EmbeddedInCustomComponent.html b/tests/testbench/com/vaadin/tests/components/customcomponent/EmbeddedInCustomComponent.html
index 268d3074f7..268d3074f7 100644
--- a/tests/src/com/vaadin/tests/components/customcomponent/EmbeddedInCustomComponent.html
+++ b/tests/testbench/com/vaadin/tests/components/customcomponent/EmbeddedInCustomComponent.html
diff --git a/tests/src/com/vaadin/tests/components/customcomponent/EmbeddedInCustomComponent.java b/tests/testbench/com/vaadin/tests/components/customcomponent/EmbeddedInCustomComponent.java
index 8a37d85b31..8a37d85b31 100644
--- a/tests/src/com/vaadin/tests/components/customcomponent/EmbeddedInCustomComponent.java
+++ b/tests/testbench/com/vaadin/tests/components/customcomponent/EmbeddedInCustomComponent.java
diff --git a/tests/src/com/vaadin/tests/components/datefield/CommitInvalid.html b/tests/testbench/com/vaadin/tests/components/datefield/CommitInvalid.html
index 9c498f1df2..9c498f1df2 100644
--- a/tests/src/com/vaadin/tests/components/datefield/CommitInvalid.html
+++ b/tests/testbench/com/vaadin/tests/components/datefield/CommitInvalid.html
diff --git a/tests/src/com/vaadin/tests/components/datefield/CommitInvalid.java b/tests/testbench/com/vaadin/tests/components/datefield/CommitInvalid.java
index 36ee068af4..36ee068af4 100644
--- a/tests/src/com/vaadin/tests/components/datefield/CommitInvalid.java
+++ b/tests/testbench/com/vaadin/tests/components/datefield/CommitInvalid.java
diff --git a/tests/src/com/vaadin/tests/components/datefield/CustomDateFormat.html b/tests/testbench/com/vaadin/tests/components/datefield/CustomDateFormat.html
index 5561fd37cb..5561fd37cb 100644
--- a/tests/src/com/vaadin/tests/components/datefield/CustomDateFormat.html
+++ b/tests/testbench/com/vaadin/tests/components/datefield/CustomDateFormat.html
diff --git a/tests/src/com/vaadin/tests/components/datefield/CustomDateFormat.java b/tests/testbench/com/vaadin/tests/components/datefield/CustomDateFormat.java
index 8b4bca5fde..8b4bca5fde 100644
--- a/tests/src/com/vaadin/tests/components/datefield/CustomDateFormat.java
+++ b/tests/testbench/com/vaadin/tests/components/datefield/CustomDateFormat.java
diff --git a/tests/src/com/vaadin/tests/components/datefield/CustomDateFormats.html b/tests/testbench/com/vaadin/tests/components/datefield/CustomDateFormats.html
index 2c2dc1bd42..2c2dc1bd42 100644
--- a/tests/src/com/vaadin/tests/components/datefield/CustomDateFormats.html
+++ b/tests/testbench/com/vaadin/tests/components/datefield/CustomDateFormats.html
diff --git a/tests/src/com/vaadin/tests/components/datefield/CustomDateFormats.java b/tests/testbench/com/vaadin/tests/components/datefield/CustomDateFormats.java
index 7f67af1adc..7f67af1adc 100644
--- a/tests/src/com/vaadin/tests/components/datefield/CustomDateFormats.java
+++ b/tests/testbench/com/vaadin/tests/components/datefield/CustomDateFormats.java
diff --git a/tests/src/com/vaadin/tests/components/datefield/DateFieldEmptyValid.html b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldEmptyValid.html
index 751c7ba9bd..751c7ba9bd 100644
--- a/tests/src/com/vaadin/tests/components/datefield/DateFieldEmptyValid.html
+++ b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldEmptyValid.html
diff --git a/tests/src/com/vaadin/tests/components/datefield/DateFieldEmptyValid.java b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldEmptyValid.java
index 53b1d253ab..53b1d253ab 100644
--- a/tests/src/com/vaadin/tests/components/datefield/DateFieldEmptyValid.java
+++ b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldEmptyValid.java
diff --git a/tests/src/com/vaadin/tests/components/datefield/DateFieldInSubWindow.html b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldInSubWindow.html
index f2ef2123f6..f2ef2123f6 100644
--- a/tests/src/com/vaadin/tests/components/datefield/DateFieldInSubWindow.html
+++ b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldInSubWindow.html
diff --git a/tests/src/com/vaadin/tests/components/datefield/DateFieldInSubWindow.java b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldInSubWindow.java
index 18bc719850..18bc719850 100644
--- a/tests/src/com/vaadin/tests/components/datefield/DateFieldInSubWindow.java
+++ b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldInSubWindow.java
diff --git a/tests/src/com/vaadin/tests/components/datefield/DateFieldLocale.java b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldLocale.java
index fbeeb872d7..fbeeb872d7 100644
--- a/tests/src/com/vaadin/tests/components/datefield/DateFieldLocale.java
+++ b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldLocale.java
diff --git a/tests/src/com/vaadin/tests/components/datefield/DateFieldMinResolution.java b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldMinResolution.java
index e7c3442060..e7c3442060 100644
--- a/tests/src/com/vaadin/tests/components/datefield/DateFieldMinResolution.java
+++ b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldMinResolution.java
diff --git a/tests/src/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.html b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.html
index 6bc285ee72..6bc285ee72 100644
--- a/tests/src/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.html
+++ b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.html
diff --git a/tests/src/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.java b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.java
index cb3fc1f916..cb3fc1f916 100644
--- a/tests/src/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.java
+++ b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.java
diff --git a/tests/src/com/vaadin/tests/components/datefield/DateFieldReadOnly.html b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldReadOnly.html
index ee19b52324..ee19b52324 100644
--- a/tests/src/com/vaadin/tests/components/datefield/DateFieldReadOnly.html
+++ b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldReadOnly.html
diff --git a/tests/src/com/vaadin/tests/components/datefield/DateFieldReadOnly.java b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldReadOnly.java
index 3084eab32b..3084eab32b 100644
--- a/tests/src/com/vaadin/tests/components/datefield/DateFieldReadOnly.java
+++ b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldReadOnly.java
diff --git a/tests/src/com/vaadin/tests/components/datefield/DateFieldTest.java b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldTest.java
index cf433257bb..cf433257bb 100644
--- a/tests/src/com/vaadin/tests/components/datefield/DateFieldTest.java
+++ b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldTest.java
diff --git a/tests/src/com/vaadin/tests/components/datefield/DateFieldTimezone.html b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldTimezone.html
index ca354dd240..ca354dd240 100644
--- a/tests/src/com/vaadin/tests/components/datefield/DateFieldTimezone.html
+++ b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldTimezone.html
diff --git a/tests/src/com/vaadin/tests/components/datefield/DateFieldTimezone.java b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldTimezone.java
index 6562e5412e..6562e5412e 100644
--- a/tests/src/com/vaadin/tests/components/datefield/DateFieldTimezone.java
+++ b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldTimezone.java
diff --git a/tests/src/com/vaadin/tests/components/datefield/DateFieldUnparsableDate.java b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldUnparsableDate.java
index 32456e34c5..32456e34c5 100644
--- a/tests/src/com/vaadin/tests/components/datefield/DateFieldUnparsableDate.java
+++ b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldUnparsableDate.java
diff --git a/tests/src/com/vaadin/tests/components/datefield/DefaultHandleUnparsableDateField.java b/tests/testbench/com/vaadin/tests/components/datefield/DefaultHandleUnparsableDateField.java
index bcdc8260b0..bcdc8260b0 100644
--- a/tests/src/com/vaadin/tests/components/datefield/DefaultHandleUnparsableDateField.java
+++ b/tests/testbench/com/vaadin/tests/components/datefield/DefaultHandleUnparsableDateField.java
diff --git a/tests/src/com/vaadin/tests/components/datefield/DisabledDateFieldWidth b/tests/testbench/com/vaadin/tests/components/datefield/DisabledDateFieldWidth
index 48b11e1f7c..48b11e1f7c 100644
--- a/tests/src/com/vaadin/tests/components/datefield/DisabledDateFieldWidth
+++ b/tests/testbench/com/vaadin/tests/components/datefield/DisabledDateFieldWidth
diff --git a/tests/src/com/vaadin/tests/components/datefield/DisabledDateFieldWidth.java b/tests/testbench/com/vaadin/tests/components/datefield/DisabledDateFieldWidth.java
index 33156b9a75..33156b9a75 100644
--- a/tests/src/com/vaadin/tests/components/datefield/DisabledDateFieldWidth.java
+++ b/tests/testbench/com/vaadin/tests/components/datefield/DisabledDateFieldWidth.java
diff --git a/tests/src/com/vaadin/tests/components/datefield/InlineDateFieldResolutionMsec.html b/tests/testbench/com/vaadin/tests/components/datefield/InlineDateFieldResolutionMsec.html
index 58809a1836..58809a1836 100644
--- a/tests/src/com/vaadin/tests/components/datefield/InlineDateFieldResolutionMsec.html
+++ b/tests/testbench/com/vaadin/tests/components/datefield/InlineDateFieldResolutionMsec.html
diff --git a/tests/src/com/vaadin/tests/components/datefield/InlineDateFieldTest.java b/tests/testbench/com/vaadin/tests/components/datefield/InlineDateFieldTest.java
index c2384584e2..c2384584e2 100644
--- a/tests/src/com/vaadin/tests/components/datefield/InlineDateFieldTest.java
+++ b/tests/testbench/com/vaadin/tests/components/datefield/InlineDateFieldTest.java
diff --git a/tests/src/com/vaadin/tests/components/datefield/InlineDateFieldValueChange.html b/tests/testbench/com/vaadin/tests/components/datefield/InlineDateFieldValueChange.html
index 9e6b9ae75e..9e6b9ae75e 100644
--- a/tests/src/com/vaadin/tests/components/datefield/InlineDateFieldValueChange.html
+++ b/tests/testbench/com/vaadin/tests/components/datefield/InlineDateFieldValueChange.html
diff --git a/tests/src/com/vaadin/tests/components/datefield/InlineDateFields.java b/tests/testbench/com/vaadin/tests/components/datefield/InlineDateFields.java
index 083e8f0190..083e8f0190 100644
--- a/tests/src/com/vaadin/tests/components/datefield/InlineDateFields.java
+++ b/tests/testbench/com/vaadin/tests/components/datefield/InlineDateFields.java
diff --git a/tests/src/com/vaadin/tests/components/datefield/LenientMode.java b/tests/testbench/com/vaadin/tests/components/datefield/LenientMode.java
index cbe9ac613f..cbe9ac613f 100644
--- a/tests/src/com/vaadin/tests/components/datefield/LenientMode.java
+++ b/tests/testbench/com/vaadin/tests/components/datefield/LenientMode.java
diff --git a/tests/src/com/vaadin/tests/components/datefield/LowResolution.java b/tests/testbench/com/vaadin/tests/components/datefield/LowResolution.java
index 1c1994cbe5..1c1994cbe5 100644
--- a/tests/src/com/vaadin/tests/components/datefield/LowResolution.java
+++ b/tests/testbench/com/vaadin/tests/components/datefield/LowResolution.java
diff --git a/tests/src/com/vaadin/tests/components/datefield/NarrowPopupDateFieldInTable.html b/tests/testbench/com/vaadin/tests/components/datefield/NarrowPopupDateFieldInTable.html
index fe95c2476c..fe95c2476c 100644
--- a/tests/src/com/vaadin/tests/components/datefield/NarrowPopupDateFieldInTable.html
+++ b/tests/testbench/com/vaadin/tests/components/datefield/NarrowPopupDateFieldInTable.html
diff --git a/tests/src/com/vaadin/tests/components/datefield/NarrowPopupDateFieldInTable.java b/tests/testbench/com/vaadin/tests/components/datefield/NarrowPopupDateFieldInTable.java
index 73ec3b659e..73ec3b659e 100644
--- a/tests/src/com/vaadin/tests/components/datefield/NarrowPopupDateFieldInTable.java
+++ b/tests/testbench/com/vaadin/tests/components/datefield/NarrowPopupDateFieldInTable.java
diff --git a/tests/src/com/vaadin/tests/components/datefield/PopupDateFieldDisabledReadonly.html b/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldDisabledReadonly.html
index fe7edad28c..fe7edad28c 100644
--- a/tests/src/com/vaadin/tests/components/datefield/PopupDateFieldDisabledReadonly.html
+++ b/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldDisabledReadonly.html
diff --git a/tests/src/com/vaadin/tests/components/datefield/PopupDateFieldMonth.html b/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldMonth.html
index 7e27d44dbb..7e27d44dbb 100644
--- a/tests/src/com/vaadin/tests/components/datefield/PopupDateFieldMonth.html
+++ b/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldMonth.html
diff --git a/tests/src/com/vaadin/tests/components/datefield/PopupDateFieldResolutions.html b/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldResolutions.html
index 6600adafd2..6600adafd2 100644
--- a/tests/src/com/vaadin/tests/components/datefield/PopupDateFieldResolutions.html
+++ b/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldResolutions.html
diff --git a/tests/src/com/vaadin/tests/components/datefield/PopupDateFieldTest.java b/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldTest.java
index ae238b2a91..ae238b2a91 100644
--- a/tests/src/com/vaadin/tests/components/datefield/PopupDateFieldTest.java
+++ b/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldTest.java
diff --git a/tests/src/com/vaadin/tests/components/datefield/PopupDateFields.java b/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFields.java
index 8b9cb68d7b..8b9cb68d7b 100644
--- a/tests/src/com/vaadin/tests/components/datefield/PopupDateFields.java
+++ b/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFields.java
diff --git a/tests/src/com/vaadin/tests/components/datefield/RequiredInvalidDateField.html b/tests/testbench/com/vaadin/tests/components/datefield/RequiredInvalidDateField.html
index 6dc46e4eec..6dc46e4eec 100644
--- a/tests/src/com/vaadin/tests/components/datefield/RequiredInvalidDateField.html
+++ b/tests/testbench/com/vaadin/tests/components/datefield/RequiredInvalidDateField.html
diff --git a/tests/src/com/vaadin/tests/components/datefield/RequiredInvalidDateField.java b/tests/testbench/com/vaadin/tests/components/datefield/RequiredInvalidDateField.java
index 7176dae48b..7176dae48b 100644
--- a/tests/src/com/vaadin/tests/components/datefield/RequiredInvalidDateField.java
+++ b/tests/testbench/com/vaadin/tests/components/datefield/RequiredInvalidDateField.java
diff --git a/tests/src/com/vaadin/tests/components/datefield/ShowSelectedDateAfterInvalid.html b/tests/testbench/com/vaadin/tests/components/datefield/ShowSelectedDateAfterInvalid.html
index df6faa7228..df6faa7228 100644
--- a/tests/src/com/vaadin/tests/components/datefield/ShowSelectedDateAfterInvalid.html
+++ b/tests/testbench/com/vaadin/tests/components/datefield/ShowSelectedDateAfterInvalid.html
diff --git a/tests/src/com/vaadin/tests/components/datefield/ShowSelectedDateAfterInvalid.java b/tests/testbench/com/vaadin/tests/components/datefield/ShowSelectedDateAfterInvalid.java
index fde3d4e56b..fde3d4e56b 100644
--- a/tests/src/com/vaadin/tests/components/datefield/ShowSelectedDateAfterInvalid.java
+++ b/tests/testbench/com/vaadin/tests/components/datefield/ShowSelectedDateAfterInvalid.java
diff --git a/tests/src/com/vaadin/tests/components/datefield/TestDatefieldYear.html b/tests/testbench/com/vaadin/tests/components/datefield/TestDatefieldYear.html
index 71c246593a..71c246593a 100644
--- a/tests/src/com/vaadin/tests/components/datefield/TestDatefieldYear.html
+++ b/tests/testbench/com/vaadin/tests/components/datefield/TestDatefieldYear.html
diff --git a/tests/src/com/vaadin/tests/components/datefield/TestDatefieldYear.java b/tests/testbench/com/vaadin/tests/components/datefield/TestDatefieldYear.java
index 4fa7a6811a..4fa7a6811a 100644
--- a/tests/src/com/vaadin/tests/components/datefield/TestDatefieldYear.java
+++ b/tests/testbench/com/vaadin/tests/components/datefield/TestDatefieldYear.java
diff --git a/tests/src/com/vaadin/tests/components/datefield/TestSettingTimeOnInitiallyNullInlineDateField.html b/tests/testbench/com/vaadin/tests/components/datefield/TestSettingTimeOnInitiallyNullInlineDateField.html
index 40d50f0328..40d50f0328 100644
--- a/tests/src/com/vaadin/tests/components/datefield/TestSettingTimeOnInitiallyNullInlineDateField.html
+++ b/tests/testbench/com/vaadin/tests/components/datefield/TestSettingTimeOnInitiallyNullInlineDateField.html
diff --git a/tests/src/com/vaadin/tests/components/datefield/TestSettingTimeOnInitiallyNullPopupDateField.html b/tests/testbench/com/vaadin/tests/components/datefield/TestSettingTimeOnInitiallyNullPopupDateField.html
index b7f63591f9..b7f63591f9 100644
--- a/tests/src/com/vaadin/tests/components/datefield/TestSettingTimeOnInitiallyNullPopupDateField.html
+++ b/tests/testbench/com/vaadin/tests/components/datefield/TestSettingTimeOnInitiallyNullPopupDateField.html
diff --git a/tests/src/com/vaadin/tests/components/datefield/ValueThroughProperty.html b/tests/testbench/com/vaadin/tests/components/datefield/ValueThroughProperty.html
index ce74f8941e..ce74f8941e 100644
--- a/tests/src/com/vaadin/tests/components/datefield/ValueThroughProperty.html
+++ b/tests/testbench/com/vaadin/tests/components/datefield/ValueThroughProperty.html
diff --git a/tests/src/com/vaadin/tests/components/datefield/ValueThroughProperty.java b/tests/testbench/com/vaadin/tests/components/datefield/ValueThroughProperty.java
index 1f9735b543..1f9735b543 100644
--- a/tests/src/com/vaadin/tests/components/datefield/ValueThroughProperty.java
+++ b/tests/testbench/com/vaadin/tests/components/datefield/ValueThroughProperty.java
diff --git a/tests/src/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinates.html b/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinates.html
index 3afb322a22..3afb322a22 100644
--- a/tests/src/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinates.html
+++ b/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinates.html
diff --git a/tests/src/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinates.java b/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinates.java
index 96b1d36901..96b1d36901 100644
--- a/tests/src/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinates.java
+++ b/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinates.java
diff --git a/tests/src/com/vaadin/tests/components/embedded/EmbeddedFlash.java b/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedFlash.java
index 87e0714545..87e0714545 100644
--- a/tests/src/com/vaadin/tests/components/embedded/EmbeddedFlash.java
+++ b/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedFlash.java
diff --git a/tests/src/com/vaadin/tests/components/embedded/EmbeddedImageRefresh.java b/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedImageRefresh.java
index 1a5327c8b9..1a5327c8b9 100644
--- a/tests/src/com/vaadin/tests/components/embedded/EmbeddedImageRefresh.java
+++ b/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedImageRefresh.java
diff --git a/tests/src/com/vaadin/tests/components/embedded/EmbeddedPdf.java b/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedPdf.java
index bea25a2122..bea25a2122 100644
--- a/tests/src/com/vaadin/tests/components/embedded/EmbeddedPdf.java
+++ b/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedPdf.java
diff --git a/tests/src/com/vaadin/tests/components/embedded/EmbeddedTooltip.java b/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedTooltip.java
index 2ac39c05a0..2ac39c05a0 100644
--- a/tests/src/com/vaadin/tests/components/embedded/EmbeddedTooltip.java
+++ b/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedTooltip.java
diff --git a/tests/src/com/vaadin/tests/components/embedded/FlashIsVisible.html b/tests/testbench/com/vaadin/tests/components/embedded/FlashIsVisible.html
index d3debf3417..d3debf3417 100644
--- a/tests/src/com/vaadin/tests/components/embedded/FlashIsVisible.html
+++ b/tests/testbench/com/vaadin/tests/components/embedded/FlashIsVisible.html
diff --git a/tests/src/com/vaadin/tests/components/embedded/FlashIsVisible.java b/tests/testbench/com/vaadin/tests/components/embedded/FlashIsVisible.java
index 5d626cfc0b..5d626cfc0b 100644
--- a/tests/src/com/vaadin/tests/components/embedded/FlashIsVisible.java
+++ b/tests/testbench/com/vaadin/tests/components/embedded/FlashIsVisible.java
diff --git a/tests/src/com/vaadin/tests/components/embedded/test.pdf b/tests/testbench/com/vaadin/tests/components/embedded/test.pdf
index e44a87e9ad..e44a87e9ad 100644
--- a/tests/src/com/vaadin/tests/components/embedded/test.pdf
+++ b/tests/testbench/com/vaadin/tests/components/embedded/test.pdf
diff --git a/tests/src/com/vaadin/tests/components/form/FormCaptionClickFocusing.html b/tests/testbench/com/vaadin/tests/components/form/FormCaptionClickFocusing.html
index ab0aa25c44..ab0aa25c44 100644
--- a/tests/src/com/vaadin/tests/components/form/FormCaptionClickFocusing.html
+++ b/tests/testbench/com/vaadin/tests/components/form/FormCaptionClickFocusing.html
diff --git a/tests/src/com/vaadin/tests/components/form/FormCaptionClickFocusing.java b/tests/testbench/com/vaadin/tests/components/form/FormCaptionClickFocusing.java
index 4afe289825..4afe289825 100644
--- a/tests/src/com/vaadin/tests/components/form/FormCaptionClickFocusing.java
+++ b/tests/testbench/com/vaadin/tests/components/form/FormCaptionClickFocusing.java
diff --git a/tests/src/com/vaadin/tests/components/form/FormClearDatasourceRepaint.html b/tests/testbench/com/vaadin/tests/components/form/FormClearDatasourceRepaint.html
index 200ddb547d..200ddb547d 100644
--- a/tests/src/com/vaadin/tests/components/form/FormClearDatasourceRepaint.html
+++ b/tests/testbench/com/vaadin/tests/components/form/FormClearDatasourceRepaint.html
diff --git a/tests/src/com/vaadin/tests/components/form/FormClearDatasourceRepaint.java b/tests/testbench/com/vaadin/tests/components/form/FormClearDatasourceRepaint.java
index 39305d5638..39305d5638 100644
--- a/tests/src/com/vaadin/tests/components/form/FormClearDatasourceRepaint.java
+++ b/tests/testbench/com/vaadin/tests/components/form/FormClearDatasourceRepaint.java
diff --git a/tests/src/com/vaadin/tests/components/form/FormCommitWithInvalidValues.html b/tests/testbench/com/vaadin/tests/components/form/FormCommitWithInvalidValues.html
index 0d5b435609..0d5b435609 100644
--- a/tests/src/com/vaadin/tests/components/form/FormCommitWithInvalidValues.html
+++ b/tests/testbench/com/vaadin/tests/components/form/FormCommitWithInvalidValues.html
diff --git a/tests/src/com/vaadin/tests/components/form/FormCommitWithInvalidValues.java b/tests/testbench/com/vaadin/tests/components/form/FormCommitWithInvalidValues.java
index 0a3054b0e4..0a3054b0e4 100644
--- a/tests/src/com/vaadin/tests/components/form/FormCommitWithInvalidValues.java
+++ b/tests/testbench/com/vaadin/tests/components/form/FormCommitWithInvalidValues.java
diff --git a/tests/src/com/vaadin/tests/components/form/FormDescription.html b/tests/testbench/com/vaadin/tests/components/form/FormDescription.html
index a8de9b3ad2..a8de9b3ad2 100644
--- a/tests/src/com/vaadin/tests/components/form/FormDescription.html
+++ b/tests/testbench/com/vaadin/tests/components/form/FormDescription.html
diff --git a/tests/src/com/vaadin/tests/components/form/FormDescription.java b/tests/testbench/com/vaadin/tests/components/form/FormDescription.java
index d05d179ac8..d05d179ac8 100644
--- a/tests/src/com/vaadin/tests/components/form/FormDescription.java
+++ b/tests/testbench/com/vaadin/tests/components/form/FormDescription.java
diff --git a/tests/src/com/vaadin/tests/components/form/FormFieldCaptions.java b/tests/testbench/com/vaadin/tests/components/form/FormFieldCaptions.java
index b4dee985f4..b4dee985f4 100644
--- a/tests/src/com/vaadin/tests/components/form/FormFieldCaptions.java
+++ b/tests/testbench/com/vaadin/tests/components/form/FormFieldCaptions.java
diff --git a/tests/src/com/vaadin/tests/components/form/FormFieldCaptionsStyles.html b/tests/testbench/com/vaadin/tests/components/form/FormFieldCaptionsStyles.html
index 10ebb37529..10ebb37529 100644
--- a/tests/src/com/vaadin/tests/components/form/FormFieldCaptionsStyles.html
+++ b/tests/testbench/com/vaadin/tests/components/form/FormFieldCaptionsStyles.html
diff --git a/tests/src/com/vaadin/tests/components/form/FormFieldCaptionsStyles.java b/tests/testbench/com/vaadin/tests/components/form/FormFieldCaptionsStyles.java
index 863d4b5b80..863d4b5b80 100644
--- a/tests/src/com/vaadin/tests/components/form/FormFieldCaptionsStyles.java
+++ b/tests/testbench/com/vaadin/tests/components/form/FormFieldCaptionsStyles.java
diff --git a/tests/src/com/vaadin/tests/components/form/FormNotGettingSmaller.java b/tests/testbench/com/vaadin/tests/components/form/FormNotGettingSmaller.java
index a47ab944a2..a47ab944a2 100644
--- a/tests/src/com/vaadin/tests/components/form/FormNotGettingSmaller.java
+++ b/tests/testbench/com/vaadin/tests/components/form/FormNotGettingSmaller.java
diff --git a/tests/src/com/vaadin/tests/components/form/FormRenderingFlicker.java b/tests/testbench/com/vaadin/tests/components/form/FormRenderingFlicker.java
index 5858366a63..5858366a63 100644
--- a/tests/src/com/vaadin/tests/components/form/FormRenderingFlicker.java
+++ b/tests/testbench/com/vaadin/tests/components/form/FormRenderingFlicker.java
diff --git a/tests/src/com/vaadin/tests/components/form/FormWithEnterShortCut.java b/tests/testbench/com/vaadin/tests/components/form/FormWithEnterShortCut.java
index 624d0746e9..624d0746e9 100644
--- a/tests/src/com/vaadin/tests/components/form/FormWithEnterShortCut.java
+++ b/tests/testbench/com/vaadin/tests/components/form/FormWithEnterShortCut.java
diff --git a/tests/src/com/vaadin/tests/components/form/FormWithEnterShortcut.html b/tests/testbench/com/vaadin/tests/components/form/FormWithEnterShortcut.html
index 16c5b1cee4..16c5b1cee4 100644
--- a/tests/src/com/vaadin/tests/components/form/FormWithEnterShortcut.html
+++ b/tests/testbench/com/vaadin/tests/components/form/FormWithEnterShortcut.html
diff --git a/tests/src/com/vaadin/tests/components/form/FormWithRelativelySizedLayout.java b/tests/testbench/com/vaadin/tests/components/form/FormWithRelativelySizedLayout.java
index 17fe4477c3..17fe4477c3 100644
--- a/tests/src/com/vaadin/tests/components/form/FormWithRelativelySizedLayout.java
+++ b/tests/testbench/com/vaadin/tests/components/form/FormWithRelativelySizedLayout.java
diff --git a/tests/src/com/vaadin/tests/components/form/UndefinedWideFormWithRelativeWideFooter.html b/tests/testbench/com/vaadin/tests/components/form/UndefinedWideFormWithRelativeWideFooter.html
index ade84de312..ade84de312 100644
--- a/tests/src/com/vaadin/tests/components/form/UndefinedWideFormWithRelativeWideFooter.html
+++ b/tests/testbench/com/vaadin/tests/components/form/UndefinedWideFormWithRelativeWideFooter.html
diff --git a/tests/src/com/vaadin/tests/components/form/UndefinedWideFormWithRelativeWideFooter.java b/tests/testbench/com/vaadin/tests/components/form/UndefinedWideFormWithRelativeWideFooter.java
index cb616d4548..cb616d4548 100644
--- a/tests/src/com/vaadin/tests/components/form/UndefinedWideFormWithRelativeWideFooter.java
+++ b/tests/testbench/com/vaadin/tests/components/form/UndefinedWideFormWithRelativeWideFooter.java
diff --git a/tests/src/com/vaadin/tests/components/formlayout/FormLayoutReplaceComponent.html b/tests/testbench/com/vaadin/tests/components/formlayout/FormLayoutReplaceComponent.html
index ecac497a1b..ecac497a1b 100644
--- a/tests/src/com/vaadin/tests/components/formlayout/FormLayoutReplaceComponent.html
+++ b/tests/testbench/com/vaadin/tests/components/formlayout/FormLayoutReplaceComponent.html
diff --git a/tests/src/com/vaadin/tests/components/formlayout/FormLayoutReplaceComponent.java b/tests/testbench/com/vaadin/tests/components/formlayout/FormLayoutReplaceComponent.java
index e42d64201e..e42d64201e 100644
--- a/tests/src/com/vaadin/tests/components/formlayout/FormLayoutReplaceComponent.java
+++ b/tests/testbench/com/vaadin/tests/components/formlayout/FormLayoutReplaceComponent.java
diff --git a/tests/src/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrolling.html b/tests/testbench/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrolling.html
index 8795ad12dc..8795ad12dc 100644
--- a/tests/src/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrolling.html
+++ b/tests/testbench/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrolling.html
diff --git a/tests/src/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrolling.java b/tests/testbench/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrolling.java
index 157772f8cd..157772f8cd 100644
--- a/tests/src/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrolling.java
+++ b/tests/testbench/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrolling.java
diff --git a/tests/src/com/vaadin/tests/components/gridlayout/MoveComponentFromGridLayoutToInnerLayout.html b/tests/testbench/com/vaadin/tests/components/gridlayout/MoveComponentFromGridLayoutToInnerLayout.html
index 528e3fb379..528e3fb379 100644
--- a/tests/src/com/vaadin/tests/components/gridlayout/MoveComponentFromGridLayoutToInnerLayout.html
+++ b/tests/testbench/com/vaadin/tests/components/gridlayout/MoveComponentFromGridLayoutToInnerLayout.html
diff --git a/tests/src/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayout.java b/tests/testbench/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayout.java
index 08a37dcd9a..08a37dcd9a 100644
--- a/tests/src/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayout.java
+++ b/tests/testbench/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayout.java
diff --git a/tests/src/com/vaadin/tests/components/label/HundredPercentWideLabelResize.html b/tests/testbench/com/vaadin/tests/components/label/HundredPercentWideLabelResize.html
index 667f08ba4f..667f08ba4f 100644
--- a/tests/src/com/vaadin/tests/components/label/HundredPercentWideLabelResize.html
+++ b/tests/testbench/com/vaadin/tests/components/label/HundredPercentWideLabelResize.html
diff --git a/tests/src/com/vaadin/tests/components/label/HundredPercentWideLabelResize.java b/tests/testbench/com/vaadin/tests/components/label/HundredPercentWideLabelResize.java
index 1d2fb2a59c..1d2fb2a59c 100644
--- a/tests/src/com/vaadin/tests/components/label/HundredPercentWideLabelResize.java
+++ b/tests/testbench/com/vaadin/tests/components/label/HundredPercentWideLabelResize.java
diff --git a/tests/src/com/vaadin/tests/components/label/LabelModes.html b/tests/testbench/com/vaadin/tests/components/label/LabelModes.html
index 356688b456..356688b456 100644
--- a/tests/src/com/vaadin/tests/components/label/LabelModes.html
+++ b/tests/testbench/com/vaadin/tests/components/label/LabelModes.html
diff --git a/tests/src/com/vaadin/tests/components/label/LabelModes.java b/tests/testbench/com/vaadin/tests/components/label/LabelModes.java
index 4b58794a87..4b58794a87 100644
--- a/tests/src/com/vaadin/tests/components/label/LabelModes.java
+++ b/tests/testbench/com/vaadin/tests/components/label/LabelModes.java
diff --git a/tests/src/com/vaadin/tests/components/label/LabelTest.java b/tests/testbench/com/vaadin/tests/components/label/LabelTest.java
index 38ced67f18..38ced67f18 100644
--- a/tests/src/com/vaadin/tests/components/label/LabelTest.java
+++ b/tests/testbench/com/vaadin/tests/components/label/LabelTest.java
diff --git a/tests/src/com/vaadin/tests/components/label/LabelTooltip.html b/tests/testbench/com/vaadin/tests/components/label/LabelTooltip.html
index 0fbd3353c9..0fbd3353c9 100644
--- a/tests/src/com/vaadin/tests/components/label/LabelTooltip.html
+++ b/tests/testbench/com/vaadin/tests/components/label/LabelTooltip.html
diff --git a/tests/src/com/vaadin/tests/components/label/LabelTooltip.java b/tests/testbench/com/vaadin/tests/components/label/LabelTooltip.java
index aa1b357cad..aa1b357cad 100644
--- a/tests/src/com/vaadin/tests/components/label/LabelTooltip.java
+++ b/tests/testbench/com/vaadin/tests/components/label/LabelTooltip.java
diff --git a/tests/src/com/vaadin/tests/components/label/LabelWrapping.html b/tests/testbench/com/vaadin/tests/components/label/LabelWrapping.html
index b8038a75b4..b8038a75b4 100644
--- a/tests/src/com/vaadin/tests/components/label/LabelWrapping.html
+++ b/tests/testbench/com/vaadin/tests/components/label/LabelWrapping.html
diff --git a/tests/src/com/vaadin/tests/components/label/LabelWrapping.java b/tests/testbench/com/vaadin/tests/components/label/LabelWrapping.java
index a06d0b1351..a06d0b1351 100644
--- a/tests/src/com/vaadin/tests/components/label/LabelWrapping.java
+++ b/tests/testbench/com/vaadin/tests/components/label/LabelWrapping.java
diff --git a/tests/src/com/vaadin/tests/components/label/Labels.html b/tests/testbench/com/vaadin/tests/components/label/Labels.html
index 46ff066d8c..46ff066d8c 100644
--- a/tests/src/com/vaadin/tests/components/label/Labels.html
+++ b/tests/testbench/com/vaadin/tests/components/label/Labels.html
diff --git a/tests/src/com/vaadin/tests/components/label/Labels.java b/tests/testbench/com/vaadin/tests/components/label/Labels.java
index ad648e7404..ad648e7404 100644
--- a/tests/src/com/vaadin/tests/components/label/Labels.java
+++ b/tests/testbench/com/vaadin/tests/components/label/Labels.java
diff --git a/tests/src/com/vaadin/tests/components/link/LinkIcon.java b/tests/testbench/com/vaadin/tests/components/link/LinkIcon.java
index 372417a45c..372417a45c 100644
--- a/tests/src/com/vaadin/tests/components/link/LinkIcon.java
+++ b/tests/testbench/com/vaadin/tests/components/link/LinkIcon.java
diff --git a/tests/src/com/vaadin/tests/components/link/LinkTargetSize.java b/tests/testbench/com/vaadin/tests/components/link/LinkTargetSize.java
index d5542cab04..d5542cab04 100644
--- a/tests/src/com/vaadin/tests/components/link/LinkTargetSize.java
+++ b/tests/testbench/com/vaadin/tests/components/link/LinkTargetSize.java
diff --git a/tests/src/com/vaadin/tests/components/link/LinkToPercentage.html b/tests/testbench/com/vaadin/tests/components/link/LinkToPercentage.html
index 7dff317288..7dff317288 100644
--- a/tests/src/com/vaadin/tests/components/link/LinkToPercentage.html
+++ b/tests/testbench/com/vaadin/tests/components/link/LinkToPercentage.html
diff --git a/tests/src/com/vaadin/tests/components/link/LinkToPercentage.java b/tests/testbench/com/vaadin/tests/components/link/LinkToPercentage.java
index ce8626444c..ce8626444c 100644
--- a/tests/src/com/vaadin/tests/components/link/LinkToPercentage.java
+++ b/tests/testbench/com/vaadin/tests/components/link/LinkToPercentage.java
diff --git a/tests/src/com/vaadin/tests/components/listselect/ListSelectSelection.html b/tests/testbench/com/vaadin/tests/components/listselect/ListSelectSelection.html
index 9820e044f7..9820e044f7 100644
--- a/tests/src/com/vaadin/tests/components/listselect/ListSelectSelection.html
+++ b/tests/testbench/com/vaadin/tests/components/listselect/ListSelectSelection.html
diff --git a/tests/src/com/vaadin/tests/components/listselect/ListSelects.java b/tests/testbench/com/vaadin/tests/components/listselect/ListSelects.java
index 8a04da1bce..8a04da1bce 100644
--- a/tests/src/com/vaadin/tests/components/listselect/ListSelects.java
+++ b/tests/testbench/com/vaadin/tests/components/listselect/ListSelects.java
diff --git a/tests/src/com/vaadin/tests/components/loginform/CustomizedLoginFormTest.html b/tests/testbench/com/vaadin/tests/components/loginform/CustomizedLoginFormTest.html
index 5a2a0d839a..5a2a0d839a 100644
--- a/tests/src/com/vaadin/tests/components/loginform/CustomizedLoginFormTest.html
+++ b/tests/testbench/com/vaadin/tests/components/loginform/CustomizedLoginFormTest.html
diff --git a/tests/src/com/vaadin/tests/components/loginform/CustomizedLoginFormTest.java b/tests/testbench/com/vaadin/tests/components/loginform/CustomizedLoginFormTest.java
index 3fde281c20..3fde281c20 100644
--- a/tests/src/com/vaadin/tests/components/loginform/CustomizedLoginFormTest.java
+++ b/tests/testbench/com/vaadin/tests/components/loginform/CustomizedLoginFormTest.java
diff --git a/tests/src/com/vaadin/tests/components/loginform/LoginFormTest.html b/tests/testbench/com/vaadin/tests/components/loginform/LoginFormTest.html
index daaefab48c..daaefab48c 100644
--- a/tests/src/com/vaadin/tests/components/loginform/LoginFormTest.html
+++ b/tests/testbench/com/vaadin/tests/components/loginform/LoginFormTest.html
diff --git a/tests/src/com/vaadin/tests/components/loginform/LoginFormTest.java b/tests/testbench/com/vaadin/tests/components/loginform/LoginFormTest.java
index bbc7d2ca7e..bbc7d2ca7e 100644
--- a/tests/src/com/vaadin/tests/components/loginform/LoginFormTest.java
+++ b/tests/testbench/com/vaadin/tests/components/loginform/LoginFormTest.java
diff --git a/tests/src/com/vaadin/tests/components/loginform/LoginFormWithMultipleWindows.java b/tests/testbench/com/vaadin/tests/components/loginform/LoginFormWithMultipleWindows.java
index 341caecc9f..341caecc9f 100644
--- a/tests/src/com/vaadin/tests/components/loginform/LoginFormWithMultipleWindows.java
+++ b/tests/testbench/com/vaadin/tests/components/loginform/LoginFormWithMultipleWindows.java
diff --git a/tests/src/com/vaadin/tests/components/media/Media.java b/tests/testbench/com/vaadin/tests/components/media/Media.java
index 2df622c35f..2df622c35f 100644
--- a/tests/src/com/vaadin/tests/components/media/Media.java
+++ b/tests/testbench/com/vaadin/tests/components/media/Media.java
diff --git a/tests/src/com/vaadin/tests/components/menubar/HiddenAndDisabledMenus.java b/tests/testbench/com/vaadin/tests/components/menubar/HiddenAndDisabledMenus.java
index ef5d5ad395..ef5d5ad395 100644
--- a/tests/src/com/vaadin/tests/components/menubar/HiddenAndDisabledMenus.java
+++ b/tests/testbench/com/vaadin/tests/components/menubar/HiddenAndDisabledMenus.java
diff --git a/tests/src/com/vaadin/tests/components/menubar/IconsInRootMenuBar.html b/tests/testbench/com/vaadin/tests/components/menubar/IconsInRootMenuBar.html
index 91539ff359..91539ff359 100644
--- a/tests/src/com/vaadin/tests/components/menubar/IconsInRootMenuBar.html
+++ b/tests/testbench/com/vaadin/tests/components/menubar/IconsInRootMenuBar.html
diff --git a/tests/src/com/vaadin/tests/components/menubar/IconsInSubMenus.html b/tests/testbench/com/vaadin/tests/components/menubar/IconsInSubMenus.html
index e1a63789ca..e1a63789ca 100644
--- a/tests/src/com/vaadin/tests/components/menubar/IconsInSubMenus.html
+++ b/tests/testbench/com/vaadin/tests/components/menubar/IconsInSubMenus.html
diff --git a/tests/src/com/vaadin/tests/components/menubar/MenuBarHtmlItems.html b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarHtmlItems.html
index 2878018752..2878018752 100644
--- a/tests/src/com/vaadin/tests/components/menubar/MenuBarHtmlItems.html
+++ b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarHtmlItems.html
diff --git a/tests/src/com/vaadin/tests/components/menubar/MenuBarHtmlItems.java b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarHtmlItems.java
index ba22bcb7a4..ba22bcb7a4 100644
--- a/tests/src/com/vaadin/tests/components/menubar/MenuBarHtmlItems.java
+++ b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarHtmlItems.java
diff --git a/tests/src/com/vaadin/tests/components/menubar/MenuBarInSplitPanel.java b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarInSplitPanel.java
index 4a41f8d8dc..4a41f8d8dc 100644
--- a/tests/src/com/vaadin/tests/components/menubar/MenuBarInSplitPanel.java
+++ b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarInSplitPanel.java
diff --git a/tests/src/com/vaadin/tests/components/menubar/MenuBarItemsCheckable.html b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarItemsCheckable.html
index ebdfa81f20..ebdfa81f20 100644
--- a/tests/src/com/vaadin/tests/components/menubar/MenuBarItemsCheckable.html
+++ b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarItemsCheckable.html
diff --git a/tests/src/com/vaadin/tests/components/menubar/MenuBarLongMenus.html b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarLongMenus.html
index 7170a98325..7170a98325 100644
--- a/tests/src/com/vaadin/tests/components/menubar/MenuBarLongMenus.html
+++ b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarLongMenus.html
diff --git a/tests/src/com/vaadin/tests/components/menubar/MenuBarNavigation.java b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarNavigation.java
index 54b2f986a4..54b2f986a4 100644
--- a/tests/src/com/vaadin/tests/components/menubar/MenuBarNavigation.java
+++ b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarNavigation.java
diff --git a/tests/src/com/vaadin/tests/components/menubar/MenuBarNavigationKeyboard.html b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarNavigationKeyboard.html
index 172d203f50..172d203f50 100644
--- a/tests/src/com/vaadin/tests/components/menubar/MenuBarNavigationKeyboard.html
+++ b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarNavigationKeyboard.html
diff --git a/tests/src/com/vaadin/tests/components/menubar/MenuBarNavigationMouse.html b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarNavigationMouse.html
index 20840993fa..20840993fa 100644
--- a/tests/src/com/vaadin/tests/components/menubar/MenuBarNavigationMouse.html
+++ b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarNavigationMouse.html
diff --git a/tests/src/com/vaadin/tests/components/menubar/MenuBarResize.html b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarResize.html
index 97006323a2..97006323a2 100644
--- a/tests/src/com/vaadin/tests/components/menubar/MenuBarResize.html
+++ b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarResize.html
diff --git a/tests/src/com/vaadin/tests/components/menubar/MenuBarRootItemSelectWithKeyboard.html b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarRootItemSelectWithKeyboard.html
index a53757a969..a53757a969 100644
--- a/tests/src/com/vaadin/tests/components/menubar/MenuBarRootItemSelectWithKeyboard.html
+++ b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarRootItemSelectWithKeyboard.html
diff --git a/tests/src/com/vaadin/tests/components/menubar/MenuBarRootItemSelectWithKeyboard.java b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarRootItemSelectWithKeyboard.java
index f162386336..f162386336 100644
--- a/tests/src/com/vaadin/tests/components/menubar/MenuBarRootItemSelectWithKeyboard.java
+++ b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarRootItemSelectWithKeyboard.java
diff --git a/tests/src/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.html b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.html
index 330a92898c..330a92898c 100755
--- a/tests/src/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.html
+++ b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.html
diff --git a/tests/src/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.java b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.java
index 314df2c8a4..314df2c8a4 100644
--- a/tests/src/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.java
+++ b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.java
diff --git a/tests/src/com/vaadin/tests/components/menubar/MenuBarTest.java b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarTest.java
index e41652126d..e41652126d 100644
--- a/tests/src/com/vaadin/tests/components/menubar/MenuBarTest.java
+++ b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarTest.java
diff --git a/tests/src/com/vaadin/tests/components/menubar/MenuBarToolTips.html b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarToolTips.html
index 28bcc3a221..28bcc3a221 100644
--- a/tests/src/com/vaadin/tests/components/menubar/MenuBarToolTips.html
+++ b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarToolTips.html
diff --git a/tests/src/com/vaadin/tests/components/menubar/MenuBarToolTips.java b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarToolTips.java
index 0ef31dc5dc..0ef31dc5dc 100644
--- a/tests/src/com/vaadin/tests/components/menubar/MenuBarToolTips.java
+++ b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarToolTips.java
diff --git a/tests/src/com/vaadin/tests/components/menubar/Menubars.html b/tests/testbench/com/vaadin/tests/components/menubar/Menubars.html
index 93d77f9f36..93d77f9f36 100644
--- a/tests/src/com/vaadin/tests/components/menubar/Menubars.html
+++ b/tests/testbench/com/vaadin/tests/components/menubar/Menubars.html
diff --git a/tests/src/com/vaadin/tests/components/menubar/Menubars.java b/tests/testbench/com/vaadin/tests/components/menubar/Menubars.java
index 593b3b7fa5..593b3b7fa5 100644
--- a/tests/src/com/vaadin/tests/components/menubar/Menubars.java
+++ b/tests/testbench/com/vaadin/tests/components/menubar/Menubars.java
diff --git a/tests/src/com/vaadin/tests/components/nativebutton/NativeButtonDisableOnClick.html b/tests/testbench/com/vaadin/tests/components/nativebutton/NativeButtonDisableOnClick.html
index 75eab71892..75eab71892 100644
--- a/tests/src/com/vaadin/tests/components/nativebutton/NativeButtonDisableOnClick.html
+++ b/tests/testbench/com/vaadin/tests/components/nativebutton/NativeButtonDisableOnClick.html
diff --git a/tests/src/com/vaadin/tests/components/nativebutton/NativeButtonTest.java b/tests/testbench/com/vaadin/tests/components/nativebutton/NativeButtonTest.java
index d806790f4d..d806790f4d 100644
--- a/tests/src/com/vaadin/tests/components/nativebutton/NativeButtonTest.java
+++ b/tests/testbench/com/vaadin/tests/components/nativebutton/NativeButtonTest.java
diff --git a/tests/src/com/vaadin/tests/components/nativeselect/NativeSelects.java b/tests/testbench/com/vaadin/tests/components/nativeselect/NativeSelects.java
index 5f19073e66..5f19073e66 100644
--- a/tests/src/com/vaadin/tests/components/nativeselect/NativeSelects.java
+++ b/tests/testbench/com/vaadin/tests/components/nativeselect/NativeSelects.java
diff --git a/tests/src/com/vaadin/tests/components/notification/CloseErrorNotificationWithEscape.html b/tests/testbench/com/vaadin/tests/components/notification/CloseErrorNotificationWithEscape.html
index 288fd65c66..288fd65c66 100644
--- a/tests/src/com/vaadin/tests/components/notification/CloseErrorNotificationWithEscape.html
+++ b/tests/testbench/com/vaadin/tests/components/notification/CloseErrorNotificationWithEscape.html
diff --git a/tests/src/com/vaadin/tests/components/notification/Notifications.html b/tests/testbench/com/vaadin/tests/components/notification/Notifications.html
index 4157af5450..4157af5450 100644
--- a/tests/src/com/vaadin/tests/components/notification/Notifications.html
+++ b/tests/testbench/com/vaadin/tests/components/notification/Notifications.html
diff --git a/tests/src/com/vaadin/tests/components/notification/Notifications.java b/tests/testbench/com/vaadin/tests/components/notification/Notifications.java
index e938495e9f..e938495e9f 100644
--- a/tests/src/com/vaadin/tests/components/notification/Notifications.java
+++ b/tests/testbench/com/vaadin/tests/components/notification/Notifications.java
diff --git a/tests/src/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.html b/tests/testbench/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.html
index b4d76edae9..b4d76edae9 100644
--- a/tests/src/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.html
+++ b/tests/testbench/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.html
diff --git a/tests/src/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.java b/tests/testbench/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.java
index 9157c30174..9157c30174 100644
--- a/tests/src/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.java
+++ b/tests/testbench/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.java
diff --git a/tests/src/com/vaadin/tests/components/optiongroup/DisabledOptionGroupItems.html b/tests/testbench/com/vaadin/tests/components/optiongroup/DisabledOptionGroupItems.html
index 01c033e4fa..01c033e4fa 100644
--- a/tests/src/com/vaadin/tests/components/optiongroup/DisabledOptionGroupItems.html
+++ b/tests/testbench/com/vaadin/tests/components/optiongroup/DisabledOptionGroupItems.html
diff --git a/tests/src/com/vaadin/tests/components/optiongroup/DisabledOptionGroupItems.java b/tests/testbench/com/vaadin/tests/components/optiongroup/DisabledOptionGroupItems.java
index 4668ef5ab8..4668ef5ab8 100644
--- a/tests/src/com/vaadin/tests/components/optiongroup/DisabledOptionGroupItems.java
+++ b/tests/testbench/com/vaadin/tests/components/optiongroup/DisabledOptionGroupItems.java
diff --git a/tests/src/com/vaadin/tests/components/optiongroup/HtmlOptionGroupItems.html b/tests/testbench/com/vaadin/tests/components/optiongroup/HtmlOptionGroupItems.html
index d74354299d..d74354299d 100644
--- a/tests/src/com/vaadin/tests/components/optiongroup/HtmlOptionGroupItems.html
+++ b/tests/testbench/com/vaadin/tests/components/optiongroup/HtmlOptionGroupItems.html
diff --git a/tests/src/com/vaadin/tests/components/optiongroup/HtmlOptionGroupItems.java b/tests/testbench/com/vaadin/tests/components/optiongroup/HtmlOptionGroupItems.java
index 0f6ae8917a..0f6ae8917a 100644
--- a/tests/src/com/vaadin/tests/components/optiongroup/HtmlOptionGroupItems.java
+++ b/tests/testbench/com/vaadin/tests/components/optiongroup/HtmlOptionGroupItems.java
diff --git a/tests/src/com/vaadin/tests/components/optiongroup/OptionGroupItemIcons.html b/tests/testbench/com/vaadin/tests/components/optiongroup/OptionGroupItemIcons.html
index 978d911a2d..978d911a2d 100644
--- a/tests/src/com/vaadin/tests/components/optiongroup/OptionGroupItemIcons.html
+++ b/tests/testbench/com/vaadin/tests/components/optiongroup/OptionGroupItemIcons.html
diff --git a/tests/src/com/vaadin/tests/components/optiongroup/OptionGroupMultipleValueChange.java b/tests/testbench/com/vaadin/tests/components/optiongroup/OptionGroupMultipleValueChange.java
index 29a81720c7..29a81720c7 100644
--- a/tests/src/com/vaadin/tests/components/optiongroup/OptionGroupMultipleValueChange.java
+++ b/tests/testbench/com/vaadin/tests/components/optiongroup/OptionGroupMultipleValueChange.java
diff --git a/tests/src/com/vaadin/tests/components/optiongroup/OptionGroups.java b/tests/testbench/com/vaadin/tests/components/optiongroup/OptionGroups.java
index 1e752e7c26..1e752e7c26 100644
--- a/tests/src/com/vaadin/tests/components/optiongroup/OptionGroups.java
+++ b/tests/testbench/com/vaadin/tests/components/optiongroup/OptionGroups.java
diff --git a/tests/src/com/vaadin/tests/components/orderedlayout/HorizontalLayoutTest.java b/tests/testbench/com/vaadin/tests/components/orderedlayout/HorizontalLayoutTest.java
index b06179efd7..b06179efd7 100644
--- a/tests/src/com/vaadin/tests/components/orderedlayout/HorizontalLayoutTest.java
+++ b/tests/testbench/com/vaadin/tests/components/orderedlayout/HorizontalLayoutTest.java
diff --git a/tests/src/com/vaadin/tests/components/orderedlayout/LayoutClickListenerTest.html b/tests/testbench/com/vaadin/tests/components/orderedlayout/LayoutClickListenerTest.html
index 6b850fb52a..6b850fb52a 100644
--- a/tests/src/com/vaadin/tests/components/orderedlayout/LayoutClickListenerTest.html
+++ b/tests/testbench/com/vaadin/tests/components/orderedlayout/LayoutClickListenerTest.html
diff --git a/tests/src/com/vaadin/tests/components/orderedlayout/LayoutClickListenerTest.java b/tests/testbench/com/vaadin/tests/components/orderedlayout/LayoutClickListenerTest.java
index 4f4faf15bb..4f4faf15bb 100644
--- a/tests/src/com/vaadin/tests/components/orderedlayout/LayoutClickListenerTest.java
+++ b/tests/testbench/com/vaadin/tests/components/orderedlayout/LayoutClickListenerTest.java
diff --git a/tests/src/com/vaadin/tests/components/orderedlayout/ReplaceComponentNPE.html b/tests/testbench/com/vaadin/tests/components/orderedlayout/ReplaceComponentNPE.html
index 7a071030dc..7a071030dc 100644
--- a/tests/src/com/vaadin/tests/components/orderedlayout/ReplaceComponentNPE.html
+++ b/tests/testbench/com/vaadin/tests/components/orderedlayout/ReplaceComponentNPE.html
diff --git a/tests/src/com/vaadin/tests/components/orderedlayout/ReplaceComponentNPE.java b/tests/testbench/com/vaadin/tests/components/orderedlayout/ReplaceComponentNPE.java
index 555495cc58..555495cc58 100644
--- a/tests/src/com/vaadin/tests/components/orderedlayout/ReplaceComponentNPE.java
+++ b/tests/testbench/com/vaadin/tests/components/orderedlayout/ReplaceComponentNPE.java
diff --git a/tests/src/com/vaadin/tests/components/orderedlayout/VerticalLayoutTest.java b/tests/testbench/com/vaadin/tests/components/orderedlayout/VerticalLayoutTest.java
index 20babc8576..20babc8576 100644
--- a/tests/src/com/vaadin/tests/components/orderedlayout/VerticalLayoutTest.java
+++ b/tests/testbench/com/vaadin/tests/components/orderedlayout/VerticalLayoutTest.java
diff --git a/tests/src/com/vaadin/tests/components/orderedlayout/VerticalLayoutWidthCalculation.html b/tests/testbench/com/vaadin/tests/components/orderedlayout/VerticalLayoutWidthCalculation.html
index f0d837d97a..f0d837d97a 100644
--- a/tests/src/com/vaadin/tests/components/orderedlayout/VerticalLayoutWidthCalculation.html
+++ b/tests/testbench/com/vaadin/tests/components/orderedlayout/VerticalLayoutWidthCalculation.html
diff --git a/tests/src/com/vaadin/tests/components/orderedlayout/VerticalLayoutWidthCalculation.java b/tests/testbench/com/vaadin/tests/components/orderedlayout/VerticalLayoutWidthCalculation.java
index f59b940353..f59b940353 100644
--- a/tests/src/com/vaadin/tests/components/orderedlayout/VerticalLayoutWidthCalculation.java
+++ b/tests/testbench/com/vaadin/tests/components/orderedlayout/VerticalLayoutWidthCalculation.java
diff --git a/tests/src/com/vaadin/tests/components/panel/PanelClickListenerRelativeCoordinates.html b/tests/testbench/com/vaadin/tests/components/panel/PanelClickListenerRelativeCoordinates.html
index eb40765d03..eb40765d03 100644
--- a/tests/src/com/vaadin/tests/components/panel/PanelClickListenerRelativeCoordinates.html
+++ b/tests/testbench/com/vaadin/tests/components/panel/PanelClickListenerRelativeCoordinates.html
diff --git a/tests/src/com/vaadin/tests/components/panel/PanelClickListenerRelativeCoordinates.java b/tests/testbench/com/vaadin/tests/components/panel/PanelClickListenerRelativeCoordinates.java
index 65a185b160..65a185b160 100644
--- a/tests/src/com/vaadin/tests/components/panel/PanelClickListenerRelativeCoordinates.java
+++ b/tests/testbench/com/vaadin/tests/components/panel/PanelClickListenerRelativeCoordinates.java
diff --git a/tests/src/com/vaadin/tests/components/panel/PanelShouldNotScroll.html b/tests/testbench/com/vaadin/tests/components/panel/PanelShouldNotScroll.html
index 8b03ca330f..8b03ca330f 100644
--- a/tests/src/com/vaadin/tests/components/panel/PanelShouldNotScroll.html
+++ b/tests/testbench/com/vaadin/tests/components/panel/PanelShouldNotScroll.html
diff --git a/tests/src/com/vaadin/tests/components/panel/PanelShouldNotScroll.java b/tests/testbench/com/vaadin/tests/components/panel/PanelShouldNotScroll.java
index 7c537fe710..7c537fe710 100644
--- a/tests/src/com/vaadin/tests/components/panel/PanelShouldNotScroll.java
+++ b/tests/testbench/com/vaadin/tests/components/panel/PanelShouldNotScroll.java
diff --git a/tests/src/com/vaadin/tests/components/panel/PanelShouldRemoveActionHandler.java b/tests/testbench/com/vaadin/tests/components/panel/PanelShouldRemoveActionHandler.java
index eec39359aa..eec39359aa 100644
--- a/tests/src/com/vaadin/tests/components/panel/PanelShouldRemoveActionHandler.java
+++ b/tests/testbench/com/vaadin/tests/components/panel/PanelShouldRemoveActionHandler.java
diff --git a/tests/src/com/vaadin/tests/components/panel/PanelTest.java b/tests/testbench/com/vaadin/tests/components/panel/PanelTest.java
index 29d93ce86c..29d93ce86c 100644
--- a/tests/src/com/vaadin/tests/components/panel/PanelTest.java
+++ b/tests/testbench/com/vaadin/tests/components/panel/PanelTest.java
diff --git a/tests/src/com/vaadin/tests/components/passwordfield/PasswordFieldBasicStates.html b/tests/testbench/com/vaadin/tests/components/passwordfield/PasswordFieldBasicStates.html
index 70be23541e..70be23541e 100644
--- a/tests/src/com/vaadin/tests/components/passwordfield/PasswordFieldBasicStates.html
+++ b/tests/testbench/com/vaadin/tests/components/passwordfield/PasswordFieldBasicStates.html
diff --git a/tests/src/com/vaadin/tests/components/passwordfield/PasswordFieldTest.java b/tests/testbench/com/vaadin/tests/components/passwordfield/PasswordFieldTest.java
index 86d035e925..86d035e925 100644
--- a/tests/src/com/vaadin/tests/components/passwordfield/PasswordFieldTest.java
+++ b/tests/testbench/com/vaadin/tests/components/passwordfield/PasswordFieldTest.java
diff --git a/tests/src/com/vaadin/tests/components/popupview/PopupViewLabelResized.java b/tests/testbench/com/vaadin/tests/components/popupview/PopupViewLabelResized.java
index 52bdd47790..52bdd47790 100644
--- a/tests/src/com/vaadin/tests/components/popupview/PopupViewLabelResized.java
+++ b/tests/testbench/com/vaadin/tests/components/popupview/PopupViewLabelResized.java
diff --git a/tests/src/com/vaadin/tests/components/popupview/PopupViewNullValues.java b/tests/testbench/com/vaadin/tests/components/popupview/PopupViewNullValues.java
index 78e66e2db3..78e66e2db3 100644
--- a/tests/src/com/vaadin/tests/components/popupview/PopupViewNullValues.java
+++ b/tests/testbench/com/vaadin/tests/components/popupview/PopupViewNullValues.java
diff --git a/tests/src/com/vaadin/tests/components/popupview/PopupViewOffScreen.html b/tests/testbench/com/vaadin/tests/components/popupview/PopupViewOffScreen.html
index 99ee864179..99ee864179 100644
--- a/tests/src/com/vaadin/tests/components/popupview/PopupViewOffScreen.html
+++ b/tests/testbench/com/vaadin/tests/components/popupview/PopupViewOffScreen.html
diff --git a/tests/src/com/vaadin/tests/components/popupview/PopupViewOffScreen.java b/tests/testbench/com/vaadin/tests/components/popupview/PopupViewOffScreen.java
index 7067281fa2..7067281fa2 100644
--- a/tests/src/com/vaadin/tests/components/popupview/PopupViewOffScreen.java
+++ b/tests/testbench/com/vaadin/tests/components/popupview/PopupViewOffScreen.java
diff --git a/tests/src/com/vaadin/tests/components/popupview/PopupViewShouldCloseOnTabOut.html b/tests/testbench/com/vaadin/tests/components/popupview/PopupViewShouldCloseOnTabOut.html
index fb62215f16..fb62215f16 100644
--- a/tests/src/com/vaadin/tests/components/popupview/PopupViewShouldCloseOnTabOut.html
+++ b/tests/testbench/com/vaadin/tests/components/popupview/PopupViewShouldCloseOnTabOut.html
diff --git a/tests/src/com/vaadin/tests/components/popupview/PopupViewShouldCloseOnTabOut.java b/tests/testbench/com/vaadin/tests/components/popupview/PopupViewShouldCloseOnTabOut.java
index 7e917630c8..7e917630c8 100644
--- a/tests/src/com/vaadin/tests/components/popupview/PopupViewShouldCloseOnTabOut.java
+++ b/tests/testbench/com/vaadin/tests/components/popupview/PopupViewShouldCloseOnTabOut.java
diff --git a/tests/src/com/vaadin/tests/components/popupview/PopupViewWithRTE.java b/tests/testbench/com/vaadin/tests/components/popupview/PopupViewWithRTE.java
index ea94ee2185..ea94ee2185 100644
--- a/tests/src/com/vaadin/tests/components/popupview/PopupViewWithRTE.java
+++ b/tests/testbench/com/vaadin/tests/components/popupview/PopupViewWithRTE.java
diff --git a/tests/src/com/vaadin/tests/components/progressindicator/ProgressIndicatorInvisible.java b/tests/testbench/com/vaadin/tests/components/progressindicator/ProgressIndicatorInvisible.java
index 7e6cfd17ea..7e6cfd17ea 100644
--- a/tests/src/com/vaadin/tests/components/progressindicator/ProgressIndicatorInvisible.java
+++ b/tests/testbench/com/vaadin/tests/components/progressindicator/ProgressIndicatorInvisible.java
diff --git a/tests/src/com/vaadin/tests/components/richtextarea/RichTextAreaSize.html b/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaSize.html
index 7708c88e54..7708c88e54 100644
--- a/tests/src/com/vaadin/tests/components/richtextarea/RichTextAreaSize.html
+++ b/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaSize.html
diff --git a/tests/src/com/vaadin/tests/components/richtextarea/RichTextAreaSize.java b/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaSize.java
index 934f2ed2dd..934f2ed2dd 100644
--- a/tests/src/com/vaadin/tests/components/richtextarea/RichTextAreaSize.java
+++ b/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaSize.java
diff --git a/tests/src/com/vaadin/tests/components/richtextarea/RichTextAreaTest.java b/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaTest.java
index ad2f82aca6..ad2f82aca6 100644
--- a/tests/src/com/vaadin/tests/components/richtextarea/RichTextAreaTest.java
+++ b/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaTest.java
diff --git a/tests/src/com/vaadin/tests/components/richtextarea/RichTextAreaWithKeyboardShortcuts.java b/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaWithKeyboardShortcuts.java
index 2e26d3e2c4..2e26d3e2c4 100644
--- a/tests/src/com/vaadin/tests/components/richtextarea/RichTextAreaWithKeyboardShortcuts.java
+++ b/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaWithKeyboardShortcuts.java
diff --git a/tests/src/com/vaadin/tests/components/richtextarea/RichTextAreas.html b/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreas.html
index d3e5c42c80..d3e5c42c80 100644
--- a/tests/src/com/vaadin/tests/components/richtextarea/RichTextAreas.html
+++ b/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreas.html
diff --git a/tests/src/com/vaadin/tests/components/richtextarea/RichTextAreas.java b/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreas.java
index 8585d19bc2..8585d19bc2 100644
--- a/tests/src/com/vaadin/tests/components/richtextarea/RichTextAreas.java
+++ b/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreas.java
diff --git a/tests/src/com/vaadin/tests/components/select/AbstractSelectTestCase.java b/tests/testbench/com/vaadin/tests/components/select/AbstractSelectTestCase.java
index 528fbd7edd..528fbd7edd 100644
--- a/tests/src/com/vaadin/tests/components/select/AbstractSelectTestCase.java
+++ b/tests/testbench/com/vaadin/tests/components/select/AbstractSelectTestCase.java
diff --git a/tests/src/com/vaadin/tests/components/select/ComboBoxAddWhileFiltering.java b/tests/testbench/com/vaadin/tests/components/select/ComboBoxAddWhileFiltering.java
index 931686003a..931686003a 100644
--- a/tests/src/com/vaadin/tests/components/select/ComboBoxAddWhileFiltering.java
+++ b/tests/testbench/com/vaadin/tests/components/select/ComboBoxAddWhileFiltering.java
diff --git a/tests/src/com/vaadin/tests/components/select/MultiSelect.java b/tests/testbench/com/vaadin/tests/components/select/MultiSelect.java
index b3c15251a1..b3c15251a1 100644
--- a/tests/src/com/vaadin/tests/components/select/MultiSelect.java
+++ b/tests/testbench/com/vaadin/tests/components/select/MultiSelect.java
diff --git a/tests/src/com/vaadin/tests/components/select/NativeSelects.html b/tests/testbench/com/vaadin/tests/components/select/NativeSelects.html
index f9ab8eb3a0..f9ab8eb3a0 100644
--- a/tests/src/com/vaadin/tests/components/select/NativeSelects.html
+++ b/tests/testbench/com/vaadin/tests/components/select/NativeSelects.html
diff --git a/tests/src/com/vaadin/tests/components/select/NativeSelects.java b/tests/testbench/com/vaadin/tests/components/select/NativeSelects.java
index d5577e213c..d5577e213c 100644
--- a/tests/src/com/vaadin/tests/components/select/NativeSelects.java
+++ b/tests/testbench/com/vaadin/tests/components/select/NativeSelects.java
diff --git a/tests/src/com/vaadin/tests/components/select/NullSelectionItemId.java b/tests/testbench/com/vaadin/tests/components/select/NullSelectionItemId.java
index 4298cfc525..4298cfc525 100644
--- a/tests/src/com/vaadin/tests/components/select/NullSelectionItemId.java
+++ b/tests/testbench/com/vaadin/tests/components/select/NullSelectionItemId.java
diff --git a/tests/src/com/vaadin/tests/components/select/SelectDisplaysOldValue.html b/tests/testbench/com/vaadin/tests/components/select/SelectDisplaysOldValue.html
index e9d5fabb14..e9d5fabb14 100644
--- a/tests/src/com/vaadin/tests/components/select/SelectDisplaysOldValue.html
+++ b/tests/testbench/com/vaadin/tests/components/select/SelectDisplaysOldValue.html
diff --git a/tests/src/com/vaadin/tests/components/select/SelectDisplaysOldValue.java b/tests/testbench/com/vaadin/tests/components/select/SelectDisplaysOldValue.java
index 56953e298c..56953e298c 100644
--- a/tests/src/com/vaadin/tests/components/select/SelectDisplaysOldValue.java
+++ b/tests/testbench/com/vaadin/tests/components/select/SelectDisplaysOldValue.java
diff --git a/tests/src/com/vaadin/tests/components/select/SelectIconPlacement.html b/tests/testbench/com/vaadin/tests/components/select/SelectIconPlacement.html
index 90e2e293a3..90e2e293a3 100644
--- a/tests/src/com/vaadin/tests/components/select/SelectIconPlacement.html
+++ b/tests/testbench/com/vaadin/tests/components/select/SelectIconPlacement.html
diff --git a/tests/src/com/vaadin/tests/components/select/SelectIconPlacement.java b/tests/testbench/com/vaadin/tests/components/select/SelectIconPlacement.java
index 51a899a7e6..51a899a7e6 100644
--- a/tests/src/com/vaadin/tests/components/select/SelectIconPlacement.java
+++ b/tests/testbench/com/vaadin/tests/components/select/SelectIconPlacement.java
diff --git a/tests/src/com/vaadin/tests/components/select/SelectTest.java b/tests/testbench/com/vaadin/tests/components/select/SelectTest.java
index cdc30921fa..cdc30921fa 100644
--- a/tests/src/com/vaadin/tests/components/select/SelectTest.java
+++ b/tests/testbench/com/vaadin/tests/components/select/SelectTest.java
diff --git a/tests/src/com/vaadin/tests/components/select/TwinColSelectCaptionStyles.html b/tests/testbench/com/vaadin/tests/components/select/TwinColSelectCaptionStyles.html
index 7fd4908673..7fd4908673 100644
--- a/tests/src/com/vaadin/tests/components/select/TwinColSelectCaptionStyles.html
+++ b/tests/testbench/com/vaadin/tests/components/select/TwinColSelectCaptionStyles.html
diff --git a/tests/src/com/vaadin/tests/components/select/TwinColSelectCaptionStyles.java b/tests/testbench/com/vaadin/tests/components/select/TwinColSelectCaptionStyles.java
index f3d147e32a..f3d147e32a 100644
--- a/tests/src/com/vaadin/tests/components/select/TwinColSelectCaptionStyles.java
+++ b/tests/testbench/com/vaadin/tests/components/select/TwinColSelectCaptionStyles.java
diff --git a/tests/src/com/vaadin/tests/components/select/TwinColSelectDualCaptions.html b/tests/testbench/com/vaadin/tests/components/select/TwinColSelectDualCaptions.html
index 04388cb95a..04388cb95a 100644
--- a/tests/src/com/vaadin/tests/components/select/TwinColSelectDualCaptions.html
+++ b/tests/testbench/com/vaadin/tests/components/select/TwinColSelectDualCaptions.html
diff --git a/tests/src/com/vaadin/tests/components/select/TwinColSelectTest.java b/tests/testbench/com/vaadin/tests/components/select/TwinColSelectTest.java
index 2fb9ed2079..2fb9ed2079 100644
--- a/tests/src/com/vaadin/tests/components/select/TwinColSelectTest.java
+++ b/tests/testbench/com/vaadin/tests/components/select/TwinColSelectTest.java
diff --git a/tests/src/com/vaadin/tests/components/select/TwinColSelects.java b/tests/testbench/com/vaadin/tests/components/select/TwinColSelects.java
index cf59eaa03b..cf59eaa03b 100644
--- a/tests/src/com/vaadin/tests/components/select/TwinColSelects.java
+++ b/tests/testbench/com/vaadin/tests/components/select/TwinColSelects.java
diff --git a/tests/src/com/vaadin/tests/components/select/TwinColSelectsDisabledReadonly.html b/tests/testbench/com/vaadin/tests/components/select/TwinColSelectsDisabledReadonly.html
index f403d8b2f5..f403d8b2f5 100644
--- a/tests/src/com/vaadin/tests/components/select/TwinColSelectsDisabledReadonly.html
+++ b/tests/testbench/com/vaadin/tests/components/select/TwinColSelectsDisabledReadonly.html
diff --git a/tests/src/com/vaadin/tests/components/slider/SliderKeyboardFocus.html b/tests/testbench/com/vaadin/tests/components/slider/SliderKeyboardFocus.html
index 0521506418..0521506418 100644
--- a/tests/src/com/vaadin/tests/components/slider/SliderKeyboardFocus.html
+++ b/tests/testbench/com/vaadin/tests/components/slider/SliderKeyboardFocus.html
diff --git a/tests/src/com/vaadin/tests/components/slider/SliderKeyboardFocus.java b/tests/testbench/com/vaadin/tests/components/slider/SliderKeyboardFocus.java
index fe9450a0f0..fe9450a0f0 100644
--- a/tests/src/com/vaadin/tests/components/slider/SliderKeyboardFocus.java
+++ b/tests/testbench/com/vaadin/tests/components/slider/SliderKeyboardFocus.java
diff --git a/tests/src/com/vaadin/tests/components/slider/SliderTest.java b/tests/testbench/com/vaadin/tests/components/slider/SliderTest.java
index 65a2fdd1b5..65a2fdd1b5 100644
--- a/tests/src/com/vaadin/tests/components/slider/SliderTest.java
+++ b/tests/testbench/com/vaadin/tests/components/slider/SliderTest.java
diff --git a/tests/src/com/vaadin/tests/components/splitpanel/AbstractSplitPanelTest.java b/tests/testbench/com/vaadin/tests/components/splitpanel/AbstractSplitPanelTest.java
index 0b702db33a..0b702db33a 100644
--- a/tests/src/com/vaadin/tests/components/splitpanel/AbstractSplitPanelTest.java
+++ b/tests/testbench/com/vaadin/tests/components/splitpanel/AbstractSplitPanelTest.java
diff --git a/tests/src/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelBasicStates.html b/tests/testbench/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelBasicStates.html
index 2b1ad7866a..2b1ad7866a 100644
--- a/tests/src/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelBasicStates.html
+++ b/tests/testbench/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelBasicStates.html
diff --git a/tests/src/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelMoveSplitter.html b/tests/testbench/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelMoveSplitter.html
index b2deb8e509..b2deb8e509 100644
--- a/tests/src/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelMoveSplitter.html
+++ b/tests/testbench/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelMoveSplitter.html
diff --git a/tests/src/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelSplitterClick.html b/tests/testbench/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelSplitterClick.html
index 3d3fcc5939..3d3fcc5939 100644
--- a/tests/src/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelSplitterClick.html
+++ b/tests/testbench/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelSplitterClick.html
diff --git a/tests/src/com/vaadin/tests/components/splitpanel/HorizontalSplitPanels.java b/tests/testbench/com/vaadin/tests/components/splitpanel/HorizontalSplitPanels.java
index a92143963b..a92143963b 100644
--- a/tests/src/com/vaadin/tests/components/splitpanel/HorizontalSplitPanels.java
+++ b/tests/testbench/com/vaadin/tests/components/splitpanel/HorizontalSplitPanels.java
diff --git a/tests/src/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.html b/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.html
index e8e7395198..e8e7395198 100644
--- a/tests/src/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.html
+++ b/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.html
diff --git a/tests/src/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java b/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java
index 872828c97e..872828c97e 100644
--- a/tests/src/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java
+++ b/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java
diff --git a/tests/src/com/vaadin/tests/components/splitpanel/SplitPanelInModalWindow.java b/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelInModalWindow.java
index c06ca5b0b9..c06ca5b0b9 100644
--- a/tests/src/com/vaadin/tests/components/splitpanel/SplitPanelInModalWindow.java
+++ b/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelInModalWindow.java
diff --git a/tests/src/com/vaadin/tests/components/splitpanel/SplitPanelReversePosition.html b/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelReversePosition.html
index 6bdc9dd5e7..6bdc9dd5e7 100644
--- a/tests/src/com/vaadin/tests/components/splitpanel/SplitPanelReversePosition.html
+++ b/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelReversePosition.html
diff --git a/tests/src/com/vaadin/tests/components/splitpanel/SplitPanelReversePosition.java b/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelReversePosition.java
index 107635e989..107635e989 100644
--- a/tests/src/com/vaadin/tests/components/splitpanel/SplitPanelReversePosition.java
+++ b/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelReversePosition.java
diff --git a/tests/src/com/vaadin/tests/components/splitpanel/SplitPanelSplitterWidth.java b/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelSplitterWidth.java
index 49a5915999..49a5915999 100644
--- a/tests/src/com/vaadin/tests/components/splitpanel/SplitPanelSplitterWidth.java
+++ b/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelSplitterWidth.java
diff --git a/tests/src/com/vaadin/tests/components/splitpanel/SplitPanelSwapComponents.html b/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelSwapComponents.html
index f84eba7c36..f84eba7c36 100644
--- a/tests/src/com/vaadin/tests/components/splitpanel/SplitPanelSwapComponents.html
+++ b/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelSwapComponents.html
diff --git a/tests/src/com/vaadin/tests/components/splitpanel/SplitPanelSwapComponents.java b/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelSwapComponents.java
index 470a47f160..470a47f160 100644
--- a/tests/src/com/vaadin/tests/components/splitpanel/SplitPanelSwapComponents.java
+++ b/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelSwapComponents.java
diff --git a/tests/src/com/vaadin/tests/components/splitpanel/SplitPanelWidthOnResize.java b/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelWidthOnResize.java
index 8d5256ece7..8d5256ece7 100644
--- a/tests/src/com/vaadin/tests/components/splitpanel/SplitPanelWidthOnResize.java
+++ b/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelWidthOnResize.java
diff --git a/tests/src/com/vaadin/tests/components/splitpanel/SplitPanelWithRichTextArea.java b/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelWithRichTextArea.java
index 6b17319509..6b17319509 100644
--- a/tests/src/com/vaadin/tests/components/splitpanel/SplitPanelWithRichTextArea.java
+++ b/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelWithRichTextArea.java
diff --git a/tests/src/com/vaadin/tests/components/splitpanel/SplitPanels.java b/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanels.java
index ebe94271cc..ebe94271cc 100644
--- a/tests/src/com/vaadin/tests/components/splitpanel/SplitPanels.java
+++ b/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanels.java
diff --git a/tests/src/com/vaadin/tests/components/splitpanel/VerticalSplitPanelBasicStates.html b/tests/testbench/com/vaadin/tests/components/splitpanel/VerticalSplitPanelBasicStates.html
index 6f9678a54f..6f9678a54f 100644
--- a/tests/src/com/vaadin/tests/components/splitpanel/VerticalSplitPanelBasicStates.html
+++ b/tests/testbench/com/vaadin/tests/components/splitpanel/VerticalSplitPanelBasicStates.html
diff --git a/tests/src/com/vaadin/tests/components/splitpanel/VerticalSplitPanelMoveSplitter.html b/tests/testbench/com/vaadin/tests/components/splitpanel/VerticalSplitPanelMoveSplitter.html
index 0ebde2846d..0ebde2846d 100644
--- a/tests/src/com/vaadin/tests/components/splitpanel/VerticalSplitPanelMoveSplitter.html
+++ b/tests/testbench/com/vaadin/tests/components/splitpanel/VerticalSplitPanelMoveSplitter.html
diff --git a/tests/src/com/vaadin/tests/components/splitpanel/VerticalSplitPanelSplitterClick.html b/tests/testbench/com/vaadin/tests/components/splitpanel/VerticalSplitPanelSplitterClick.html
index ed5f191a65..ed5f191a65 100644
--- a/tests/src/com/vaadin/tests/components/splitpanel/VerticalSplitPanelSplitterClick.html
+++ b/tests/testbench/com/vaadin/tests/components/splitpanel/VerticalSplitPanelSplitterClick.html
diff --git a/tests/src/com/vaadin/tests/components/splitpanel/VerticalSplitPanels.java b/tests/testbench/com/vaadin/tests/components/splitpanel/VerticalSplitPanels.java
index 4ff0445d71..4ff0445d71 100644
--- a/tests/src/com/vaadin/tests/components/splitpanel/VerticalSplitPanels.java
+++ b/tests/testbench/com/vaadin/tests/components/splitpanel/VerticalSplitPanels.java
diff --git a/tests/src/com/vaadin/tests/components/table/ActionsOnTableBackground.html b/tests/testbench/com/vaadin/tests/components/table/ActionsOnTableBackground.html
index 93037c3da1..93037c3da1 100644
--- a/tests/src/com/vaadin/tests/components/table/ActionsOnTableBackground.html
+++ b/tests/testbench/com/vaadin/tests/components/table/ActionsOnTableBackground.html
diff --git a/tests/src/com/vaadin/tests/components/table/CellStyleGeneratorTest.java b/tests/testbench/com/vaadin/tests/components/table/CellStyleGeneratorTest.java
index 08bbd0790f..08bbd0790f 100644
--- a/tests/src/com/vaadin/tests/components/table/CellStyleGeneratorTest.java
+++ b/tests/testbench/com/vaadin/tests/components/table/CellStyleGeneratorTest.java
diff --git a/tests/src/com/vaadin/tests/components/table/ClippedComponentsInTable.html b/tests/testbench/com/vaadin/tests/components/table/ClippedComponentsInTable.html
index 4a6ccbbe2d..4a6ccbbe2d 100644
--- a/tests/src/com/vaadin/tests/components/table/ClippedComponentsInTable.html
+++ b/tests/testbench/com/vaadin/tests/components/table/ClippedComponentsInTable.html
diff --git a/tests/src/com/vaadin/tests/components/table/ClippedComponentsInTable.java b/tests/testbench/com/vaadin/tests/components/table/ClippedComponentsInTable.java
index 8b6775cc74..8b6775cc74 100644
--- a/tests/src/com/vaadin/tests/components/table/ClippedComponentsInTable.java
+++ b/tests/testbench/com/vaadin/tests/components/table/ClippedComponentsInTable.java
diff --git a/tests/src/com/vaadin/tests/components/table/CollapseIndicatorOverlapsColumn.html b/tests/testbench/com/vaadin/tests/components/table/CollapseIndicatorOverlapsColumn.html
index e3d0821642..e3d0821642 100644
--- a/tests/src/com/vaadin/tests/components/table/CollapseIndicatorOverlapsColumn.html
+++ b/tests/testbench/com/vaadin/tests/components/table/CollapseIndicatorOverlapsColumn.html
diff --git a/tests/src/com/vaadin/tests/components/table/CollapseIndicatorOverlapsColumn.java b/tests/testbench/com/vaadin/tests/components/table/CollapseIndicatorOverlapsColumn.java
index 267b61854f..267b61854f 100644
--- a/tests/src/com/vaadin/tests/components/table/CollapseIndicatorOverlapsColumn.java
+++ b/tests/testbench/com/vaadin/tests/components/table/CollapseIndicatorOverlapsColumn.java
diff --git a/tests/src/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.html b/tests/testbench/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.html
index 9e529836b6..9e529836b6 100644
--- a/tests/src/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.html
+++ b/tests/testbench/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.html
diff --git a/tests/src/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.java b/tests/testbench/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.java
index 9bf77f42bd..9bf77f42bd 100644
--- a/tests/src/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.java
+++ b/tests/testbench/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.java
diff --git a/tests/src/com/vaadin/tests/components/table/ColumnExpandRatio.html b/tests/testbench/com/vaadin/tests/components/table/ColumnExpandRatio.html
index 6d5422831e..6d5422831e 100644
--- a/tests/src/com/vaadin/tests/components/table/ColumnExpandRatio.html
+++ b/tests/testbench/com/vaadin/tests/components/table/ColumnExpandRatio.html
diff --git a/tests/src/com/vaadin/tests/components/table/ColumnExpandRatio.java b/tests/testbench/com/vaadin/tests/components/table/ColumnExpandRatio.java
index be176d83fa..be176d83fa 100644
--- a/tests/src/com/vaadin/tests/components/table/ColumnExpandRatio.java
+++ b/tests/testbench/com/vaadin/tests/components/table/ColumnExpandRatio.java
diff --git a/tests/src/com/vaadin/tests/components/table/ColumnExpandWithFixedColumns.html b/tests/testbench/com/vaadin/tests/components/table/ColumnExpandWithFixedColumns.html
index eb338c8dde..eb338c8dde 100644
--- a/tests/src/com/vaadin/tests/components/table/ColumnExpandWithFixedColumns.html
+++ b/tests/testbench/com/vaadin/tests/components/table/ColumnExpandWithFixedColumns.html
diff --git a/tests/src/com/vaadin/tests/components/table/ColumnExpandWithFixedColumns.java b/tests/testbench/com/vaadin/tests/components/table/ColumnExpandWithFixedColumns.java
index 198e29be61..198e29be61 100644
--- a/tests/src/com/vaadin/tests/components/table/ColumnExpandWithFixedColumns.java
+++ b/tests/testbench/com/vaadin/tests/components/table/ColumnExpandWithFixedColumns.java
diff --git a/tests/src/com/vaadin/tests/components/table/ColumnGeneratorAddingOrder.java b/tests/testbench/com/vaadin/tests/components/table/ColumnGeneratorAddingOrder.java
index d3dfa61ceb..d3dfa61ceb 100644
--- a/tests/src/com/vaadin/tests/components/table/ColumnGeneratorAddingOrder.java
+++ b/tests/testbench/com/vaadin/tests/components/table/ColumnGeneratorAddingOrder.java
diff --git a/tests/src/com/vaadin/tests/components/table/ColumnHeaderAlignments.java b/tests/testbench/com/vaadin/tests/components/table/ColumnHeaderAlignments.java
index 0c625f1c5d..0c625f1c5d 100644
--- a/tests/src/com/vaadin/tests/components/table/ColumnHeaderAlignments.java
+++ b/tests/testbench/com/vaadin/tests/components/table/ColumnHeaderAlignments.java
diff --git a/tests/src/com/vaadin/tests/components/table/ColumnReorderEvent.java b/tests/testbench/com/vaadin/tests/components/table/ColumnReorderEvent.java
index 4c1fc70e5e..4c1fc70e5e 100644
--- a/tests/src/com/vaadin/tests/components/table/ColumnReorderEvent.java
+++ b/tests/testbench/com/vaadin/tests/components/table/ColumnReorderEvent.java
diff --git a/tests/src/com/vaadin/tests/components/table/ColumnResizeEvent.java b/tests/testbench/com/vaadin/tests/components/table/ColumnResizeEvent.java
index 29131b8d7a..29131b8d7a 100644
--- a/tests/src/com/vaadin/tests/components/table/ColumnResizeEvent.java
+++ b/tests/testbench/com/vaadin/tests/components/table/ColumnResizeEvent.java
diff --git a/tests/src/com/vaadin/tests/components/table/ColumnWidths.java b/tests/testbench/com/vaadin/tests/components/table/ColumnWidths.java
index 9fe7a98179..9fe7a98179 100644
--- a/tests/src/com/vaadin/tests/components/table/ColumnWidths.java
+++ b/tests/testbench/com/vaadin/tests/components/table/ColumnWidths.java
diff --git a/tests/src/com/vaadin/tests/components/table/ContainerChangeWithPartlySamePropertyIds.html b/tests/testbench/com/vaadin/tests/components/table/ContainerChangeWithPartlySamePropertyIds.html
index 6c8a770b6a..6c8a770b6a 100644
--- a/tests/src/com/vaadin/tests/components/table/ContainerChangeWithPartlySamePropertyIds.html
+++ b/tests/testbench/com/vaadin/tests/components/table/ContainerChangeWithPartlySamePropertyIds.html
diff --git a/tests/src/com/vaadin/tests/components/table/ContainerChangeWithPartlySamePropertyIds.java b/tests/testbench/com/vaadin/tests/components/table/ContainerChangeWithPartlySamePropertyIds.java
index b8e9226ad2..b8e9226ad2 100644
--- a/tests/src/com/vaadin/tests/components/table/ContainerChangeWithPartlySamePropertyIds.java
+++ b/tests/testbench/com/vaadin/tests/components/table/ContainerChangeWithPartlySamePropertyIds.java
diff --git a/tests/src/com/vaadin/tests/components/table/ContainerSizeChange.html b/tests/testbench/com/vaadin/tests/components/table/ContainerSizeChange.html
index 7c2374f322..7c2374f322 100644
--- a/tests/src/com/vaadin/tests/components/table/ContainerSizeChange.html
+++ b/tests/testbench/com/vaadin/tests/components/table/ContainerSizeChange.html
diff --git a/tests/src/com/vaadin/tests/components/table/ContainerSizeChange.java b/tests/testbench/com/vaadin/tests/components/table/ContainerSizeChange.java
index 84e98deffb..84e98deffb 100644
--- a/tests/src/com/vaadin/tests/components/table/ContainerSizeChange.java
+++ b/tests/testbench/com/vaadin/tests/components/table/ContainerSizeChange.java
diff --git a/tests/src/com/vaadin/tests/components/table/CtrlShiftMultiselect.java b/tests/testbench/com/vaadin/tests/components/table/CtrlShiftMultiselect.java
index 02f4af045b..02f4af045b 100644
--- a/tests/src/com/vaadin/tests/components/table/CtrlShiftMultiselect.java
+++ b/tests/testbench/com/vaadin/tests/components/table/CtrlShiftMultiselect.java
diff --git a/tests/src/com/vaadin/tests/components/table/DisabledTableKeyboardNavigation.html b/tests/testbench/com/vaadin/tests/components/table/DisabledTableKeyboardNavigation.html
index a8f0e864c3..a8f0e864c3 100644
--- a/tests/src/com/vaadin/tests/components/table/DisabledTableKeyboardNavigation.html
+++ b/tests/testbench/com/vaadin/tests/components/table/DisabledTableKeyboardNavigation.html
diff --git a/tests/src/com/vaadin/tests/components/table/DisabledTableKeyboardNavigation.java b/tests/testbench/com/vaadin/tests/components/table/DisabledTableKeyboardNavigation.java
index ec888c2699..ec888c2699 100644
--- a/tests/src/com/vaadin/tests/components/table/DisabledTableKeyboardNavigation.java
+++ b/tests/testbench/com/vaadin/tests/components/table/DisabledTableKeyboardNavigation.java
diff --git a/tests/src/com/vaadin/tests/components/table/DisabledTableShouldNotSendPageLengthUpdates.java b/tests/testbench/com/vaadin/tests/components/table/DisabledTableShouldNotSendPageLengthUpdates.java
index 86646f522f..86646f522f 100644
--- a/tests/src/com/vaadin/tests/components/table/DisabledTableShouldNotSendPageLengthUpdates.java
+++ b/tests/testbench/com/vaadin/tests/components/table/DisabledTableShouldNotSendPageLengthUpdates.java
diff --git a/tests/src/com/vaadin/tests/components/table/EditableModeChange.html b/tests/testbench/com/vaadin/tests/components/table/EditableModeChange.html
index 2a7949f3ba..2a7949f3ba 100644
--- a/tests/src/com/vaadin/tests/components/table/EditableModeChange.html
+++ b/tests/testbench/com/vaadin/tests/components/table/EditableModeChange.html
diff --git a/tests/src/com/vaadin/tests/components/table/EditableModeChange.java b/tests/testbench/com/vaadin/tests/components/table/EditableModeChange.java
index f2163f6df3..f2163f6df3 100644
--- a/tests/src/com/vaadin/tests/components/table/EditableModeChange.java
+++ b/tests/testbench/com/vaadin/tests/components/table/EditableModeChange.java
diff --git a/tests/src/com/vaadin/tests/components/table/EditableTableLeak.java b/tests/testbench/com/vaadin/tests/components/table/EditableTableLeak.java
index 6561ff0076..6561ff0076 100644
--- a/tests/src/com/vaadin/tests/components/table/EditableTableLeak.java
+++ b/tests/testbench/com/vaadin/tests/components/table/EditableTableLeak.java
diff --git a/tests/src/com/vaadin/tests/components/table/EmptyTable.html b/tests/testbench/com/vaadin/tests/components/table/EmptyTable.html
index dc52eb8bac..dc52eb8bac 100644
--- a/tests/src/com/vaadin/tests/components/table/EmptyTable.html
+++ b/tests/testbench/com/vaadin/tests/components/table/EmptyTable.html
diff --git a/tests/src/com/vaadin/tests/components/table/FixedHeightTable.html b/tests/testbench/com/vaadin/tests/components/table/FixedHeightTable.html
index fb8f7c8b7f..fb8f7c8b7f 100644
--- a/tests/src/com/vaadin/tests/components/table/FixedHeightTable.html
+++ b/tests/testbench/com/vaadin/tests/components/table/FixedHeightTable.html
diff --git a/tests/src/com/vaadin/tests/components/table/FixedHeightTable.java b/tests/testbench/com/vaadin/tests/components/table/FixedHeightTable.java
index e193a8a949..e193a8a949 100644
--- a/tests/src/com/vaadin/tests/components/table/FixedHeightTable.java
+++ b/tests/testbench/com/vaadin/tests/components/table/FixedHeightTable.java
diff --git a/tests/src/com/vaadin/tests/components/table/Footer.html b/tests/testbench/com/vaadin/tests/components/table/Footer.html
index dbbdef2f9c..dbbdef2f9c 100644
--- a/tests/src/com/vaadin/tests/components/table/Footer.html
+++ b/tests/testbench/com/vaadin/tests/components/table/Footer.html
diff --git a/tests/src/com/vaadin/tests/components/table/Footer.java b/tests/testbench/com/vaadin/tests/components/table/Footer.java
index d6a9853fff..d6a9853fff 100644
--- a/tests/src/com/vaadin/tests/components/table/Footer.java
+++ b/tests/testbench/com/vaadin/tests/components/table/Footer.java
diff --git a/tests/src/com/vaadin/tests/components/table/FooterClick.html b/tests/testbench/com/vaadin/tests/components/table/FooterClick.html
index fb3d004620..fb3d004620 100644
--- a/tests/src/com/vaadin/tests/components/table/FooterClick.html
+++ b/tests/testbench/com/vaadin/tests/components/table/FooterClick.html
diff --git a/tests/src/com/vaadin/tests/components/table/FooterClick.java b/tests/testbench/com/vaadin/tests/components/table/FooterClick.java
index b92d6ef362..b92d6ef362 100644
--- a/tests/src/com/vaadin/tests/components/table/FooterClick.java
+++ b/tests/testbench/com/vaadin/tests/components/table/FooterClick.java
diff --git a/tests/src/com/vaadin/tests/components/table/HeaderClick.html b/tests/testbench/com/vaadin/tests/components/table/HeaderClick.html
index d5328b25d3..d5328b25d3 100644
--- a/tests/src/com/vaadin/tests/components/table/HeaderClick.html
+++ b/tests/testbench/com/vaadin/tests/components/table/HeaderClick.html
diff --git a/tests/src/com/vaadin/tests/components/table/HeaderClick.java b/tests/testbench/com/vaadin/tests/components/table/HeaderClick.java
index 3cb11781b1..3cb11781b1 100644
--- a/tests/src/com/vaadin/tests/components/table/HeaderClick.java
+++ b/tests/testbench/com/vaadin/tests/components/table/HeaderClick.java
diff --git a/tests/src/com/vaadin/tests/components/table/HeaderPositionWhenSorting.html b/tests/testbench/com/vaadin/tests/components/table/HeaderPositionWhenSorting.html
index c3128820ef..c3128820ef 100644
--- a/tests/src/com/vaadin/tests/components/table/HeaderPositionWhenSorting.html
+++ b/tests/testbench/com/vaadin/tests/components/table/HeaderPositionWhenSorting.html
diff --git a/tests/src/com/vaadin/tests/components/table/HeaderSyncOnScroll.html b/tests/testbench/com/vaadin/tests/components/table/HeaderSyncOnScroll.html
index 70abbd78ba..70abbd78ba 100644
--- a/tests/src/com/vaadin/tests/components/table/HeaderSyncOnScroll.html
+++ b/tests/testbench/com/vaadin/tests/components/table/HeaderSyncOnScroll.html
diff --git a/tests/src/com/vaadin/tests/components/table/HeaderUpdateWhenNoRows.html b/tests/testbench/com/vaadin/tests/components/table/HeaderUpdateWhenNoRows.html
index ef2067fbf5..ef2067fbf5 100644
--- a/tests/src/com/vaadin/tests/components/table/HeaderUpdateWhenNoRows.html
+++ b/tests/testbench/com/vaadin/tests/components/table/HeaderUpdateWhenNoRows.html
diff --git a/tests/src/com/vaadin/tests/components/table/HeaderUpdateWhenNoRows.java b/tests/testbench/com/vaadin/tests/components/table/HeaderUpdateWhenNoRows.java
index bf1f9ca883..bf1f9ca883 100644
--- a/tests/src/com/vaadin/tests/components/table/HeaderUpdateWhenNoRows.java
+++ b/tests/testbench/com/vaadin/tests/components/table/HeaderUpdateWhenNoRows.java
diff --git a/tests/src/com/vaadin/tests/components/table/HiddenColumnsExpandRatios.java b/tests/testbench/com/vaadin/tests/components/table/HiddenColumnsExpandRatios.java
index 007c93573f..007c93573f 100644
--- a/tests/src/com/vaadin/tests/components/table/HiddenColumnsExpandRatios.java
+++ b/tests/testbench/com/vaadin/tests/components/table/HiddenColumnsExpandRatios.java
diff --git a/tests/src/com/vaadin/tests/components/table/HugeRowCount.java b/tests/testbench/com/vaadin/tests/components/table/HugeRowCount.java
index 5cd9f964a3..5cd9f964a3 100644
--- a/tests/src/com/vaadin/tests/components/table/HugeRowCount.java
+++ b/tests/testbench/com/vaadin/tests/components/table/HugeRowCount.java
diff --git a/tests/src/com/vaadin/tests/components/table/ItemClickEvents.html b/tests/testbench/com/vaadin/tests/components/table/ItemClickEvents.html
index e00482679c..e00482679c 100644
--- a/tests/src/com/vaadin/tests/components/table/ItemClickEvents.html
+++ b/tests/testbench/com/vaadin/tests/components/table/ItemClickEvents.html
diff --git a/tests/src/com/vaadin/tests/components/table/ItemClickEvents.java b/tests/testbench/com/vaadin/tests/components/table/ItemClickEvents.java
index 537461ce0f..537461ce0f 100644
--- a/tests/src/com/vaadin/tests/components/table/ItemClickEvents.java
+++ b/tests/testbench/com/vaadin/tests/components/table/ItemClickEvents.java
diff --git a/tests/src/com/vaadin/tests/components/table/KeyControl.java b/tests/testbench/com/vaadin/tests/components/table/KeyControl.java
index e662db338c..e662db338c 100644
--- a/tests/src/com/vaadin/tests/components/table/KeyControl.java
+++ b/tests/testbench/com/vaadin/tests/components/table/KeyControl.java
diff --git a/tests/src/com/vaadin/tests/components/table/KeyboardNavigationDatasourceChange.java b/tests/testbench/com/vaadin/tests/components/table/KeyboardNavigationDatasourceChange.java
index b389727fd3..b389727fd3 100644
--- a/tests/src/com/vaadin/tests/components/table/KeyboardNavigationDatasourceChange.java
+++ b/tests/testbench/com/vaadin/tests/components/table/KeyboardNavigationDatasourceChange.java
diff --git a/tests/src/com/vaadin/tests/components/table/KeyboardNavigationWithChangingContent.java b/tests/testbench/com/vaadin/tests/components/table/KeyboardNavigationWithChangingContent.java
index 44a2dcd9a9..44a2dcd9a9 100644
--- a/tests/src/com/vaadin/tests/components/table/KeyboardNavigationWithChangingContent.java
+++ b/tests/testbench/com/vaadin/tests/components/table/KeyboardNavigationWithChangingContent.java
diff --git a/tests/src/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.html b/tests/testbench/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.html
index 62e3786a44..62e3786a44 100644
--- a/tests/src/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.html
+++ b/tests/testbench/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.html
diff --git a/tests/src/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java b/tests/testbench/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java
index a54c3ce447..a54c3ce447 100644
--- a/tests/src/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java
+++ b/tests/testbench/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java
diff --git a/tests/src/com/vaadin/tests/components/table/MissingScrollbar.html b/tests/testbench/com/vaadin/tests/components/table/MissingScrollbar.html
index e1f783d42f..e1f783d42f 100644
--- a/tests/src/com/vaadin/tests/components/table/MissingScrollbar.html
+++ b/tests/testbench/com/vaadin/tests/components/table/MissingScrollbar.html
diff --git a/tests/src/com/vaadin/tests/components/table/MissingScrollbar.java b/tests/testbench/com/vaadin/tests/components/table/MissingScrollbar.java
index 5f65b40f2f..5f65b40f2f 100644
--- a/tests/src/com/vaadin/tests/components/table/MissingScrollbar.java
+++ b/tests/testbench/com/vaadin/tests/components/table/MissingScrollbar.java
diff --git a/tests/src/com/vaadin/tests/components/table/ModifyContainerProperty.html b/tests/testbench/com/vaadin/tests/components/table/ModifyContainerProperty.html
index 93d97cd698..93d97cd698 100644
--- a/tests/src/com/vaadin/tests/components/table/ModifyContainerProperty.html
+++ b/tests/testbench/com/vaadin/tests/components/table/ModifyContainerProperty.html
diff --git a/tests/src/com/vaadin/tests/components/table/ModifyContainerProperty.java b/tests/testbench/com/vaadin/tests/components/table/ModifyContainerProperty.java
index be3b6d3ec0..be3b6d3ec0 100644
--- a/tests/src/com/vaadin/tests/components/table/ModifyContainerProperty.java
+++ b/tests/testbench/com/vaadin/tests/components/table/ModifyContainerProperty.java
diff --git a/tests/src/com/vaadin/tests/components/table/MultiSelectWithNotIdentityEqualIds.java b/tests/testbench/com/vaadin/tests/components/table/MultiSelectWithNotIdentityEqualIds.java
index 62fd53d769..62fd53d769 100644
--- a/tests/src/com/vaadin/tests/components/table/MultiSelectWithNotIdentityEqualIds.java
+++ b/tests/testbench/com/vaadin/tests/components/table/MultiSelectWithNotIdentityEqualIds.java
diff --git a/tests/src/com/vaadin/tests/components/table/NotselectablePaintSelections.java b/tests/testbench/com/vaadin/tests/components/table/NotselectablePaintSelections.java
index 9d3011365d..9d3011365d 100644
--- a/tests/src/com/vaadin/tests/components/table/NotselectablePaintSelections.java
+++ b/tests/testbench/com/vaadin/tests/components/table/NotselectablePaintSelections.java
diff --git a/tests/src/com/vaadin/tests/components/table/OddEvenRowStyling.html b/tests/testbench/com/vaadin/tests/components/table/OddEvenRowStyling.html
index 525ad34888..525ad34888 100644
--- a/tests/src/com/vaadin/tests/components/table/OddEvenRowStyling.html
+++ b/tests/testbench/com/vaadin/tests/components/table/OddEvenRowStyling.html
diff --git a/tests/src/com/vaadin/tests/components/table/OddEvenRowStyling.java b/tests/testbench/com/vaadin/tests/components/table/OddEvenRowStyling.java
index 578672ec83..578672ec83 100644
--- a/tests/src/com/vaadin/tests/components/table/OddEvenRowStyling.java
+++ b/tests/testbench/com/vaadin/tests/components/table/OddEvenRowStyling.java
diff --git a/tests/src/com/vaadin/tests/components/table/PropertyValueChange.html b/tests/testbench/com/vaadin/tests/components/table/PropertyValueChange.html
index 71d323cdc0..71d323cdc0 100644
--- a/tests/src/com/vaadin/tests/components/table/PropertyValueChange.html
+++ b/tests/testbench/com/vaadin/tests/components/table/PropertyValueChange.html
diff --git a/tests/src/com/vaadin/tests/components/table/PropertyValueChange.java b/tests/testbench/com/vaadin/tests/components/table/PropertyValueChange.java
index 5975137976..5975137976 100644
--- a/tests/src/com/vaadin/tests/components/table/PropertyValueChange.java
+++ b/tests/testbench/com/vaadin/tests/components/table/PropertyValueChange.java
diff --git a/tests/src/com/vaadin/tests/components/table/ResizeColumnAfterScrolling.html b/tests/testbench/com/vaadin/tests/components/table/ResizeColumnAfterScrolling.html
index 7e7536d63a..7e7536d63a 100644
--- a/tests/src/com/vaadin/tests/components/table/ResizeColumnAfterScrolling.html
+++ b/tests/testbench/com/vaadin/tests/components/table/ResizeColumnAfterScrolling.html
diff --git a/tests/src/com/vaadin/tests/components/table/RowAdditionTest.java b/tests/testbench/com/vaadin/tests/components/table/RowAdditionTest.java
index 742cc0acf3..742cc0acf3 100644
--- a/tests/src/com/vaadin/tests/components/table/RowAdditionTest.java
+++ b/tests/testbench/com/vaadin/tests/components/table/RowAdditionTest.java
diff --git a/tests/src/com/vaadin/tests/components/table/RowGenerators.java b/tests/testbench/com/vaadin/tests/components/table/RowGenerators.java
index 1ddb03c316..1ddb03c316 100644
--- a/tests/src/com/vaadin/tests/components/table/RowGenerators.java
+++ b/tests/testbench/com/vaadin/tests/components/table/RowGenerators.java
diff --git a/tests/src/com/vaadin/tests/components/table/SafariRenderingBugWhiteSpace.java b/tests/testbench/com/vaadin/tests/components/table/SafariRenderingBugWhiteSpace.java
index 133a5e83a5..133a5e83a5 100644
--- a/tests/src/com/vaadin/tests/components/table/SafariRenderingBugWhiteSpace.java
+++ b/tests/testbench/com/vaadin/tests/components/table/SafariRenderingBugWhiteSpace.java
diff --git a/tests/src/com/vaadin/tests/components/table/SelectingItemScrollsRight.java b/tests/testbench/com/vaadin/tests/components/table/SelectingItemScrollsRight.java
index cfe0301775..cfe0301775 100644
--- a/tests/src/com/vaadin/tests/components/table/SelectingItemScrollsRight.java
+++ b/tests/testbench/com/vaadin/tests/components/table/SelectingItemScrollsRight.java
diff --git a/tests/src/com/vaadin/tests/components/table/SortLongTable.html b/tests/testbench/com/vaadin/tests/components/table/SortLongTable.html
index 96513509e1..96513509e1 100644
--- a/tests/src/com/vaadin/tests/components/table/SortLongTable.html
+++ b/tests/testbench/com/vaadin/tests/components/table/SortLongTable.html
diff --git a/tests/src/com/vaadin/tests/components/table/SortLongTable.java b/tests/testbench/com/vaadin/tests/components/table/SortLongTable.java
index cc9dec0965..cc9dec0965 100644
--- a/tests/src/com/vaadin/tests/components/table/SortLongTable.java
+++ b/tests/testbench/com/vaadin/tests/components/table/SortLongTable.java
diff --git a/tests/src/com/vaadin/tests/components/table/TableAndBrowserContextMenu.java b/tests/testbench/com/vaadin/tests/components/table/TableAndBrowserContextMenu.java
index d1fce928d4..d1fce928d4 100644
--- a/tests/src/com/vaadin/tests/components/table/TableAndBrowserContextMenu.java
+++ b/tests/testbench/com/vaadin/tests/components/table/TableAndBrowserContextMenu.java
diff --git a/tests/src/com/vaadin/tests/components/table/TableCacheBuildEfficiency.java b/tests/testbench/com/vaadin/tests/components/table/TableCacheBuildEfficiency.java
index 220d5e8192..220d5e8192 100644
--- a/tests/src/com/vaadin/tests/components/table/TableCacheBuildEfficiency.java
+++ b/tests/testbench/com/vaadin/tests/components/table/TableCacheBuildEfficiency.java
diff --git a/tests/src/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.html b/tests/testbench/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.html
index 7ad0873c0f..7ad0873c0f 100644
--- a/tests/src/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.html
+++ b/tests/testbench/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.html
diff --git a/tests/src/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java b/tests/testbench/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java
index ee04813ce6..ee04813ce6 100644
--- a/tests/src/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java
+++ b/tests/testbench/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java
diff --git a/tests/src/com/vaadin/tests/components/table/TableColumnAlignment.html b/tests/testbench/com/vaadin/tests/components/table/TableColumnAlignment.html
index 49bb86dbce..49bb86dbce 100644
--- a/tests/src/com/vaadin/tests/components/table/TableColumnAlignment.html
+++ b/tests/testbench/com/vaadin/tests/components/table/TableColumnAlignment.html
diff --git a/tests/src/com/vaadin/tests/components/table/TableColumnHeaders.html b/tests/testbench/com/vaadin/tests/components/table/TableColumnHeaders.html
index 9f4e6cb8da..9f4e6cb8da 100644
--- a/tests/src/com/vaadin/tests/components/table/TableColumnHeaders.html
+++ b/tests/testbench/com/vaadin/tests/components/table/TableColumnHeaders.html
diff --git a/tests/src/com/vaadin/tests/components/table/TableColumnIcons.html b/tests/testbench/com/vaadin/tests/components/table/TableColumnIcons.html
index 81b8be89fa..81b8be89fa 100644
--- a/tests/src/com/vaadin/tests/components/table/TableColumnIcons.html
+++ b/tests/testbench/com/vaadin/tests/components/table/TableColumnIcons.html
diff --git a/tests/src/com/vaadin/tests/components/table/TableColumnResizeContentsWidth.html b/tests/testbench/com/vaadin/tests/components/table/TableColumnResizeContentsWidth.html
index 9c8a12fe15..9c8a12fe15 100644
--- a/tests/src/com/vaadin/tests/components/table/TableColumnResizeContentsWidth.html
+++ b/tests/testbench/com/vaadin/tests/components/table/TableColumnResizeContentsWidth.html
diff --git a/tests/src/com/vaadin/tests/components/table/TableColumnResizeContentsWidth.java b/tests/testbench/com/vaadin/tests/components/table/TableColumnResizeContentsWidth.java
index fbe7ed88ef..fbe7ed88ef 100644
--- a/tests/src/com/vaadin/tests/components/table/TableColumnResizeContentsWidth.java
+++ b/tests/testbench/com/vaadin/tests/components/table/TableColumnResizeContentsWidth.java
diff --git a/tests/src/com/vaadin/tests/components/table/TableColumnSorting.html b/tests/testbench/com/vaadin/tests/components/table/TableColumnSorting.html
index f513d147a8..f513d147a8 100644
--- a/tests/src/com/vaadin/tests/components/table/TableColumnSorting.html
+++ b/tests/testbench/com/vaadin/tests/components/table/TableColumnSorting.html
diff --git a/tests/src/com/vaadin/tests/components/table/TableContextMenuAndIcons.html b/tests/testbench/com/vaadin/tests/components/table/TableContextMenuAndIcons.html
index 54d8e624f1..54d8e624f1 100644
--- a/tests/src/com/vaadin/tests/components/table/TableContextMenuAndIcons.html
+++ b/tests/testbench/com/vaadin/tests/components/table/TableContextMenuAndIcons.html
diff --git a/tests/src/com/vaadin/tests/components/table/TableContextMenuOnField.java b/tests/testbench/com/vaadin/tests/components/table/TableContextMenuOnField.java
index 4c6f658a24..4c6f658a24 100644
--- a/tests/src/com/vaadin/tests/components/table/TableContextMenuOnField.java
+++ b/tests/testbench/com/vaadin/tests/components/table/TableContextMenuOnField.java
diff --git a/tests/src/com/vaadin/tests/components/table/TableDragColumn.html b/tests/testbench/com/vaadin/tests/components/table/TableDragColumn.html
index 7c2dc2813c..7c2dc2813c 100644
--- a/tests/src/com/vaadin/tests/components/table/TableDragColumn.html
+++ b/tests/testbench/com/vaadin/tests/components/table/TableDragColumn.html
diff --git a/tests/src/com/vaadin/tests/components/table/TableExtraScrollbars.java b/tests/testbench/com/vaadin/tests/components/table/TableExtraScrollbars.java
index bc8c40108c..bc8c40108c 100644
--- a/tests/src/com/vaadin/tests/components/table/TableExtraScrollbars.java
+++ b/tests/testbench/com/vaadin/tests/components/table/TableExtraScrollbars.java
diff --git a/tests/src/com/vaadin/tests/components/table/TableGeneratedColumns.html b/tests/testbench/com/vaadin/tests/components/table/TableGeneratedColumns.html
index 19326e9f12..19326e9f12 100644
--- a/tests/src/com/vaadin/tests/components/table/TableGeneratedColumns.html
+++ b/tests/testbench/com/vaadin/tests/components/table/TableGeneratedColumns.html
diff --git a/tests/src/com/vaadin/tests/components/table/TableGeneratedRows.html b/tests/testbench/com/vaadin/tests/components/table/TableGeneratedRows.html
index 35a600765f..35a600765f 100644
--- a/tests/src/com/vaadin/tests/components/table/TableGeneratedRows.html
+++ b/tests/testbench/com/vaadin/tests/components/table/TableGeneratedRows.html
diff --git a/tests/src/com/vaadin/tests/components/table/TableGeneratedStringColumns.html b/tests/testbench/com/vaadin/tests/components/table/TableGeneratedStringColumns.html
index 4d5f4c2d17..4d5f4c2d17 100644
--- a/tests/src/com/vaadin/tests/components/table/TableGeneratedStringColumns.html
+++ b/tests/testbench/com/vaadin/tests/components/table/TableGeneratedStringColumns.html
diff --git a/tests/src/com/vaadin/tests/components/table/TableHeaderShifting.java b/tests/testbench/com/vaadin/tests/components/table/TableHeaderShifting.java
index 9dc641ddc4..9dc641ddc4 100644
--- a/tests/src/com/vaadin/tests/components/table/TableHeaderShifting.java
+++ b/tests/testbench/com/vaadin/tests/components/table/TableHeaderShifting.java
diff --git a/tests/src/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.html b/tests/testbench/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.html
index 01b2c578f0..01b2c578f0 100644
--- a/tests/src/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.html
+++ b/tests/testbench/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.html
diff --git a/tests/src/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.java b/tests/testbench/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.java
index d0b7631f10..d0b7631f10 100644
--- a/tests/src/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.java
+++ b/tests/testbench/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.java
diff --git a/tests/src/com/vaadin/tests/components/table/TableItemDescriptionGeneratorTest.java b/tests/testbench/com/vaadin/tests/components/table/TableItemDescriptionGeneratorTest.java
index 2f53b91107..2f53b91107 100644
--- a/tests/src/com/vaadin/tests/components/table/TableItemDescriptionGeneratorTest.java
+++ b/tests/testbench/com/vaadin/tests/components/table/TableItemDescriptionGeneratorTest.java
diff --git a/tests/src/com/vaadin/tests/components/table/TableItemIcon.java b/tests/testbench/com/vaadin/tests/components/table/TableItemIcon.java
index b8a6733e83..b8a6733e83 100644
--- a/tests/src/com/vaadin/tests/components/table/TableItemIcon.java
+++ b/tests/testbench/com/vaadin/tests/components/table/TableItemIcon.java
diff --git a/tests/src/com/vaadin/tests/components/table/TableLastRowMissing.html b/tests/testbench/com/vaadin/tests/components/table/TableLastRowMissing.html
index ca8ee6d6a4..ca8ee6d6a4 100644
--- a/tests/src/com/vaadin/tests/components/table/TableLastRowMissing.html
+++ b/tests/testbench/com/vaadin/tests/components/table/TableLastRowMissing.html
diff --git a/tests/src/com/vaadin/tests/components/table/TableLastRowMissing.java b/tests/testbench/com/vaadin/tests/components/table/TableLastRowMissing.java
index 4e4a223e23..4e4a223e23 100644
--- a/tests/src/com/vaadin/tests/components/table/TableLastRowMissing.java
+++ b/tests/testbench/com/vaadin/tests/components/table/TableLastRowMissing.java
diff --git a/tests/src/com/vaadin/tests/components/table/TableModifcationsWhenScrolledRight.java b/tests/testbench/com/vaadin/tests/components/table/TableModifcationsWhenScrolledRight.java
index 7d29b8650e..7d29b8650e 100644
--- a/tests/src/com/vaadin/tests/components/table/TableModifcationsWhenScrolledRight.java
+++ b/tests/testbench/com/vaadin/tests/components/table/TableModifcationsWhenScrolledRight.java
diff --git a/tests/src/com/vaadin/tests/components/table/TableModificationsWhenScrolledRight.html b/tests/testbench/com/vaadin/tests/components/table/TableModificationsWhenScrolledRight.html
index b225b30726..b225b30726 100644
--- a/tests/src/com/vaadin/tests/components/table/TableModificationsWhenScrolledRight.html
+++ b/tests/testbench/com/vaadin/tests/components/table/TableModificationsWhenScrolledRight.html
diff --git a/tests/src/com/vaadin/tests/components/table/TableMultiSelectMouse.html b/tests/testbench/com/vaadin/tests/components/table/TableMultiSelectMouse.html
index 8d7c0d98b0..8d7c0d98b0 100644
--- a/tests/src/com/vaadin/tests/components/table/TableMultiSelectMouse.html
+++ b/tests/testbench/com/vaadin/tests/components/table/TableMultiSelectMouse.html
diff --git a/tests/src/com/vaadin/tests/components/table/TableMultiSelectSimple.html b/tests/testbench/com/vaadin/tests/components/table/TableMultiSelectSimple.html
index dcf88620ca..dcf88620ca 100644
--- a/tests/src/com/vaadin/tests/components/table/TableMultiSelectSimple.html
+++ b/tests/testbench/com/vaadin/tests/components/table/TableMultiSelectSimple.html
diff --git a/tests/src/com/vaadin/tests/components/table/TableMultiSelectSimple.java b/tests/testbench/com/vaadin/tests/components/table/TableMultiSelectSimple.java
index 76415844be..76415844be 100644
--- a/tests/src/com/vaadin/tests/components/table/TableMultiSelectSimple.java
+++ b/tests/testbench/com/vaadin/tests/components/table/TableMultiSelectSimple.java
diff --git a/tests/src/com/vaadin/tests/components/table/TablePageLengthCalculation.java b/tests/testbench/com/vaadin/tests/components/table/TablePageLengthCalculation.java
index 5847450f89..5847450f89 100644
--- a/tests/src/com/vaadin/tests/components/table/TablePageLengthCalculation.java
+++ b/tests/testbench/com/vaadin/tests/components/table/TablePageLengthCalculation.java
diff --git a/tests/src/com/vaadin/tests/components/table/TablePageLengthUpdate.html b/tests/testbench/com/vaadin/tests/components/table/TablePageLengthUpdate.html
index bc438eaf1b..bc438eaf1b 100644
--- a/tests/src/com/vaadin/tests/components/table/TablePageLengthUpdate.html
+++ b/tests/testbench/com/vaadin/tests/components/table/TablePageLengthUpdate.html
diff --git a/tests/src/com/vaadin/tests/components/table/TablePageLengthUpdate.java b/tests/testbench/com/vaadin/tests/components/table/TablePageLengthUpdate.java
index 71dc987e56..71dc987e56 100644
--- a/tests/src/com/vaadin/tests/components/table/TablePageLengthUpdate.java
+++ b/tests/testbench/com/vaadin/tests/components/table/TablePageLengthUpdate.java
diff --git a/tests/src/com/vaadin/tests/components/table/TableRemoveActionHandlers.html b/tests/testbench/com/vaadin/tests/components/table/TableRemoveActionHandlers.html
index a363f6980e..a363f6980e 100644
--- a/tests/src/com/vaadin/tests/components/table/TableRemoveActionHandlers.html
+++ b/tests/testbench/com/vaadin/tests/components/table/TableRemoveActionHandlers.html
diff --git a/tests/src/com/vaadin/tests/components/table/TableRowHeight.html b/tests/testbench/com/vaadin/tests/components/table/TableRowHeight.html
index a28df6329f..a28df6329f 100644
--- a/tests/src/com/vaadin/tests/components/table/TableRowHeight.html
+++ b/tests/testbench/com/vaadin/tests/components/table/TableRowHeight.html
diff --git a/tests/src/com/vaadin/tests/components/table/TableRowHeight.java b/tests/testbench/com/vaadin/tests/components/table/TableRowHeight.java
index b3864ae0e4..b3864ae0e4 100644
--- a/tests/src/com/vaadin/tests/components/table/TableRowHeight.java
+++ b/tests/testbench/com/vaadin/tests/components/table/TableRowHeight.java
diff --git a/tests/src/com/vaadin/tests/components/table/TableRowHeight2.html b/tests/testbench/com/vaadin/tests/components/table/TableRowHeight2.html
index a440ff84fb..a440ff84fb 100644
--- a/tests/src/com/vaadin/tests/components/table/TableRowHeight2.html
+++ b/tests/testbench/com/vaadin/tests/components/table/TableRowHeight2.html
diff --git a/tests/src/com/vaadin/tests/components/table/TableRowHeight2.java b/tests/testbench/com/vaadin/tests/components/table/TableRowHeight2.java
index 0011fdca18..0011fdca18 100644
--- a/tests/src/com/vaadin/tests/components/table/TableRowHeight2.java
+++ b/tests/testbench/com/vaadin/tests/components/table/TableRowHeight2.java
diff --git a/tests/src/com/vaadin/tests/components/table/TableRowHeight3.html b/tests/testbench/com/vaadin/tests/components/table/TableRowHeight3.html
index 2aa90085e4..2aa90085e4 100644
--- a/tests/src/com/vaadin/tests/components/table/TableRowHeight3.html
+++ b/tests/testbench/com/vaadin/tests/components/table/TableRowHeight3.html
diff --git a/tests/src/com/vaadin/tests/components/table/TableRowHeight3.java b/tests/testbench/com/vaadin/tests/components/table/TableRowHeight3.java
index c31b87f9da..c31b87f9da 100644
--- a/tests/src/com/vaadin/tests/components/table/TableRowHeight3.java
+++ b/tests/testbench/com/vaadin/tests/components/table/TableRowHeight3.java
diff --git a/tests/src/com/vaadin/tests/components/table/TableScrollOnFocus.html b/tests/testbench/com/vaadin/tests/components/table/TableScrollOnFocus.html
index 1a91211040..1a91211040 100644
--- a/tests/src/com/vaadin/tests/components/table/TableScrollOnFocus.html
+++ b/tests/testbench/com/vaadin/tests/components/table/TableScrollOnFocus.html
diff --git a/tests/src/com/vaadin/tests/components/table/TableScrollOnFocus.java b/tests/testbench/com/vaadin/tests/components/table/TableScrollOnFocus.java
index 05e101a5f9..05e101a5f9 100644
--- a/tests/src/com/vaadin/tests/components/table/TableScrollOnFocus.java
+++ b/tests/testbench/com/vaadin/tests/components/table/TableScrollOnFocus.java
diff --git a/tests/src/com/vaadin/tests/components/table/TableScrolling.html b/tests/testbench/com/vaadin/tests/components/table/TableScrolling.html
index 51fa844412..51fa844412 100644
--- a/tests/src/com/vaadin/tests/components/table/TableScrolling.html
+++ b/tests/testbench/com/vaadin/tests/components/table/TableScrolling.html
diff --git a/tests/src/com/vaadin/tests/components/table/TableScrollsOnSelection.html b/tests/testbench/com/vaadin/tests/components/table/TableScrollsOnSelection.html
index dff3dcbc48..dff3dcbc48 100644
--- a/tests/src/com/vaadin/tests/components/table/TableScrollsOnSelection.html
+++ b/tests/testbench/com/vaadin/tests/components/table/TableScrollsOnSelection.html
diff --git a/tests/src/com/vaadin/tests/components/table/TableScrollsOnSelection.java b/tests/testbench/com/vaadin/tests/components/table/TableScrollsOnSelection.java
index c76fe05d47..c76fe05d47 100644
--- a/tests/src/com/vaadin/tests/components/table/TableScrollsOnSelection.java
+++ b/tests/testbench/com/vaadin/tests/components/table/TableScrollsOnSelection.java
diff --git a/tests/src/com/vaadin/tests/components/table/TableSelectPagingOff.java b/tests/testbench/com/vaadin/tests/components/table/TableSelectPagingOff.java
index 4d97a1a669..4d97a1a669 100644
--- a/tests/src/com/vaadin/tests/components/table/TableSelectPagingOff.java
+++ b/tests/testbench/com/vaadin/tests/components/table/TableSelectPagingOff.java
diff --git a/tests/src/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.html b/tests/testbench/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.html
index ede2ea70fc..ede2ea70fc 100644
--- a/tests/src/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.html
+++ b/tests/testbench/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.html
diff --git a/tests/src/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.java b/tests/testbench/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.java
index 21e26b64b8..21e26b64b8 100644
--- a/tests/src/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.java
+++ b/tests/testbench/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.java
diff --git a/tests/src/com/vaadin/tests/components/table/TableSingleSelect.html b/tests/testbench/com/vaadin/tests/components/table/TableSingleSelect.html
index c029e2889b..c029e2889b 100644
--- a/tests/src/com/vaadin/tests/components/table/TableSingleSelect.html
+++ b/tests/testbench/com/vaadin/tests/components/table/TableSingleSelect.html
diff --git a/tests/src/com/vaadin/tests/components/table/TableSingleSelect.java b/tests/testbench/com/vaadin/tests/components/table/TableSingleSelect.java
index edde284848..edde284848 100644
--- a/tests/src/com/vaadin/tests/components/table/TableSingleSelect.java
+++ b/tests/testbench/com/vaadin/tests/components/table/TableSingleSelect.java
diff --git a/tests/src/com/vaadin/tests/components/table/TableSorting.java b/tests/testbench/com/vaadin/tests/components/table/TableSorting.java
index 4cbb1934e4..4cbb1934e4 100644
--- a/tests/src/com/vaadin/tests/components/table/TableSorting.java
+++ b/tests/testbench/com/vaadin/tests/components/table/TableSorting.java
diff --git a/tests/src/com/vaadin/tests/components/table/TableToggleVisibility.html b/tests/testbench/com/vaadin/tests/components/table/TableToggleVisibility.html
index e9c57203c0..e9c57203c0 100644
--- a/tests/src/com/vaadin/tests/components/table/TableToggleVisibility.html
+++ b/tests/testbench/com/vaadin/tests/components/table/TableToggleVisibility.html
diff --git a/tests/src/com/vaadin/tests/components/table/TableToggleVisibility.java b/tests/testbench/com/vaadin/tests/components/table/TableToggleVisibility.java
index 5c456ab230..5c456ab230 100644
--- a/tests/src/com/vaadin/tests/components/table/TableToggleVisibility.java
+++ b/tests/testbench/com/vaadin/tests/components/table/TableToggleVisibility.java
diff --git a/tests/src/com/vaadin/tests/components/table/TableTooltips.html b/tests/testbench/com/vaadin/tests/components/table/TableTooltips.html
index 989fb865c5..989fb865c5 100644
--- a/tests/src/com/vaadin/tests/components/table/TableTooltips.html
+++ b/tests/testbench/com/vaadin/tests/components/table/TableTooltips.html
diff --git a/tests/src/com/vaadin/tests/components/table/TableUndefinedSize.html b/tests/testbench/com/vaadin/tests/components/table/TableUndefinedSize.html
index fbb6f4c7f9..fbb6f4c7f9 100644
--- a/tests/src/com/vaadin/tests/components/table/TableUndefinedSize.html
+++ b/tests/testbench/com/vaadin/tests/components/table/TableUndefinedSize.html
diff --git a/tests/src/com/vaadin/tests/components/table/TableUndefinedSize.java b/tests/testbench/com/vaadin/tests/components/table/TableUndefinedSize.java
index 2b3204953b..2b3204953b 100644
--- a/tests/src/com/vaadin/tests/components/table/TableUndefinedSize.java
+++ b/tests/testbench/com/vaadin/tests/components/table/TableUndefinedSize.java
diff --git a/tests/src/com/vaadin/tests/components/table/TableUnregisterComponent.html b/tests/testbench/com/vaadin/tests/components/table/TableUnregisterComponent.html
index 1e5617d64f..1e5617d64f 100644
--- a/tests/src/com/vaadin/tests/components/table/TableUnregisterComponent.html
+++ b/tests/testbench/com/vaadin/tests/components/table/TableUnregisterComponent.html
diff --git a/tests/src/com/vaadin/tests/components/table/TableUnregisterComponent.java b/tests/testbench/com/vaadin/tests/components/table/TableUnregisterComponent.java
index 91f5aec1ca..91f5aec1ca 100644
--- a/tests/src/com/vaadin/tests/components/table/TableUnregisterComponent.java
+++ b/tests/testbench/com/vaadin/tests/components/table/TableUnregisterComponent.java
diff --git a/tests/src/com/vaadin/tests/components/table/TableVisibleColumnsUpdate.html b/tests/testbench/com/vaadin/tests/components/table/TableVisibleColumnsUpdate.html
index 05325cb9e6..05325cb9e6 100644
--- a/tests/src/com/vaadin/tests/components/table/TableVisibleColumnsUpdate.html
+++ b/tests/testbench/com/vaadin/tests/components/table/TableVisibleColumnsUpdate.html
diff --git a/tests/src/com/vaadin/tests/components/table/TableVisibleColumnsUpdate.java b/tests/testbench/com/vaadin/tests/components/table/TableVisibleColumnsUpdate.java
index ad8eacb4b7..ad8eacb4b7 100644
--- a/tests/src/com/vaadin/tests/components/table/TableVisibleColumnsUpdate.java
+++ b/tests/testbench/com/vaadin/tests/components/table/TableVisibleColumnsUpdate.java
diff --git a/tests/src/com/vaadin/tests/components/table/TableWithManyColumns.html b/tests/testbench/com/vaadin/tests/components/table/TableWithManyColumns.html
index 5fea0c99df..5fea0c99df 100644
--- a/tests/src/com/vaadin/tests/components/table/TableWithManyColumns.html
+++ b/tests/testbench/com/vaadin/tests/components/table/TableWithManyColumns.html
diff --git a/tests/src/com/vaadin/tests/components/table/TableWithManyColumns.java b/tests/testbench/com/vaadin/tests/components/table/TableWithManyColumns.java
index 543c1ebae2..543c1ebae2 100644
--- a/tests/src/com/vaadin/tests/components/table/TableWithManyColumns.java
+++ b/tests/testbench/com/vaadin/tests/components/table/TableWithManyColumns.java
diff --git a/tests/src/com/vaadin/tests/components/table/Tables.java b/tests/testbench/com/vaadin/tests/components/table/Tables.java
index 3a34fb47b2..3a34fb47b2 100644
--- a/tests/src/com/vaadin/tests/components/table/Tables.java
+++ b/tests/testbench/com/vaadin/tests/components/table/Tables.java
diff --git a/tests/src/com/vaadin/tests/components/table/TestCurrentPageFirstItem.java b/tests/testbench/com/vaadin/tests/components/table/TestCurrentPageFirstItem.java
index 9c3b2de3e0..9c3b2de3e0 100644
--- a/tests/src/com/vaadin/tests/components/table/TestCurrentPageFirstItem.java
+++ b/tests/testbench/com/vaadin/tests/components/table/TestCurrentPageFirstItem.java
diff --git a/tests/src/com/vaadin/tests/components/table/TextFieldRelativeWidth.html b/tests/testbench/com/vaadin/tests/components/table/TextFieldRelativeWidth.html
index 99f8f5bf9b..99f8f5bf9b 100644
--- a/tests/src/com/vaadin/tests/components/table/TextFieldRelativeWidth.html
+++ b/tests/testbench/com/vaadin/tests/components/table/TextFieldRelativeWidth.html
diff --git a/tests/src/com/vaadin/tests/components/table/TextFieldRelativeWidth.java b/tests/testbench/com/vaadin/tests/components/table/TextFieldRelativeWidth.java
index 13ca9f8cf3..13ca9f8cf3 100644
--- a/tests/src/com/vaadin/tests/components/table/TextFieldRelativeWidth.java
+++ b/tests/testbench/com/vaadin/tests/components/table/TextFieldRelativeWidth.java
diff --git a/tests/src/com/vaadin/tests/components/table/UncollapsedCollumnWidth.html b/tests/testbench/com/vaadin/tests/components/table/UncollapsedCollumnWidth.html
index e1b39533f3..e1b39533f3 100644
--- a/tests/src/com/vaadin/tests/components/table/UncollapsedCollumnWidth.html
+++ b/tests/testbench/com/vaadin/tests/components/table/UncollapsedCollumnWidth.html
diff --git a/tests/src/com/vaadin/tests/components/table/UncollapsedCollumnWidth.java b/tests/testbench/com/vaadin/tests/components/table/UncollapsedCollumnWidth.java
index 99b954fa63..99b954fa63 100644
--- a/tests/src/com/vaadin/tests/components/table/UncollapsedCollumnWidth.java
+++ b/tests/testbench/com/vaadin/tests/components/table/UncollapsedCollumnWidth.java
diff --git a/tests/src/com/vaadin/tests/components/table/WideSelectableTable.java b/tests/testbench/com/vaadin/tests/components/table/WideSelectableTable.java
index c820dc08d5..c820dc08d5 100644
--- a/tests/src/com/vaadin/tests/components/table/WideSelectableTable.java
+++ b/tests/testbench/com/vaadin/tests/components/table/WideSelectableTable.java
diff --git a/tests/src/com/vaadin/tests/components/table/fi.gif b/tests/testbench/com/vaadin/tests/components/table/fi.gif
index 8d3a191828..8d3a191828 100755
--- a/tests/src/com/vaadin/tests/components/table/fi.gif
+++ b/tests/testbench/com/vaadin/tests/components/table/fi.gif
diff --git a/tests/src/com/vaadin/tests/components/table/se.gif b/tests/testbench/com/vaadin/tests/components/table/se.gif
index 80f6285228..80f6285228 100755
--- a/tests/src/com/vaadin/tests/components/table/se.gif
+++ b/tests/testbench/com/vaadin/tests/components/table/se.gif
diff --git a/tests/src/com/vaadin/tests/components/tabsheet/AddAndRemoveTabs.html b/tests/testbench/com/vaadin/tests/components/tabsheet/AddAndRemoveTabs.html
index 993ef79c91..993ef79c91 100644
--- a/tests/src/com/vaadin/tests/components/tabsheet/AddAndRemoveTabs.html
+++ b/tests/testbench/com/vaadin/tests/components/tabsheet/AddAndRemoveTabs.html
diff --git a/tests/src/com/vaadin/tests/components/tabsheet/AddAndRemoveTabs.java b/tests/testbench/com/vaadin/tests/components/tabsheet/AddAndRemoveTabs.java
index 3b5166a21e..3b5166a21e 100644
--- a/tests/src/com/vaadin/tests/components/tabsheet/AddAndRemoveTabs.java
+++ b/tests/testbench/com/vaadin/tests/components/tabsheet/AddAndRemoveTabs.java
diff --git a/tests/src/com/vaadin/tests/components/tabsheet/PreventTabChange.html b/tests/testbench/com/vaadin/tests/components/tabsheet/PreventTabChange.html
index c4f5998f47..c4f5998f47 100644
--- a/tests/src/com/vaadin/tests/components/tabsheet/PreventTabChange.html
+++ b/tests/testbench/com/vaadin/tests/components/tabsheet/PreventTabChange.html
diff --git a/tests/src/com/vaadin/tests/components/tabsheet/PreventTabChange.java b/tests/testbench/com/vaadin/tests/components/tabsheet/PreventTabChange.java
index f1faecb711..f1faecb711 100644
--- a/tests/src/com/vaadin/tests/components/tabsheet/PreventTabChange.java
+++ b/tests/testbench/com/vaadin/tests/components/tabsheet/PreventTabChange.java
diff --git a/tests/src/com/vaadin/tests/components/tabsheet/RemoveTabs.java b/tests/testbench/com/vaadin/tests/components/tabsheet/RemoveTabs.java
index 8602a9a3b4..8602a9a3b4 100644
--- a/tests/src/com/vaadin/tests/components/tabsheet/RemoveTabs.java
+++ b/tests/testbench/com/vaadin/tests/components/tabsheet/RemoveTabs.java
diff --git a/tests/src/com/vaadin/tests/components/tabsheet/RemoveTabsTabsheet.html b/tests/testbench/com/vaadin/tests/components/tabsheet/RemoveTabsTabsheet.html
index 13f103b82d..13f103b82d 100644
--- a/tests/src/com/vaadin/tests/components/tabsheet/RemoveTabsTabsheet.html
+++ b/tests/testbench/com/vaadin/tests/components/tabsheet/RemoveTabsTabsheet.html
diff --git a/tests/src/com/vaadin/tests/components/tabsheet/TabGetAndReplaceComponent.html b/tests/testbench/com/vaadin/tests/components/tabsheet/TabGetAndReplaceComponent.html
index fce39361e1..fce39361e1 100644
--- a/tests/src/com/vaadin/tests/components/tabsheet/TabGetAndReplaceComponent.html
+++ b/tests/testbench/com/vaadin/tests/components/tabsheet/TabGetAndReplaceComponent.html
diff --git a/tests/src/com/vaadin/tests/components/tabsheet/TabGetAndReplaceComponent.java b/tests/testbench/com/vaadin/tests/components/tabsheet/TabGetAndReplaceComponent.java
index c49133dd7c..c49133dd7c 100644
--- a/tests/src/com/vaadin/tests/components/tabsheet/TabGetAndReplaceComponent.java
+++ b/tests/testbench/com/vaadin/tests/components/tabsheet/TabGetAndReplaceComponent.java
diff --git a/tests/src/com/vaadin/tests/components/tabsheet/TabSheetBasicOperations.html b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetBasicOperations.html
index 5ee81a48d1..5ee81a48d1 100644
--- a/tests/src/com/vaadin/tests/components/tabsheet/TabSheetBasicOperations.html
+++ b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetBasicOperations.html
diff --git a/tests/src/com/vaadin/tests/components/tabsheet/TabSheetCaptions.html b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetCaptions.html
index d240d4b419..d240d4b419 100644
--- a/tests/src/com/vaadin/tests/components/tabsheet/TabSheetCaptions.html
+++ b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetCaptions.html
diff --git a/tests/src/com/vaadin/tests/components/tabsheet/TabSheetCaptions.java b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetCaptions.java
index 8449dd42bf..8449dd42bf 100644
--- a/tests/src/com/vaadin/tests/components/tabsheet/TabSheetCaptions.java
+++ b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetCaptions.java
diff --git a/tests/src/com/vaadin/tests/components/tabsheet/TabSheetDisabling.html b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetDisabling.html
index bc03f7687b..bc03f7687b 100644
--- a/tests/src/com/vaadin/tests/components/tabsheet/TabSheetDisabling.html
+++ b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetDisabling.html
diff --git a/tests/src/com/vaadin/tests/components/tabsheet/TabSheetDisabling.java b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetDisabling.java
index 4f4ab836ed..4f4ab836ed 100644
--- a/tests/src/com/vaadin/tests/components/tabsheet/TabSheetDisabling.java
+++ b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetDisabling.java
diff --git a/tests/src/com/vaadin/tests/components/tabsheet/TabSheetDiscardsMovedComponents.html b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetDiscardsMovedComponents.html
index 4cb6925b28..4cb6925b28 100644
--- a/tests/src/com/vaadin/tests/components/tabsheet/TabSheetDiscardsMovedComponents.html
+++ b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetDiscardsMovedComponents.html
diff --git a/tests/src/com/vaadin/tests/components/tabsheet/TabSheetDiscardsMovedComponents.java b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetDiscardsMovedComponents.java
index 34b5dc86c8..34b5dc86c8 100644
--- a/tests/src/com/vaadin/tests/components/tabsheet/TabSheetDiscardsMovedComponents.java
+++ b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetDiscardsMovedComponents.java
diff --git a/tests/src/com/vaadin/tests/components/tabsheet/TabSheetIcons.html b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetIcons.html
index 425da11af4..425da11af4 100644
--- a/tests/src/com/vaadin/tests/components/tabsheet/TabSheetIcons.html
+++ b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetIcons.html
diff --git a/tests/src/com/vaadin/tests/components/tabsheet/TabSheetIcons.java b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetIcons.java
index 49c9784eb9..49c9784eb9 100644
--- a/tests/src/com/vaadin/tests/components/tabsheet/TabSheetIcons.java
+++ b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetIcons.java
diff --git a/tests/src/com/vaadin/tests/components/tabsheet/TabSheetIndexOperations.html b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetIndexOperations.html
index 8db5641603..8db5641603 100644
--- a/tests/src/com/vaadin/tests/components/tabsheet/TabSheetIndexOperations.html
+++ b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetIndexOperations.html
diff --git a/tests/src/com/vaadin/tests/components/tabsheet/TabSheetIndexOperations.java b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetIndexOperations.java
index c106144144..c106144144 100644
--- a/tests/src/com/vaadin/tests/components/tabsheet/TabSheetIndexOperations.java
+++ b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetIndexOperations.java
diff --git a/tests/src/com/vaadin/tests/components/tabsheet/TabSheetMinimal.java b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetMinimal.java
index db647f7110..db647f7110 100644
--- a/tests/src/com/vaadin/tests/components/tabsheet/TabSheetMinimal.java
+++ b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetMinimal.java
diff --git a/tests/src/com/vaadin/tests/components/tabsheet/TabSheetTabStyleNames.html b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetTabStyleNames.html
index d49e2817d3..d49e2817d3 100644
--- a/tests/src/com/vaadin/tests/components/tabsheet/TabSheetTabStyleNames.html
+++ b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetTabStyleNames.html
diff --git a/tests/src/com/vaadin/tests/components/tabsheet/TabSheetTabStyleNames.java b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetTabStyleNames.java
index 5c806b2ac2..5c806b2ac2 100644
--- a/tests/src/com/vaadin/tests/components/tabsheet/TabSheetTabStyleNames.java
+++ b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetTabStyleNames.java
diff --git a/tests/src/com/vaadin/tests/components/tabsheet/TabSheetTabTheming.java b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetTabTheming.java
index 94b49d4ae0..94b49d4ae0 100644
--- a/tests/src/com/vaadin/tests/components/tabsheet/TabSheetTabTheming.java
+++ b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetTabTheming.java
diff --git a/tests/src/com/vaadin/tests/components/tabsheet/TabSheetTest.java b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetTest.java
index bbbe92f069..bbbe92f069 100644
--- a/tests/src/com/vaadin/tests/components/tabsheet/TabSheetTest.java
+++ b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetTest.java
diff --git a/tests/src/com/vaadin/tests/components/tabsheet/TabSheetWithoutTabCaption.html b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetWithoutTabCaption.html
index 36e85c1b37..36e85c1b37 100644
--- a/tests/src/com/vaadin/tests/components/tabsheet/TabSheetWithoutTabCaption.html
+++ b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetWithoutTabCaption.html
diff --git a/tests/src/com/vaadin/tests/components/tabsheet/TabSheetWithoutTabCaption.java b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetWithoutTabCaption.java
index d766277b48..d766277b48 100644
--- a/tests/src/com/vaadin/tests/components/tabsheet/TabSheetWithoutTabCaption.java
+++ b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetWithoutTabCaption.java
diff --git a/tests/src/com/vaadin/tests/components/tabsheet/TabsheetNPE.java b/tests/testbench/com/vaadin/tests/components/tabsheet/TabsheetNPE.java
index ac460dafbb..ac460dafbb 100644
--- a/tests/src/com/vaadin/tests/components/tabsheet/TabsheetNPE.java
+++ b/tests/testbench/com/vaadin/tests/components/tabsheet/TabsheetNPE.java
diff --git a/tests/src/com/vaadin/tests/components/tabsheet/TabsheetScrolling.html b/tests/testbench/com/vaadin/tests/components/tabsheet/TabsheetScrolling.html
index dd45e2c591..dd45e2c591 100644
--- a/tests/src/com/vaadin/tests/components/tabsheet/TabsheetScrolling.html
+++ b/tests/testbench/com/vaadin/tests/components/tabsheet/TabsheetScrolling.html
diff --git a/tests/src/com/vaadin/tests/components/tabsheet/TabsheetScrolling.java b/tests/testbench/com/vaadin/tests/components/tabsheet/TabsheetScrolling.java
index 0880b57eed..0880b57eed 100644
--- a/tests/src/com/vaadin/tests/components/tabsheet/TabsheetScrolling.java
+++ b/tests/testbench/com/vaadin/tests/components/tabsheet/TabsheetScrolling.java
diff --git a/tests/src/com/vaadin/tests/components/tabsheet/TabsheetTooltip.html b/tests/testbench/com/vaadin/tests/components/tabsheet/TabsheetTooltip.html
index d133ab9937..d133ab9937 100644
--- a/tests/src/com/vaadin/tests/components/tabsheet/TabsheetTooltip.html
+++ b/tests/testbench/com/vaadin/tests/components/tabsheet/TabsheetTooltip.html
diff --git a/tests/src/com/vaadin/tests/components/tabsheet/TabsheetTooltip.java b/tests/testbench/com/vaadin/tests/components/tabsheet/TabsheetTooltip.java
index 18934e9318..18934e9318 100644
--- a/tests/src/com/vaadin/tests/components/tabsheet/TabsheetTooltip.java
+++ b/tests/testbench/com/vaadin/tests/components/tabsheet/TabsheetTooltip.java
diff --git a/tests/src/com/vaadin/tests/components/tabsheet/VerticalScrollbarPosition.html b/tests/testbench/com/vaadin/tests/components/tabsheet/VerticalScrollbarPosition.html
index 3da03edb6a..3da03edb6a 100644
--- a/tests/src/com/vaadin/tests/components/tabsheet/VerticalScrollbarPosition.html
+++ b/tests/testbench/com/vaadin/tests/components/tabsheet/VerticalScrollbarPosition.html
diff --git a/tests/src/com/vaadin/tests/components/tabsheet/VerticalScrollbarPosition.java b/tests/testbench/com/vaadin/tests/components/tabsheet/VerticalScrollbarPosition.java
index b6e00a1e59..b6e00a1e59 100644
--- a/tests/src/com/vaadin/tests/components/tabsheet/VerticalScrollbarPosition.java
+++ b/tests/testbench/com/vaadin/tests/components/tabsheet/VerticalScrollbarPosition.java
diff --git a/tests/src/com/vaadin/tests/components/textarea/TextAreaBasicStates.html b/tests/testbench/com/vaadin/tests/components/textarea/TextAreaBasicStates.html
index 52be660ad2..52be660ad2 100644
--- a/tests/src/com/vaadin/tests/components/textarea/TextAreaBasicStates.html
+++ b/tests/testbench/com/vaadin/tests/components/textarea/TextAreaBasicStates.html
diff --git a/tests/src/com/vaadin/tests/components/textarea/TextAreaNullRepresentation.html b/tests/testbench/com/vaadin/tests/components/textarea/TextAreaNullRepresentation.html
index eb62d30374..eb62d30374 100644
--- a/tests/src/com/vaadin/tests/components/textarea/TextAreaNullRepresentation.html
+++ b/tests/testbench/com/vaadin/tests/components/textarea/TextAreaNullRepresentation.html
diff --git a/tests/src/com/vaadin/tests/components/textarea/TextAreaTest.java b/tests/testbench/com/vaadin/tests/components/textarea/TextAreaTest.java
index 8d7b6b3dc9..8d7b6b3dc9 100644
--- a/tests/src/com/vaadin/tests/components/textarea/TextAreaTest.java
+++ b/tests/testbench/com/vaadin/tests/components/textarea/TextAreaTest.java
diff --git a/tests/src/com/vaadin/tests/components/textarea/TextAreaWordwrap.html b/tests/testbench/com/vaadin/tests/components/textarea/TextAreaWordwrap.html
index 780e95a358..780e95a358 100644
--- a/tests/src/com/vaadin/tests/components/textarea/TextAreaWordwrap.html
+++ b/tests/testbench/com/vaadin/tests/components/textarea/TextAreaWordwrap.html
diff --git a/tests/src/com/vaadin/tests/components/textarea/Wordwrap.java b/tests/testbench/com/vaadin/tests/components/textarea/Wordwrap.java
index 9a443ea757..9a443ea757 100644
--- a/tests/src/com/vaadin/tests/components/textarea/Wordwrap.java
+++ b/tests/testbench/com/vaadin/tests/components/textarea/Wordwrap.java
diff --git a/tests/src/com/vaadin/tests/components/textfield/EnterShortcutMaySendInputPromptAsValue.java b/tests/testbench/com/vaadin/tests/components/textfield/EnterShortcutMaySendInputPromptAsValue.java
index bf9924cdbb..bf9924cdbb 100644
--- a/tests/src/com/vaadin/tests/components/textfield/EnterShortcutMaySendInputPromptAsValue.java
+++ b/tests/testbench/com/vaadin/tests/components/textfield/EnterShortcutMaySendInputPromptAsValue.java
diff --git a/tests/src/com/vaadin/tests/components/textfield/IE6Cursor.java b/tests/testbench/com/vaadin/tests/components/textfield/IE6Cursor.java
index ed25567921..ed25567921 100644
--- a/tests/src/com/vaadin/tests/components/textfield/IE6Cursor.java
+++ b/tests/testbench/com/vaadin/tests/components/textfield/IE6Cursor.java
diff --git a/tests/src/com/vaadin/tests/components/textfield/OutOfSyncIssueWithKeyboardShortcut.java b/tests/testbench/com/vaadin/tests/components/textfield/OutOfSyncIssueWithKeyboardShortcut.java
index cf59a9d7f4..cf59a9d7f4 100644
--- a/tests/src/com/vaadin/tests/components/textfield/OutOfSyncIssueWithKeyboardShortcut.java
+++ b/tests/testbench/com/vaadin/tests/components/textfield/OutOfSyncIssueWithKeyboardShortcut.java
diff --git a/tests/src/com/vaadin/tests/components/textfield/SelectionAndCursorPosition.html b/tests/testbench/com/vaadin/tests/components/textfield/SelectionAndCursorPosition.html
index c058d8d975..c058d8d975 100644
--- a/tests/src/com/vaadin/tests/components/textfield/SelectionAndCursorPosition.html
+++ b/tests/testbench/com/vaadin/tests/components/textfield/SelectionAndCursorPosition.html
diff --git a/tests/src/com/vaadin/tests/components/textfield/SelectionAndCursorPosition.java b/tests/testbench/com/vaadin/tests/components/textfield/SelectionAndCursorPosition.java
index d362a3050d..d362a3050d 100644
--- a/tests/src/com/vaadin/tests/components/textfield/SelectionAndCursorPosition.java
+++ b/tests/testbench/com/vaadin/tests/components/textfield/SelectionAndCursorPosition.java
diff --git a/tests/src/com/vaadin/tests/components/textfield/SetTabIndex.html b/tests/testbench/com/vaadin/tests/components/textfield/SetTabIndex.html
index b61b464f97..b61b464f97 100644
--- a/tests/src/com/vaadin/tests/components/textfield/SetTabIndex.html
+++ b/tests/testbench/com/vaadin/tests/components/textfield/SetTabIndex.html
diff --git a/tests/src/com/vaadin/tests/components/textfield/SetTabIndex.java b/tests/testbench/com/vaadin/tests/components/textfield/SetTabIndex.java
index d81d26591a..d81d26591a 100644
--- a/tests/src/com/vaadin/tests/components/textfield/SetTabIndex.java
+++ b/tests/testbench/com/vaadin/tests/components/textfield/SetTabIndex.java
diff --git a/tests/src/com/vaadin/tests/components/textfield/SizedTextFields.java b/tests/testbench/com/vaadin/tests/components/textfield/SizedTextFields.java
index 93ab80b88a..93ab80b88a 100644
--- a/tests/src/com/vaadin/tests/components/textfield/SizedTextFields.java
+++ b/tests/testbench/com/vaadin/tests/components/textfield/SizedTextFields.java
diff --git a/tests/src/com/vaadin/tests/components/textfield/TextChangeEvents.java b/tests/testbench/com/vaadin/tests/components/textfield/TextChangeEvents.java
index f754beb792..f754beb792 100644
--- a/tests/src/com/vaadin/tests/components/textfield/TextChangeEvents.java
+++ b/tests/testbench/com/vaadin/tests/components/textfield/TextChangeEvents.java
diff --git a/tests/src/com/vaadin/tests/components/textfield/TextChangeEvents2.java b/tests/testbench/com/vaadin/tests/components/textfield/TextChangeEvents2.java
index b40ebb2434..b40ebb2434 100644
--- a/tests/src/com/vaadin/tests/components/textfield/TextChangeEvents2.java
+++ b/tests/testbench/com/vaadin/tests/components/textfield/TextChangeEvents2.java
diff --git a/tests/src/com/vaadin/tests/components/textfield/TextChangeEventsEternalLoop.html b/tests/testbench/com/vaadin/tests/components/textfield/TextChangeEventsEternalLoop.html
index 6f0772aa29..6f0772aa29 100644
--- a/tests/src/com/vaadin/tests/components/textfield/TextChangeEventsEternalLoop.html
+++ b/tests/testbench/com/vaadin/tests/components/textfield/TextChangeEventsEternalLoop.html
diff --git a/tests/src/com/vaadin/tests/components/textfield/TextChangeEventsEternalLoop.java b/tests/testbench/com/vaadin/tests/components/textfield/TextChangeEventsEternalLoop.java
index 22348bb5b5..22348bb5b5 100644
--- a/tests/src/com/vaadin/tests/components/textfield/TextChangeEventsEternalLoop.java
+++ b/tests/testbench/com/vaadin/tests/components/textfield/TextChangeEventsEternalLoop.java
diff --git a/tests/src/com/vaadin/tests/components/textfield/TextChangeEventsWithNonImmediateValueChange.java b/tests/testbench/com/vaadin/tests/components/textfield/TextChangeEventsWithNonImmediateValueChange.java
index a893739bff..a893739bff 100644
--- a/tests/src/com/vaadin/tests/components/textfield/TextChangeEventsWithNonImmediateValueChange.java
+++ b/tests/testbench/com/vaadin/tests/components/textfield/TextChangeEventsWithNonImmediateValueChange.java
diff --git a/tests/src/com/vaadin/tests/components/textfield/TextChangeTimeoutAfterDetach.html b/tests/testbench/com/vaadin/tests/components/textfield/TextChangeTimeoutAfterDetach.html
index 544cea9faa..544cea9faa 100644
--- a/tests/src/com/vaadin/tests/components/textfield/TextChangeTimeoutAfterDetach.html
+++ b/tests/testbench/com/vaadin/tests/components/textfield/TextChangeTimeoutAfterDetach.html
diff --git a/tests/src/com/vaadin/tests/components/textfield/TextChangeTimeoutAfterDetach.java b/tests/testbench/com/vaadin/tests/components/textfield/TextChangeTimeoutAfterDetach.java
index d1f856f40c..d1f856f40c 100644
--- a/tests/src/com/vaadin/tests/components/textfield/TextChangeTimeoutAfterDetach.java
+++ b/tests/testbench/com/vaadin/tests/components/textfield/TextChangeTimeoutAfterDetach.java
diff --git a/tests/src/com/vaadin/tests/components/textfield/TextFieldBasicStates.html b/tests/testbench/com/vaadin/tests/components/textfield/TextFieldBasicStates.html
index 823cbeb4e7..823cbeb4e7 100644
--- a/tests/src/com/vaadin/tests/components/textfield/TextFieldBasicStates.html
+++ b/tests/testbench/com/vaadin/tests/components/textfield/TextFieldBasicStates.html
diff --git a/tests/src/com/vaadin/tests/components/textfield/TextFieldEagerRepaint.html b/tests/testbench/com/vaadin/tests/components/textfield/TextFieldEagerRepaint.html
index ecd0467fb2..ecd0467fb2 100644
--- a/tests/src/com/vaadin/tests/components/textfield/TextFieldEagerRepaint.html
+++ b/tests/testbench/com/vaadin/tests/components/textfield/TextFieldEagerRepaint.html
diff --git a/tests/src/com/vaadin/tests/components/textfield/TextFieldEagerRepaint.java b/tests/testbench/com/vaadin/tests/components/textfield/TextFieldEagerRepaint.java
index 08751a59fd..08751a59fd 100644
--- a/tests/src/com/vaadin/tests/components/textfield/TextFieldEagerRepaint.java
+++ b/tests/testbench/com/vaadin/tests/components/textfield/TextFieldEagerRepaint.java
diff --git a/tests/src/com/vaadin/tests/components/textfield/TextFieldFocusAndBlurListeners.java b/tests/testbench/com/vaadin/tests/components/textfield/TextFieldFocusAndBlurListeners.java
index e2f5c45b72..e2f5c45b72 100644
--- a/tests/src/com/vaadin/tests/components/textfield/TextFieldFocusAndBlurListeners.java
+++ b/tests/testbench/com/vaadin/tests/components/textfield/TextFieldFocusAndBlurListeners.java
diff --git a/tests/src/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.html b/tests/testbench/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.html
index e53e8ed601..e53e8ed601 100644
--- a/tests/src/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.html
+++ b/tests/testbench/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.html
diff --git a/tests/src/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.java b/tests/testbench/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.java
index 451bc03f05..451bc03f05 100644
--- a/tests/src/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.java
+++ b/tests/testbench/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.java
diff --git a/tests/src/com/vaadin/tests/components/textfield/TextFieldMaxLength.html b/tests/testbench/com/vaadin/tests/components/textfield/TextFieldMaxLength.html
index 01c35aeea0..01c35aeea0 100644
--- a/tests/src/com/vaadin/tests/components/textfield/TextFieldMaxLength.html
+++ b/tests/testbench/com/vaadin/tests/components/textfield/TextFieldMaxLength.html
diff --git a/tests/src/com/vaadin/tests/components/textfield/TextFieldNullRepresentation.html b/tests/testbench/com/vaadin/tests/components/textfield/TextFieldNullRepresentation.html
index 5506351d34..5506351d34 100644
--- a/tests/src/com/vaadin/tests/components/textfield/TextFieldNullRepresentation.html
+++ b/tests/testbench/com/vaadin/tests/components/textfield/TextFieldNullRepresentation.html
diff --git a/tests/src/com/vaadin/tests/components/textfield/TextFieldNullRepresentationAndSelection.html b/tests/testbench/com/vaadin/tests/components/textfield/TextFieldNullRepresentationAndSelection.html
index d1882575d1..d1882575d1 100644
--- a/tests/src/com/vaadin/tests/components/textfield/TextFieldNullRepresentationAndSelection.html
+++ b/tests/testbench/com/vaadin/tests/components/textfield/TextFieldNullRepresentationAndSelection.html
diff --git a/tests/src/com/vaadin/tests/components/textfield/TextFieldSecret.html b/tests/testbench/com/vaadin/tests/components/textfield/TextFieldSecret.html
index 1e5a295971..1e5a295971 100644
--- a/tests/src/com/vaadin/tests/components/textfield/TextFieldSecret.html
+++ b/tests/testbench/com/vaadin/tests/components/textfield/TextFieldSecret.html
diff --git a/tests/src/com/vaadin/tests/components/textfield/TextFieldTest.java b/tests/testbench/com/vaadin/tests/components/textfield/TextFieldTest.java
index 81b753d6e4..81b753d6e4 100644
--- a/tests/src/com/vaadin/tests/components/textfield/TextFieldTest.java
+++ b/tests/testbench/com/vaadin/tests/components/textfield/TextFieldTest.java
diff --git a/tests/src/com/vaadin/tests/components/textfield/TextFieldTextChangeEvent.htm b/tests/testbench/com/vaadin/tests/components/textfield/TextFieldTextChangeEvent.htm
index e6ccc0f254..e6ccc0f254 100644
--- a/tests/src/com/vaadin/tests/components/textfield/TextFieldTextChangeEvent.htm
+++ b/tests/testbench/com/vaadin/tests/components/textfield/TextFieldTextChangeEvent.htm
diff --git a/tests/src/com/vaadin/tests/components/textfield/TextFields.html b/tests/testbench/com/vaadin/tests/components/textfield/TextFields.html
index 3a13fdbdcf..3a13fdbdcf 100644
--- a/tests/src/com/vaadin/tests/components/textfield/TextFields.html
+++ b/tests/testbench/com/vaadin/tests/components/textfield/TextFields.html
diff --git a/tests/src/com/vaadin/tests/components/textfield/TextFields.java b/tests/testbench/com/vaadin/tests/components/textfield/TextFields.java
index 994769b1d1..994769b1d1 100644
--- a/tests/src/com/vaadin/tests/components/textfield/TextFields.java
+++ b/tests/testbench/com/vaadin/tests/components/textfield/TextFields.java
diff --git a/tests/src/com/vaadin/tests/components/tree/ActionsOnTreeBackground.html b/tests/testbench/com/vaadin/tests/components/tree/ActionsOnTreeBackground.html
index 8b679208d0..8b679208d0 100644
--- a/tests/src/com/vaadin/tests/components/tree/ActionsOnTreeBackground.html
+++ b/tests/testbench/com/vaadin/tests/components/tree/ActionsOnTreeBackground.html
diff --git a/tests/src/com/vaadin/tests/components/tree/CtrlShiftMultiselect.java b/tests/testbench/com/vaadin/tests/components/tree/CtrlShiftMultiselect.java
index 69956e4d2c..69956e4d2c 100644
--- a/tests/src/com/vaadin/tests/components/tree/CtrlShiftMultiselect.java
+++ b/tests/testbench/com/vaadin/tests/components/tree/CtrlShiftMultiselect.java
diff --git a/tests/src/com/vaadin/tests/components/tree/ExpandCollapseTree.html b/tests/testbench/com/vaadin/tests/components/tree/ExpandCollapseTree.html
index 6ebb0c4cb3..6ebb0c4cb3 100644
--- a/tests/src/com/vaadin/tests/components/tree/ExpandCollapseTree.html
+++ b/tests/testbench/com/vaadin/tests/components/tree/ExpandCollapseTree.html
diff --git a/tests/src/com/vaadin/tests/components/tree/ExpandCollapseTree.java b/tests/testbench/com/vaadin/tests/components/tree/ExpandCollapseTree.java
index e23213fafc..e23213fafc 100644
--- a/tests/src/com/vaadin/tests/components/tree/ExpandCollapseTree.java
+++ b/tests/testbench/com/vaadin/tests/components/tree/ExpandCollapseTree.java
diff --git a/tests/src/com/vaadin/tests/components/tree/ItemStyleGenerator.java b/tests/testbench/com/vaadin/tests/components/tree/ItemStyleGenerator.java
index f2ca2a85bd..f2ca2a85bd 100644
--- a/tests/src/com/vaadin/tests/components/tree/ItemStyleGenerator.java
+++ b/tests/testbench/com/vaadin/tests/components/tree/ItemStyleGenerator.java
diff --git a/tests/src/com/vaadin/tests/components/tree/PreselectedTreeVisible.html b/tests/testbench/com/vaadin/tests/components/tree/PreselectedTreeVisible.html
index 7f8bb408aa..7f8bb408aa 100644
--- a/tests/src/com/vaadin/tests/components/tree/PreselectedTreeVisible.html
+++ b/tests/testbench/com/vaadin/tests/components/tree/PreselectedTreeVisible.html
diff --git a/tests/src/com/vaadin/tests/components/tree/PreselectedTreeVisible.java b/tests/testbench/com/vaadin/tests/components/tree/PreselectedTreeVisible.java
index b812c9e955..b812c9e955 100644
--- a/tests/src/com/vaadin/tests/components/tree/PreselectedTreeVisible.java
+++ b/tests/testbench/com/vaadin/tests/components/tree/PreselectedTreeVisible.java
diff --git a/tests/src/com/vaadin/tests/components/tree/TreeConnectors.html b/tests/testbench/com/vaadin/tests/components/tree/TreeConnectors.html
index b76c65fa69..b76c65fa69 100644
--- a/tests/src/com/vaadin/tests/components/tree/TreeConnectors.html
+++ b/tests/testbench/com/vaadin/tests/components/tree/TreeConnectors.html
diff --git a/tests/src/com/vaadin/tests/components/tree/TreeConnectors.java b/tests/testbench/com/vaadin/tests/components/tree/TreeConnectors.java
index 81c6d2df9e..81c6d2df9e 100644
--- a/tests/src/com/vaadin/tests/components/tree/TreeConnectors.java
+++ b/tests/testbench/com/vaadin/tests/components/tree/TreeConnectors.java
diff --git a/tests/src/com/vaadin/tests/components/tree/TreeContainerChange b/tests/testbench/com/vaadin/tests/components/tree/TreeContainerChange
index 8ea2dcc107..8ea2dcc107 100644
--- a/tests/src/com/vaadin/tests/components/tree/TreeContainerChange
+++ b/tests/testbench/com/vaadin/tests/components/tree/TreeContainerChange
diff --git a/tests/src/com/vaadin/tests/components/tree/TreeContainerChange.java b/tests/testbench/com/vaadin/tests/components/tree/TreeContainerChange.java
index f33bbae7b5..f33bbae7b5 100644
--- a/tests/src/com/vaadin/tests/components/tree/TreeContainerChange.java
+++ b/tests/testbench/com/vaadin/tests/components/tree/TreeContainerChange.java
diff --git a/tests/src/com/vaadin/tests/components/tree/TreeContextMenuAndIcons.html b/tests/testbench/com/vaadin/tests/components/tree/TreeContextMenuAndIcons.html
index d3eaf3470e..d3eaf3470e 100644
--- a/tests/src/com/vaadin/tests/components/tree/TreeContextMenuAndIcons.html
+++ b/tests/testbench/com/vaadin/tests/components/tree/TreeContextMenuAndIcons.html
diff --git a/tests/src/com/vaadin/tests/components/tree/TreeFiltering.html b/tests/testbench/com/vaadin/tests/components/tree/TreeFiltering.html
index 06ae7600f7..06ae7600f7 100644
--- a/tests/src/com/vaadin/tests/components/tree/TreeFiltering.html
+++ b/tests/testbench/com/vaadin/tests/components/tree/TreeFiltering.html
diff --git a/tests/src/com/vaadin/tests/components/tree/TreeFiltering.java b/tests/testbench/com/vaadin/tests/components/tree/TreeFiltering.java
index ff1ac96e26..ff1ac96e26 100644
--- a/tests/src/com/vaadin/tests/components/tree/TreeFiltering.java
+++ b/tests/testbench/com/vaadin/tests/components/tree/TreeFiltering.java
diff --git a/tests/src/com/vaadin/tests/components/tree/TreeFocusGaining.html b/tests/testbench/com/vaadin/tests/components/tree/TreeFocusGaining.html
index 74a69ec203..74a69ec203 100644
--- a/tests/src/com/vaadin/tests/components/tree/TreeFocusGaining.html
+++ b/tests/testbench/com/vaadin/tests/components/tree/TreeFocusGaining.html
diff --git a/tests/src/com/vaadin/tests/components/tree/TreeFocusGaining.java b/tests/testbench/com/vaadin/tests/components/tree/TreeFocusGaining.java
index e784009bce..e784009bce 100644
--- a/tests/src/com/vaadin/tests/components/tree/TreeFocusGaining.java
+++ b/tests/testbench/com/vaadin/tests/components/tree/TreeFocusGaining.java
diff --git a/tests/src/com/vaadin/tests/components/tree/TreeHorizontalResize.html b/tests/testbench/com/vaadin/tests/components/tree/TreeHorizontalResize.html
index 8e882e215d..8e882e215d 100644
--- a/tests/src/com/vaadin/tests/components/tree/TreeHorizontalResize.html
+++ b/tests/testbench/com/vaadin/tests/components/tree/TreeHorizontalResize.html
diff --git a/tests/src/com/vaadin/tests/components/tree/TreeHorizontalResize.java b/tests/testbench/com/vaadin/tests/components/tree/TreeHorizontalResize.java
index e25b2d6760..e25b2d6760 100644
--- a/tests/src/com/vaadin/tests/components/tree/TreeHorizontalResize.java
+++ b/tests/testbench/com/vaadin/tests/components/tree/TreeHorizontalResize.java
diff --git a/tests/src/com/vaadin/tests/components/tree/TreeItemClickListening.html b/tests/testbench/com/vaadin/tests/components/tree/TreeItemClickListening.html
index 841565df2f..841565df2f 100644
--- a/tests/src/com/vaadin/tests/components/tree/TreeItemClickListening.html
+++ b/tests/testbench/com/vaadin/tests/components/tree/TreeItemClickListening.html
diff --git a/tests/src/com/vaadin/tests/components/tree/TreeItemClickListening.java b/tests/testbench/com/vaadin/tests/components/tree/TreeItemClickListening.java
index e772be7cde..e772be7cde 100644
--- a/tests/src/com/vaadin/tests/components/tree/TreeItemClickListening.java
+++ b/tests/testbench/com/vaadin/tests/components/tree/TreeItemClickListening.java
diff --git a/tests/src/com/vaadin/tests/components/tree/TreeKeyboardNavigationScroll b/tests/testbench/com/vaadin/tests/components/tree/TreeKeyboardNavigationScroll
index 8d03e3aaf3..8d03e3aaf3 100644
--- a/tests/src/com/vaadin/tests/components/tree/TreeKeyboardNavigationScroll
+++ b/tests/testbench/com/vaadin/tests/components/tree/TreeKeyboardNavigationScroll
diff --git a/tests/src/com/vaadin/tests/components/tree/TreeKeyboardNavigationScrolls.java b/tests/testbench/com/vaadin/tests/components/tree/TreeKeyboardNavigationScrolls.java
index 5bbc5423ab..5bbc5423ab 100644
--- a/tests/src/com/vaadin/tests/components/tree/TreeKeyboardNavigationScrolls.java
+++ b/tests/testbench/com/vaadin/tests/components/tree/TreeKeyboardNavigationScrolls.java
diff --git a/tests/src/com/vaadin/tests/components/tree/TreeKeyboardNavigationValidators b/tests/testbench/com/vaadin/tests/components/tree/TreeKeyboardNavigationValidators
index 8b9722df94..8b9722df94 100644
--- a/tests/src/com/vaadin/tests/components/tree/TreeKeyboardNavigationValidators
+++ b/tests/testbench/com/vaadin/tests/components/tree/TreeKeyboardNavigationValidators
diff --git a/tests/src/com/vaadin/tests/components/tree/TreeKeyboardNavigationValidators.java b/tests/testbench/com/vaadin/tests/components/tree/TreeKeyboardNavigationValidators.java
index 2a545065c4..2a545065c4 100644
--- a/tests/src/com/vaadin/tests/components/tree/TreeKeyboardNavigationValidators.java
+++ b/tests/testbench/com/vaadin/tests/components/tree/TreeKeyboardNavigationValidators.java
diff --git a/tests/src/com/vaadin/tests/components/tree/TreeNodeCaptionWrapping.html b/tests/testbench/com/vaadin/tests/components/tree/TreeNodeCaptionWrapping.html
index f98482f4c7..f98482f4c7 100644
--- a/tests/src/com/vaadin/tests/components/tree/TreeNodeCaptionWrapping.html
+++ b/tests/testbench/com/vaadin/tests/components/tree/TreeNodeCaptionWrapping.html
diff --git a/tests/src/com/vaadin/tests/components/tree/TreeNodeCaptionWrapping.java b/tests/testbench/com/vaadin/tests/components/tree/TreeNodeCaptionWrapping.java
index 2101abb630..2101abb630 100644
--- a/tests/src/com/vaadin/tests/components/tree/TreeNodeCaptionWrapping.java
+++ b/tests/testbench/com/vaadin/tests/components/tree/TreeNodeCaptionWrapping.java
diff --git a/tests/src/com/vaadin/tests/components/tree/TreePerformanceTest.java b/tests/testbench/com/vaadin/tests/components/tree/TreePerformanceTest.java
index de72a6efeb..de72a6efeb 100644
--- a/tests/src/com/vaadin/tests/components/tree/TreePerformanceTest.java
+++ b/tests/testbench/com/vaadin/tests/components/tree/TreePerformanceTest.java
diff --git a/tests/src/com/vaadin/tests/components/tree/TreeScrolling.html b/tests/testbench/com/vaadin/tests/components/tree/TreeScrolling.html
index 55c5aacbda..55c5aacbda 100644
--- a/tests/src/com/vaadin/tests/components/tree/TreeScrolling.html
+++ b/tests/testbench/com/vaadin/tests/components/tree/TreeScrolling.html
diff --git a/tests/src/com/vaadin/tests/components/tree/TreeScrolling.java b/tests/testbench/com/vaadin/tests/components/tree/TreeScrolling.java
index 38bf07ef59..38bf07ef59 100644
--- a/tests/src/com/vaadin/tests/components/tree/TreeScrolling.java
+++ b/tests/testbench/com/vaadin/tests/components/tree/TreeScrolling.java
diff --git a/tests/src/com/vaadin/tests/components/tree/TreeScrollingOnSelection.html b/tests/testbench/com/vaadin/tests/components/tree/TreeScrollingOnSelection.html
index bd8e944c32..bd8e944c32 100644
--- a/tests/src/com/vaadin/tests/components/tree/TreeScrollingOnSelection.html
+++ b/tests/testbench/com/vaadin/tests/components/tree/TreeScrollingOnSelection.html
diff --git a/tests/src/com/vaadin/tests/components/tree/TreeScrollingOnSelection.java b/tests/testbench/com/vaadin/tests/components/tree/TreeScrollingOnSelection.java
index 42c9087fc3..42c9087fc3 100644
--- a/tests/src/com/vaadin/tests/components/tree/TreeScrollingOnSelection.java
+++ b/tests/testbench/com/vaadin/tests/components/tree/TreeScrollingOnSelection.java
diff --git a/tests/src/com/vaadin/tests/components/tree/TreeToolTips.java b/tests/testbench/com/vaadin/tests/components/tree/TreeToolTips.java
index c6e29bc3b8..c6e29bc3b8 100644
--- a/tests/src/com/vaadin/tests/components/tree/TreeToolTips.java
+++ b/tests/testbench/com/vaadin/tests/components/tree/TreeToolTips.java
diff --git a/tests/src/com/vaadin/tests/components/tree/TreeTooltip.html b/tests/testbench/com/vaadin/tests/components/tree/TreeTooltip.html
index afebdaacd5..afebdaacd5 100644
--- a/tests/src/com/vaadin/tests/components/tree/TreeTooltip.html
+++ b/tests/testbench/com/vaadin/tests/components/tree/TreeTooltip.html
diff --git a/tests/src/com/vaadin/tests/components/tree/TreeWithIcons.html b/tests/testbench/com/vaadin/tests/components/tree/TreeWithIcons.html
index 0b01807054..0b01807054 100644
--- a/tests/src/com/vaadin/tests/components/tree/TreeWithIcons.html
+++ b/tests/testbench/com/vaadin/tests/components/tree/TreeWithIcons.html
diff --git a/tests/src/com/vaadin/tests/components/tree/TreeWithIcons.java b/tests/testbench/com/vaadin/tests/components/tree/TreeWithIcons.java
index fbf4a3c1d1..fbf4a3c1d1 100644
--- a/tests/src/com/vaadin/tests/components/tree/TreeWithIcons.java
+++ b/tests/testbench/com/vaadin/tests/components/tree/TreeWithIcons.java
diff --git a/tests/src/com/vaadin/tests/components/tree/TreeWithPreselectedItemNotShown.java b/tests/testbench/com/vaadin/tests/components/tree/TreeWithPreselectedItemNotShown.java
index 92c82a6ccf..92c82a6ccf 100644
--- a/tests/src/com/vaadin/tests/components/tree/TreeWithPreselectedItemNotShown.java
+++ b/tests/testbench/com/vaadin/tests/components/tree/TreeWithPreselectedItemNotShown.java
diff --git a/tests/src/com/vaadin/tests/components/tree/Trees.java b/tests/testbench/com/vaadin/tests/components/tree/Trees.java
index 076e0c9dda..076e0c9dda 100644
--- a/tests/src/com/vaadin/tests/components/tree/Trees.java
+++ b/tests/testbench/com/vaadin/tests/components/tree/Trees.java
diff --git a/tests/src/com/vaadin/tests/components/treetable/ExpandAndCollapseListeners.html b/tests/testbench/com/vaadin/tests/components/treetable/ExpandAndCollapseListeners.html
index 81a62aaa50..81a62aaa50 100644
--- a/tests/src/com/vaadin/tests/components/treetable/ExpandAndCollapseListeners.html
+++ b/tests/testbench/com/vaadin/tests/components/treetable/ExpandAndCollapseListeners.html
diff --git a/tests/src/com/vaadin/tests/components/treetable/ExpandAnimationsInChameleon.java b/tests/testbench/com/vaadin/tests/components/treetable/ExpandAnimationsInChameleon.java
index ca1c7aeb9c..ca1c7aeb9c 100644
--- a/tests/src/com/vaadin/tests/components/treetable/ExpandAnimationsInChameleon.java
+++ b/tests/testbench/com/vaadin/tests/components/treetable/ExpandAnimationsInChameleon.java
diff --git a/tests/src/com/vaadin/tests/components/treetable/KeepAllItemsVisible.html b/tests/testbench/com/vaadin/tests/components/treetable/KeepAllItemsVisible.html
index 0d92deec16..0d92deec16 100644
--- a/tests/src/com/vaadin/tests/components/treetable/KeepAllItemsVisible.html
+++ b/tests/testbench/com/vaadin/tests/components/treetable/KeepAllItemsVisible.html
diff --git a/tests/src/com/vaadin/tests/components/treetable/KeepAllItemsVisible.java b/tests/testbench/com/vaadin/tests/components/treetable/KeepAllItemsVisible.java
index ad0255a2da..ad0255a2da 100644
--- a/tests/src/com/vaadin/tests/components/treetable/KeepAllItemsVisible.java
+++ b/tests/testbench/com/vaadin/tests/components/treetable/KeepAllItemsVisible.java
diff --git a/tests/src/com/vaadin/tests/components/treetable/ProgrammaticSelect.java b/tests/testbench/com/vaadin/tests/components/treetable/ProgrammaticSelect.java
index fc68d0be15..fc68d0be15 100644
--- a/tests/src/com/vaadin/tests/components/treetable/ProgrammaticSelect.java
+++ b/tests/testbench/com/vaadin/tests/components/treetable/ProgrammaticSelect.java
diff --git a/tests/src/com/vaadin/tests/components/treetable/TreeTableExpandWithRowStyle.html b/tests/testbench/com/vaadin/tests/components/treetable/TreeTableExpandWithRowStyle.html
index 2143de2607..2143de2607 100644
--- a/tests/src/com/vaadin/tests/components/treetable/TreeTableExpandWithRowStyle.html
+++ b/tests/testbench/com/vaadin/tests/components/treetable/TreeTableExpandWithRowStyle.html
diff --git a/tests/src/com/vaadin/tests/components/treetable/TreeTableGeneratedColumns.html b/tests/testbench/com/vaadin/tests/components/treetable/TreeTableGeneratedColumns.html
index 09014f3aa0..09014f3aa0 100644
--- a/tests/src/com/vaadin/tests/components/treetable/TreeTableGeneratedColumns.html
+++ b/tests/testbench/com/vaadin/tests/components/treetable/TreeTableGeneratedColumns.html
diff --git a/tests/src/com/vaadin/tests/components/treetable/TreeTableGeneratedRows.html b/tests/testbench/com/vaadin/tests/components/treetable/TreeTableGeneratedRows.html
index 6419a8c251..6419a8c251 100644
--- a/tests/src/com/vaadin/tests/components/treetable/TreeTableGeneratedRows.html
+++ b/tests/testbench/com/vaadin/tests/components/treetable/TreeTableGeneratedRows.html
diff --git a/tests/src/com/vaadin/tests/components/treetable/TreeTableOutOfSync.html b/tests/testbench/com/vaadin/tests/components/treetable/TreeTableOutOfSync.html
index b8d6cdb22e..b8d6cdb22e 100644
--- a/tests/src/com/vaadin/tests/components/treetable/TreeTableOutOfSync.html
+++ b/tests/testbench/com/vaadin/tests/components/treetable/TreeTableOutOfSync.html
diff --git a/tests/src/com/vaadin/tests/components/treetable/TreeTableOutOfSync.java b/tests/testbench/com/vaadin/tests/components/treetable/TreeTableOutOfSync.java
index 09b42cce31..09b42cce31 100644
--- a/tests/src/com/vaadin/tests/components/treetable/TreeTableOutOfSync.java
+++ b/tests/testbench/com/vaadin/tests/components/treetable/TreeTableOutOfSync.java
diff --git a/tests/src/com/vaadin/tests/components/treetable/TreeTablePartialUpdates-LongScroll.html b/tests/testbench/com/vaadin/tests/components/treetable/TreeTablePartialUpdates-LongScroll.html
index 276725e6bd..276725e6bd 100644
--- a/tests/src/com/vaadin/tests/components/treetable/TreeTablePartialUpdates-LongScroll.html
+++ b/tests/testbench/com/vaadin/tests/components/treetable/TreeTablePartialUpdates-LongScroll.html
diff --git a/tests/src/com/vaadin/tests/components/treetable/TreeTablePartialUpdates.java b/tests/testbench/com/vaadin/tests/components/treetable/TreeTablePartialUpdates.java
index 23eaa5dfea..23eaa5dfea 100644
--- a/tests/src/com/vaadin/tests/components/treetable/TreeTablePartialUpdates.java
+++ b/tests/testbench/com/vaadin/tests/components/treetable/TreeTablePartialUpdates.java
diff --git a/tests/src/com/vaadin/tests/components/treetable/TreeTableSetCollapsed.html b/tests/testbench/com/vaadin/tests/components/treetable/TreeTableSetCollapsed.html
index 5c878dba42..5c878dba42 100644
--- a/tests/src/com/vaadin/tests/components/treetable/TreeTableSetCollapsed.html
+++ b/tests/testbench/com/vaadin/tests/components/treetable/TreeTableSetCollapsed.html
diff --git a/tests/src/com/vaadin/tests/components/treetable/TreeTableSetCollapsed.java b/tests/testbench/com/vaadin/tests/components/treetable/TreeTableSetCollapsed.java
index 2a14c946f3..2a14c946f3 100644
--- a/tests/src/com/vaadin/tests/components/treetable/TreeTableSetCollapsed.java
+++ b/tests/testbench/com/vaadin/tests/components/treetable/TreeTableSetCollapsed.java
diff --git a/tests/src/com/vaadin/tests/components/treetable/TreeTableTest.java b/tests/testbench/com/vaadin/tests/components/treetable/TreeTableTest.java
index 010c735047..010c735047 100644
--- a/tests/src/com/vaadin/tests/components/treetable/TreeTableTest.java
+++ b/tests/testbench/com/vaadin/tests/components/treetable/TreeTableTest.java
diff --git a/tests/src/com/vaadin/tests/components/twincolselect/TwinColSelectSelection.html b/tests/testbench/com/vaadin/tests/components/twincolselect/TwinColSelectSelection.html
index c36b3922a2..c36b3922a2 100644
--- a/tests/src/com/vaadin/tests/components/twincolselect/TwinColSelectSelection.html
+++ b/tests/testbench/com/vaadin/tests/components/twincolselect/TwinColSelectSelection.html
diff --git a/tests/src/com/vaadin/tests/components/twincolselect/TwinColSelects.java b/tests/testbench/com/vaadin/tests/components/twincolselect/TwinColSelects.java
index ebbddc5f6a..ebbddc5f6a 100644
--- a/tests/src/com/vaadin/tests/components/twincolselect/TwinColSelects.java
+++ b/tests/testbench/com/vaadin/tests/components/twincolselect/TwinColSelects.java
diff --git a/tests/src/com/vaadin/tests/components/upload/ForceSubmit.java b/tests/testbench/com/vaadin/tests/components/upload/ForceSubmit.java
index 9f5c2b67e2..9f5c2b67e2 100644
--- a/tests/src/com/vaadin/tests/components/upload/ForceSubmit.java
+++ b/tests/testbench/com/vaadin/tests/components/upload/ForceSubmit.java
diff --git a/tests/src/com/vaadin/tests/components/upload/TestImmediateUploadInFormLayout.java b/tests/testbench/com/vaadin/tests/components/upload/TestImmediateUploadInFormLayout.java
index d1a77d0e49..d1a77d0e49 100644
--- a/tests/src/com/vaadin/tests/components/upload/TestImmediateUploadInFormLayout.java
+++ b/tests/testbench/com/vaadin/tests/components/upload/TestImmediateUploadInFormLayout.java
diff --git a/tests/src/com/vaadin/tests/components/upload/TestUpload.java b/tests/testbench/com/vaadin/tests/components/upload/TestUpload.java
index 6690603958..6690603958 100644
--- a/tests/src/com/vaadin/tests/components/upload/TestUpload.java
+++ b/tests/testbench/com/vaadin/tests/components/upload/TestUpload.java
diff --git a/tests/src/com/vaadin/tests/components/upload/TestUploadAndDisableOnSuccess.java b/tests/testbench/com/vaadin/tests/components/upload/TestUploadAndDisableOnSuccess.java
index 009cc63168..009cc63168 100644
--- a/tests/src/com/vaadin/tests/components/upload/TestUploadAndDisableOnSuccess.java
+++ b/tests/testbench/com/vaadin/tests/components/upload/TestUploadAndDisableOnSuccess.java
diff --git a/tests/src/com/vaadin/tests/components/upload/TestUploadFilename.java b/tests/testbench/com/vaadin/tests/components/upload/TestUploadFilename.java
index 12006412f2..12006412f2 100644
--- a/tests/src/com/vaadin/tests/components/upload/TestUploadFilename.java
+++ b/tests/testbench/com/vaadin/tests/components/upload/TestUploadFilename.java
diff --git a/tests/src/com/vaadin/tests/components/window/CenteredWindowWithUndefinedSize.html b/tests/testbench/com/vaadin/tests/components/window/CenteredWindowWithUndefinedSize.html
index 2e15d8d645..2e15d8d645 100644
--- a/tests/src/com/vaadin/tests/components/window/CenteredWindowWithUndefinedSize.html
+++ b/tests/testbench/com/vaadin/tests/components/window/CenteredWindowWithUndefinedSize.html
diff --git a/tests/src/com/vaadin/tests/components/window/CenteredWindowWithUndefinedSize.java b/tests/testbench/com/vaadin/tests/components/window/CenteredWindowWithUndefinedSize.java
index a7fcda3cf1..a7fcda3cf1 100644
--- a/tests/src/com/vaadin/tests/components/window/CenteredWindowWithUndefinedSize.java
+++ b/tests/testbench/com/vaadin/tests/components/window/CenteredWindowWithUndefinedSize.java
diff --git a/tests/src/com/vaadin/tests/components/window/CloseSubWindow.html b/tests/testbench/com/vaadin/tests/components/window/CloseSubWindow.html
index 36e9134566..36e9134566 100644
--- a/tests/src/com/vaadin/tests/components/window/CloseSubWindow.html
+++ b/tests/testbench/com/vaadin/tests/components/window/CloseSubWindow.html
diff --git a/tests/src/com/vaadin/tests/components/window/CloseSubWindow.java b/tests/testbench/com/vaadin/tests/components/window/CloseSubWindow.java
index 9a5fff18ed..9a5fff18ed 100644
--- a/tests/src/com/vaadin/tests/components/window/CloseSubWindow.java
+++ b/tests/testbench/com/vaadin/tests/components/window/CloseSubWindow.java
diff --git a/tests/src/com/vaadin/tests/components/window/EmbeddedInSubWindow.html b/tests/testbench/com/vaadin/tests/components/window/EmbeddedInSubWindow.html
index d74e09dd6a..d74e09dd6a 100644
--- a/tests/src/com/vaadin/tests/components/window/EmbeddedInSubWindow.html
+++ b/tests/testbench/com/vaadin/tests/components/window/EmbeddedInSubWindow.html
diff --git a/tests/src/com/vaadin/tests/components/window/EmbeddedInSubWindow.java b/tests/testbench/com/vaadin/tests/components/window/EmbeddedInSubWindow.java
index cd990f94b7..cd990f94b7 100644
--- a/tests/src/com/vaadin/tests/components/window/EmbeddedInSubWindow.java
+++ b/tests/testbench/com/vaadin/tests/components/window/EmbeddedInSubWindow.java
diff --git a/tests/src/com/vaadin/tests/components/window/ExecuteJavaScript.java b/tests/testbench/com/vaadin/tests/components/window/ExecuteJavaScript.java
index dfa0e80368..dfa0e80368 100644
--- a/tests/src/com/vaadin/tests/components/window/ExecuteJavaScript.java
+++ b/tests/testbench/com/vaadin/tests/components/window/ExecuteJavaScript.java
diff --git a/tests/src/com/vaadin/tests/components/window/ExtraLargeSubWindow.html b/tests/testbench/com/vaadin/tests/components/window/ExtraLargeSubWindow.html
index a679bd6f07..a679bd6f07 100644
--- a/tests/src/com/vaadin/tests/components/window/ExtraLargeSubWindow.html
+++ b/tests/testbench/com/vaadin/tests/components/window/ExtraLargeSubWindow.html
diff --git a/tests/src/com/vaadin/tests/components/window/ExtraLargeSubWindow.java b/tests/testbench/com/vaadin/tests/components/window/ExtraLargeSubWindow.java
index bcaa44dc76..bcaa44dc76 100644
--- a/tests/src/com/vaadin/tests/components/window/ExtraLargeSubWindow.java
+++ b/tests/testbench/com/vaadin/tests/components/window/ExtraLargeSubWindow.java
diff --git a/tests/src/com/vaadin/tests/components/window/ExtraWindowShown.html b/tests/testbench/com/vaadin/tests/components/window/ExtraWindowShown.html
index 4881d0caf1..4881d0caf1 100644
--- a/tests/src/com/vaadin/tests/components/window/ExtraWindowShown.html
+++ b/tests/testbench/com/vaadin/tests/components/window/ExtraWindowShown.html
diff --git a/tests/src/com/vaadin/tests/components/window/ExtraWindowShown.java b/tests/testbench/com/vaadin/tests/components/window/ExtraWindowShown.java
index a7079b2d99..a7079b2d99 100644
--- a/tests/src/com/vaadin/tests/components/window/ExtraWindowShown.java
+++ b/tests/testbench/com/vaadin/tests/components/window/ExtraWindowShown.java
diff --git a/tests/src/com/vaadin/tests/components/window/FullSizedWindow.java b/tests/testbench/com/vaadin/tests/components/window/FullSizedWindow.java
index 3cb5f45712..3cb5f45712 100644
--- a/tests/src/com/vaadin/tests/components/window/FullSizedWindow.java
+++ b/tests/testbench/com/vaadin/tests/components/window/FullSizedWindow.java
diff --git a/tests/src/com/vaadin/tests/components/window/HugeWindowShouldBeClosable.java b/tests/testbench/com/vaadin/tests/components/window/HugeWindowShouldBeClosable.java
index 3b8067c726..3b8067c726 100644
--- a/tests/src/com/vaadin/tests/components/window/HugeWindowShouldBeClosable.java
+++ b/tests/testbench/com/vaadin/tests/components/window/HugeWindowShouldBeClosable.java
diff --git a/tests/src/com/vaadin/tests/components/window/LazyWindowResize.java b/tests/testbench/com/vaadin/tests/components/window/LazyWindowResize.java
index 6c051f4b1e..6c051f4b1e 100644
--- a/tests/src/com/vaadin/tests/components/window/LazyWindowResize.java
+++ b/tests/testbench/com/vaadin/tests/components/window/LazyWindowResize.java
diff --git a/tests/src/com/vaadin/tests/components/window/LongNotifications.java b/tests/testbench/com/vaadin/tests/components/window/LongNotifications.java
index c70c14e08e..c70c14e08e 100644
--- a/tests/src/com/vaadin/tests/components/window/LongNotifications.java
+++ b/tests/testbench/com/vaadin/tests/components/window/LongNotifications.java
diff --git a/tests/src/com/vaadin/tests/components/window/ModalWindowNativeSelect.java b/tests/testbench/com/vaadin/tests/components/window/ModalWindowNativeSelect.java
index d7672a88d5..d7672a88d5 100644
--- a/tests/src/com/vaadin/tests/components/window/ModalWindowNativeSelect.java
+++ b/tests/testbench/com/vaadin/tests/components/window/ModalWindowNativeSelect.java
diff --git a/tests/src/com/vaadin/tests/components/window/PositionedSubWindows.java b/tests/testbench/com/vaadin/tests/components/window/PositionedSubWindows.java
index 9fe44dd7e8..9fe44dd7e8 100644
--- a/tests/src/com/vaadin/tests/components/window/PositionedSubWindows.java
+++ b/tests/testbench/com/vaadin/tests/components/window/PositionedSubWindows.java
diff --git a/tests/src/com/vaadin/tests/components/window/SubWindowFocus.java b/tests/testbench/com/vaadin/tests/components/window/SubWindowFocus.java
index f0dccda66c..f0dccda66c 100644
--- a/tests/src/com/vaadin/tests/components/window/SubWindowFocus.java
+++ b/tests/testbench/com/vaadin/tests/components/window/SubWindowFocus.java
diff --git a/tests/src/com/vaadin/tests/components/window/SubWindowFocusAndBlurListeners.java b/tests/testbench/com/vaadin/tests/components/window/SubWindowFocusAndBlurListeners.java
index 2d9d7bd5b2..2d9d7bd5b2 100644
--- a/tests/src/com/vaadin/tests/components/window/SubWindowFocusAndBlurListeners.java
+++ b/tests/testbench/com/vaadin/tests/components/window/SubWindowFocusAndBlurListeners.java
diff --git a/tests/src/com/vaadin/tests/components/window/SubWindowOrder.html b/tests/testbench/com/vaadin/tests/components/window/SubWindowOrder.html
index c59e831582..c59e831582 100644
--- a/tests/src/com/vaadin/tests/components/window/SubWindowOrder.html
+++ b/tests/testbench/com/vaadin/tests/components/window/SubWindowOrder.html
diff --git a/tests/src/com/vaadin/tests/components/window/SubWindowOrder.java b/tests/testbench/com/vaadin/tests/components/window/SubWindowOrder.java
index c34f32f275..c34f32f275 100644
--- a/tests/src/com/vaadin/tests/components/window/SubWindowOrder.java
+++ b/tests/testbench/com/vaadin/tests/components/window/SubWindowOrder.java
diff --git a/tests/src/com/vaadin/tests/components/window/SubWindowPositionUpdate.java b/tests/testbench/com/vaadin/tests/components/window/SubWindowPositionUpdate.java
index 9383dba80f..9383dba80f 100644
--- a/tests/src/com/vaadin/tests/components/window/SubWindowPositionUpdate.java
+++ b/tests/testbench/com/vaadin/tests/components/window/SubWindowPositionUpdate.java
diff --git a/tests/src/com/vaadin/tests/components/window/SubWindows-runo.html b/tests/testbench/com/vaadin/tests/components/window/SubWindows-runo.html
index 5cbd350174..5cbd350174 100644
--- a/tests/src/com/vaadin/tests/components/window/SubWindows-runo.html
+++ b/tests/testbench/com/vaadin/tests/components/window/SubWindows-runo.html
diff --git a/tests/src/com/vaadin/tests/components/window/SubWindows.html b/tests/testbench/com/vaadin/tests/components/window/SubWindows.html
index 3b2109e3f1..3b2109e3f1 100644
--- a/tests/src/com/vaadin/tests/components/window/SubWindows.html
+++ b/tests/testbench/com/vaadin/tests/components/window/SubWindows.html
diff --git a/tests/src/com/vaadin/tests/components/window/SubWindows.java b/tests/testbench/com/vaadin/tests/components/window/SubWindows.java
index e939f0b9a4..e939f0b9a4 100644
--- a/tests/src/com/vaadin/tests/components/window/SubWindows.java
+++ b/tests/testbench/com/vaadin/tests/components/window/SubWindows.java
diff --git a/tests/src/com/vaadin/tests/components/window/SubwindowDraggability.java b/tests/testbench/com/vaadin/tests/components/window/SubwindowDraggability.java
index e1927982cd..e1927982cd 100644
--- a/tests/src/com/vaadin/tests/components/window/SubwindowDraggability.java
+++ b/tests/testbench/com/vaadin/tests/components/window/SubwindowDraggability.java
diff --git a/tests/src/com/vaadin/tests/components/window/SubwindowInvalidLayout.java b/tests/testbench/com/vaadin/tests/components/window/SubwindowInvalidLayout.java
index aeab7f6c97..aeab7f6c97 100644
--- a/tests/src/com/vaadin/tests/components/window/SubwindowInvalidLayout.java
+++ b/tests/testbench/com/vaadin/tests/components/window/SubwindowInvalidLayout.java
diff --git a/tests/src/com/vaadin/tests/components/window/TestTooSmallSubwindowSize.html b/tests/testbench/com/vaadin/tests/components/window/TestTooSmallSubwindowSize.html
index f926696d63..f926696d63 100644
--- a/tests/src/com/vaadin/tests/components/window/TestTooSmallSubwindowSize.html
+++ b/tests/testbench/com/vaadin/tests/components/window/TestTooSmallSubwindowSize.html
diff --git a/tests/src/com/vaadin/tests/components/window/TestTooSmallSubwindowSize.java b/tests/testbench/com/vaadin/tests/components/window/TestTooSmallSubwindowSize.java
index 859c1b4b5d..859c1b4b5d 100644
--- a/tests/src/com/vaadin/tests/components/window/TestTooSmallSubwindowSize.java
+++ b/tests/testbench/com/vaadin/tests/components/window/TestTooSmallSubwindowSize.java
diff --git a/tests/src/com/vaadin/tests/components/window/WindowCaptionTest.html b/tests/testbench/com/vaadin/tests/components/window/WindowCaptionTest.html
index 83889aedb8..83889aedb8 100644
--- a/tests/src/com/vaadin/tests/components/window/WindowCaptionTest.html
+++ b/tests/testbench/com/vaadin/tests/components/window/WindowCaptionTest.html
diff --git a/tests/src/com/vaadin/tests/components/window/WindowClickEvents.html b/tests/testbench/com/vaadin/tests/components/window/WindowClickEvents.html
index 4a41374e41..4a41374e41 100644
--- a/tests/src/com/vaadin/tests/components/window/WindowClickEvents.html
+++ b/tests/testbench/com/vaadin/tests/components/window/WindowClickEvents.html
diff --git a/tests/src/com/vaadin/tests/components/window/WindowClickEvents.java b/tests/testbench/com/vaadin/tests/components/window/WindowClickEvents.java
index 041ccaaf30..041ccaaf30 100644
--- a/tests/src/com/vaadin/tests/components/window/WindowClickEvents.java
+++ b/tests/testbench/com/vaadin/tests/components/window/WindowClickEvents.java
diff --git a/tests/src/com/vaadin/tests/components/window/WindowResizeListener.java b/tests/testbench/com/vaadin/tests/components/window/WindowResizeListener.java
index 62f998e20e..62f998e20e 100644
--- a/tests/src/com/vaadin/tests/components/window/WindowResizeListener.java
+++ b/tests/testbench/com/vaadin/tests/components/window/WindowResizeListener.java
diff --git a/tests/src/com/vaadin/tests/components/window/WindowScrollingComponentIntoView.java b/tests/testbench/com/vaadin/tests/components/window/WindowScrollingComponentIntoView.java
index 7889a58f81..7889a58f81 100644
--- a/tests/src/com/vaadin/tests/components/window/WindowScrollingComponentIntoView.java
+++ b/tests/testbench/com/vaadin/tests/components/window/WindowScrollingComponentIntoView.java
diff --git a/tests/src/com/vaadin/tests/components/window/WindowScrollingUp.java b/tests/testbench/com/vaadin/tests/components/window/WindowScrollingUp.java
index 476fd22a55..476fd22a55 100644
--- a/tests/src/com/vaadin/tests/components/window/WindowScrollingUp.java
+++ b/tests/testbench/com/vaadin/tests/components/window/WindowScrollingUp.java
diff --git a/tests/src/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.html b/tests/testbench/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.html
index 4923bff58a..4923bff58a 100644
--- a/tests/src/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.html
+++ b/tests/testbench/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.html
diff --git a/tests/src/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.java b/tests/testbench/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.java
index e6d3fb1651..e6d3fb1651 100644
--- a/tests/src/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.java
+++ b/tests/testbench/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.java
diff --git a/tests/src/com/vaadin/tests/components/window/WindowStyleNames.java b/tests/testbench/com/vaadin/tests/components/window/WindowStyleNames.java
index 3a36926b42..3a36926b42 100644
--- a/tests/src/com/vaadin/tests/components/window/WindowStyleNames.java
+++ b/tests/testbench/com/vaadin/tests/components/window/WindowStyleNames.java
diff --git a/tests/src/com/vaadin/tests/components/window/WindowTest.java b/tests/testbench/com/vaadin/tests/components/window/WindowTest.java
index ae3b0f22df..ae3b0f22df 100644
--- a/tests/src/com/vaadin/tests/components/window/WindowTest.java
+++ b/tests/testbench/com/vaadin/tests/components/window/WindowTest.java
diff --git a/tests/src/com/vaadin/tests/containers/BeanItemContainerFilteringTest.java b/tests/testbench/com/vaadin/tests/containers/BeanItemContainerFilteringTest.java
index 0d47cc426d..0d47cc426d 100644
--- a/tests/src/com/vaadin/tests/containers/BeanItemContainerFilteringTest.java
+++ b/tests/testbench/com/vaadin/tests/containers/BeanItemContainerFilteringTest.java
diff --git a/tests/src/com/vaadin/tests/containers/BeanItemContainerTest.java b/tests/testbench/com/vaadin/tests/containers/BeanItemContainerTest.java
index 905ec2f9ff..905ec2f9ff 100644
--- a/tests/src/com/vaadin/tests/containers/BeanItemContainerTest.java
+++ b/tests/testbench/com/vaadin/tests/containers/BeanItemContainerTest.java
diff --git a/tests/src/com/vaadin/tests/containers/HierarchicalWrapperOrdering.java b/tests/testbench/com/vaadin/tests/containers/HierarchicalWrapperOrdering.java
index fb5fe8c27a..fb5fe8c27a 100644
--- a/tests/src/com/vaadin/tests/containers/HierarchicalWrapperOrdering.java
+++ b/tests/testbench/com/vaadin/tests/containers/HierarchicalWrapperOrdering.java
diff --git a/tests/src/com/vaadin/tests/containers/IndexedContainerFilteringTest.java b/tests/testbench/com/vaadin/tests/containers/IndexedContainerFilteringTest.java
index 154118a393..154118a393 100644
--- a/tests/src/com/vaadin/tests/containers/IndexedContainerFilteringTest.java
+++ b/tests/testbench/com/vaadin/tests/containers/IndexedContainerFilteringTest.java
diff --git a/tests/src/com/vaadin/tests/containers/TableWithFileSystemContainer.java b/tests/testbench/com/vaadin/tests/containers/TableWithFileSystemContainer.java
index 20567e70af..20567e70af 100644
--- a/tests/src/com/vaadin/tests/containers/TableWithFileSystemContainer.java
+++ b/tests/testbench/com/vaadin/tests/containers/TableWithFileSystemContainer.java
diff --git a/tests/src/com/vaadin/tests/containers/TestItemSorter.java b/tests/testbench/com/vaadin/tests/containers/TestItemSorter.java
index bf7ce6175a..bf7ce6175a 100644
--- a/tests/src/com/vaadin/tests/containers/TestItemSorter.java
+++ b/tests/testbench/com/vaadin/tests/containers/TestItemSorter.java
diff --git a/tests/src/com/vaadin/tests/containers/sqlcontainer/CheckboxUpdateProblem.java b/tests/testbench/com/vaadin/tests/containers/sqlcontainer/CheckboxUpdateProblem.java
index 2682dc5bbb..86aee2d5ab 100644
--- a/tests/src/com/vaadin/tests/containers/sqlcontainer/CheckboxUpdateProblem.java
+++ b/tests/testbench/com/vaadin/tests/containers/sqlcontainer/CheckboxUpdateProblem.java
@@ -10,11 +10,11 @@ import com.vaadin.data.Container.ItemSetChangeListener;
 import com.vaadin.data.Item;
 import com.vaadin.data.Property;
 import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.data.util.sqlcontainer.AllTests;
 import com.vaadin.data.util.sqlcontainer.SQLContainer;
 import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool;
 import com.vaadin.data.util.sqlcontainer.connection.SimpleJDBCConnectionPool;
 import com.vaadin.data.util.sqlcontainer.query.TableQuery;
-import com.vaadin.tests.server.container.sqlcontainer.AllTests;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
diff --git a/tests/src/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java b/tests/testbench/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java
index 419e606bfc..419e606bfc 100644
--- a/tests/src/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java
+++ b/tests/testbench/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java
diff --git a/tests/src/com/vaadin/tests/dd/AcceptAnythingWindow.java b/tests/testbench/com/vaadin/tests/dd/AcceptAnythingWindow.java
index 308f002e4f..308f002e4f 100644
--- a/tests/src/com/vaadin/tests/dd/AcceptAnythingWindow.java
+++ b/tests/testbench/com/vaadin/tests/dd/AcceptAnythingWindow.java
diff --git a/tests/src/com/vaadin/tests/dd/AcceptFromComponent.java b/tests/testbench/com/vaadin/tests/dd/AcceptFromComponent.java
index 43bdce2ad4..43bdce2ad4 100644
--- a/tests/src/com/vaadin/tests/dd/AcceptFromComponent.java
+++ b/tests/testbench/com/vaadin/tests/dd/AcceptFromComponent.java
diff --git a/tests/src/com/vaadin/tests/dd/ActiveDragSourceClassName.java b/tests/testbench/com/vaadin/tests/dd/ActiveDragSourceClassName.java
index 889c6bb47b..889c6bb47b 100644
--- a/tests/src/com/vaadin/tests/dd/ActiveDragSourceClassName.java
+++ b/tests/testbench/com/vaadin/tests/dd/ActiveDragSourceClassName.java
diff --git a/tests/src/com/vaadin/tests/dd/CustomDDImplementation.java b/tests/testbench/com/vaadin/tests/dd/CustomDDImplementation.java
index c789ead113..c789ead113 100644
--- a/tests/src/com/vaadin/tests/dd/CustomDDImplementation.java
+++ b/tests/testbench/com/vaadin/tests/dd/CustomDDImplementation.java
diff --git a/tests/src/com/vaadin/tests/dd/DDTest1.java b/tests/testbench/com/vaadin/tests/dd/DDTest1.java
index 0d709844e9..0d709844e9 100644
--- a/tests/src/com/vaadin/tests/dd/DDTest1.java
+++ b/tests/testbench/com/vaadin/tests/dd/DDTest1.java
diff --git a/tests/src/com/vaadin/tests/dd/DDTest2.java b/tests/testbench/com/vaadin/tests/dd/DDTest2.java
index 69af2d3f1d..69af2d3f1d 100644
--- a/tests/src/com/vaadin/tests/dd/DDTest2.java
+++ b/tests/testbench/com/vaadin/tests/dd/DDTest2.java
diff --git a/tests/src/com/vaadin/tests/dd/DDTest4.java b/tests/testbench/com/vaadin/tests/dd/DDTest4.java
index b4da141ce2..b4da141ce2 100644
--- a/tests/src/com/vaadin/tests/dd/DDTest4.java
+++ b/tests/testbench/com/vaadin/tests/dd/DDTest4.java
diff --git a/tests/src/com/vaadin/tests/dd/DDTest5.java b/tests/testbench/com/vaadin/tests/dd/DDTest5.java
index e4f3d5335d..e4f3d5335d 100644
--- a/tests/src/com/vaadin/tests/dd/DDTest5.java
+++ b/tests/testbench/com/vaadin/tests/dd/DDTest5.java
diff --git a/tests/src/com/vaadin/tests/dd/DDTest6.java b/tests/testbench/com/vaadin/tests/dd/DDTest6.java
index 4299b321c3..4299b321c3 100644
--- a/tests/src/com/vaadin/tests/dd/DDTest6.java
+++ b/tests/testbench/com/vaadin/tests/dd/DDTest6.java
diff --git a/tests/src/com/vaadin/tests/dd/DDTest7.java b/tests/testbench/com/vaadin/tests/dd/DDTest7.java
index 6027b3e499..6027b3e499 100644
--- a/tests/src/com/vaadin/tests/dd/DDTest7.java
+++ b/tests/testbench/com/vaadin/tests/dd/DDTest7.java
diff --git a/tests/src/com/vaadin/tests/dd/DDTest8.java b/tests/testbench/com/vaadin/tests/dd/DDTest8.java
index fed889b5c1..fed889b5c1 100644
--- a/tests/src/com/vaadin/tests/dd/DDTest8.java
+++ b/tests/testbench/com/vaadin/tests/dd/DDTest8.java
diff --git a/tests/src/com/vaadin/tests/dd/DragAndDropFiles.java b/tests/testbench/com/vaadin/tests/dd/DragAndDropFiles.java
index ad23338bbf..ad23338bbf 100644
--- a/tests/src/com/vaadin/tests/dd/DragAndDropFiles.java
+++ b/tests/testbench/com/vaadin/tests/dd/DragAndDropFiles.java
diff --git a/tests/src/com/vaadin/tests/dd/DragDropPane.java b/tests/testbench/com/vaadin/tests/dd/DragDropPane.java
index 1b7b7b997b..1b7b7b997b 100644
--- a/tests/src/com/vaadin/tests/dd/DragDropPane.java
+++ b/tests/testbench/com/vaadin/tests/dd/DragDropPane.java
diff --git a/tests/src/com/vaadin/tests/dd/HorizontalLayoutSortableWithWrappers.java b/tests/testbench/com/vaadin/tests/dd/HorizontalLayoutSortableWithWrappers.java
index aa51dd539d..aa51dd539d 100644
--- a/tests/src/com/vaadin/tests/dd/HorizontalLayoutSortableWithWrappers.java
+++ b/tests/testbench/com/vaadin/tests/dd/HorizontalLayoutSortableWithWrappers.java
diff --git a/tests/src/com/vaadin/tests/dd/HorizontalSortableCssLayoutWithWrappers.java b/tests/testbench/com/vaadin/tests/dd/HorizontalSortableCssLayoutWithWrappers.java
index a77faffd2e..a77faffd2e 100644
--- a/tests/src/com/vaadin/tests/dd/HorizontalSortableCssLayoutWithWrappers.java
+++ b/tests/testbench/com/vaadin/tests/dd/HorizontalSortableCssLayoutWithWrappers.java
diff --git a/tests/src/com/vaadin/tests/dd/TreeDragStart.java b/tests/testbench/com/vaadin/tests/dd/TreeDragStart.java
index 4a719bfa7f..4a719bfa7f 100644
--- a/tests/src/com/vaadin/tests/dd/TreeDragStart.java
+++ b/tests/testbench/com/vaadin/tests/dd/TreeDragStart.java
diff --git a/tests/src/com/vaadin/tests/dd/VMyDragSource.java b/tests/testbench/com/vaadin/tests/dd/VMyDragSource.java
index 350ee064f3..350ee064f3 100644
--- a/tests/src/com/vaadin/tests/dd/VMyDragSource.java
+++ b/tests/testbench/com/vaadin/tests/dd/VMyDragSource.java
diff --git a/tests/src/com/vaadin/tests/dd/VMyDropTarget.java b/tests/testbench/com/vaadin/tests/dd/VMyDropTarget.java
index 743cce3095..743cce3095 100644
--- a/tests/src/com/vaadin/tests/dd/VMyDropTarget.java
+++ b/tests/testbench/com/vaadin/tests/dd/VMyDropTarget.java
diff --git a/tests/src/com/vaadin/tests/debug/DebugWindowPresent.html b/tests/testbench/com/vaadin/tests/debug/DebugWindowPresent.html
index d396c1778e..d396c1778e 100644
--- a/tests/src/com/vaadin/tests/debug/DebugWindowPresent.html
+++ b/tests/testbench/com/vaadin/tests/debug/DebugWindowPresent.html
diff --git a/tests/src/com/vaadin/tests/debug/DebugWindowPresent.java b/tests/testbench/com/vaadin/tests/debug/DebugWindowPresent.java
index 3e04d27628..3e04d27628 100644
--- a/tests/src/com/vaadin/tests/debug/DebugWindowPresent.java
+++ b/tests/testbench/com/vaadin/tests/debug/DebugWindowPresent.java
diff --git a/tests/src/com/vaadin/tests/gwtadapter/componentlocator/TestDetachedNotPresent.html b/tests/testbench/com/vaadin/tests/gwtadapter/componentlocator/TestDetachedNotPresent.html
index 24e5e992ca..24e5e992ca 100644
--- a/tests/src/com/vaadin/tests/gwtadapter/componentlocator/TestDetachedNotPresent.html
+++ b/tests/testbench/com/vaadin/tests/gwtadapter/componentlocator/TestDetachedNotPresent.html
diff --git a/tests/src/com/vaadin/tests/integration/IntegrationTestApplication.java b/tests/testbench/com/vaadin/tests/integration/IntegrationTestApplication.java
index c61d23ae8d..c61d23ae8d 100644
--- a/tests/src/com/vaadin/tests/integration/IntegrationTestApplication.java
+++ b/tests/testbench/com/vaadin/tests/integration/IntegrationTestApplication.java
diff --git a/tests/src/com/vaadin/tests/integration/JSR286PortletApplication.java b/tests/testbench/com/vaadin/tests/integration/JSR286PortletApplication.java
index 57ee762913..57ee762913 100644
--- a/tests/src/com/vaadin/tests/integration/JSR286PortletApplication.java
+++ b/tests/testbench/com/vaadin/tests/integration/JSR286PortletApplication.java
diff --git a/tests/src/com/vaadin/tests/integration/LiferayThemeDemo.java b/tests/testbench/com/vaadin/tests/integration/LiferayThemeDemo.java
index 4267a7ea91..4267a7ea91 100644
--- a/tests/src/com/vaadin/tests/integration/LiferayThemeDemo.java
+++ b/tests/testbench/com/vaadin/tests/integration/LiferayThemeDemo.java
diff --git a/tests/src/com/vaadin/tests/integration/fi.gif b/tests/testbench/com/vaadin/tests/integration/fi.gif
index 8d3a191828..8d3a191828 100755
--- a/tests/src/com/vaadin/tests/integration/fi.gif
+++ b/tests/testbench/com/vaadin/tests/integration/fi.gif
diff --git a/tests/src/com/vaadin/tests/integration/se.gif b/tests/testbench/com/vaadin/tests/integration/se.gif
index 80f6285228..80f6285228 100755
--- a/tests/src/com/vaadin/tests/integration/se.gif
+++ b/tests/testbench/com/vaadin/tests/integration/se.gif
diff --git a/tests/src/com/vaadin/tests/layouts/AbsoluteLayoutAddRemove.java b/tests/testbench/com/vaadin/tests/layouts/AbsoluteLayoutAddRemove.java
index 6193fd238e..6193fd238e 100644
--- a/tests/src/com/vaadin/tests/layouts/AbsoluteLayoutAddRemove.java
+++ b/tests/testbench/com/vaadin/tests/layouts/AbsoluteLayoutAddRemove.java
diff --git a/tests/src/com/vaadin/tests/layouts/CaptionsInLayouts.java b/tests/testbench/com/vaadin/tests/layouts/CaptionsInLayouts.java
index ec825a3404..ec825a3404 100644
--- a/tests/src/com/vaadin/tests/layouts/CaptionsInLayouts.java
+++ b/tests/testbench/com/vaadin/tests/layouts/CaptionsInLayouts.java
diff --git a/tests/src/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.html b/tests/testbench/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.html
index 403bb32a67..403bb32a67 100644
--- a/tests/src/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.html
+++ b/tests/testbench/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.html
diff --git a/tests/src/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.java b/tests/testbench/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.java
index 87b04ffcb0..87b04ffcb0 100644
--- a/tests/src/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.java
+++ b/tests/testbench/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.java
diff --git a/tests/src/com/vaadin/tests/layouts/CssLayoutRemoveComponent.html b/tests/testbench/com/vaadin/tests/layouts/CssLayoutRemoveComponent.html
index 0c4c3ad12c..0c4c3ad12c 100644
--- a/tests/src/com/vaadin/tests/layouts/CssLayoutRemoveComponent.html
+++ b/tests/testbench/com/vaadin/tests/layouts/CssLayoutRemoveComponent.html
diff --git a/tests/src/com/vaadin/tests/layouts/CssLayoutRemoveComponent.java b/tests/testbench/com/vaadin/tests/layouts/CssLayoutRemoveComponent.java
index 4959e0cc3e..4959e0cc3e 100644
--- a/tests/src/com/vaadin/tests/layouts/CssLayoutRemoveComponent.java
+++ b/tests/testbench/com/vaadin/tests/layouts/CssLayoutRemoveComponent.java
diff --git a/tests/src/com/vaadin/tests/layouts/CssLayoutRemoveComponentWithCaption.java b/tests/testbench/com/vaadin/tests/layouts/CssLayoutRemoveComponentWithCaption.java
index 946e778ead..946e778ead 100644
--- a/tests/src/com/vaadin/tests/layouts/CssLayoutRemoveComponentWithCaption.java
+++ b/tests/testbench/com/vaadin/tests/layouts/CssLayoutRemoveComponentWithCaption.java
diff --git a/tests/src/com/vaadin/tests/layouts/CssLayoutSizeChangePropagation.java b/tests/testbench/com/vaadin/tests/layouts/CssLayoutSizeChangePropagation.java
index 0be605c795..0be605c795 100644
--- a/tests/src/com/vaadin/tests/layouts/CssLayoutSizeChangePropagation.java
+++ b/tests/testbench/com/vaadin/tests/layouts/CssLayoutSizeChangePropagation.java
diff --git a/tests/src/com/vaadin/tests/layouts/DeepComponentTrees.java b/tests/testbench/com/vaadin/tests/layouts/DeepComponentTrees.java
index 3a6414cff5..3a6414cff5 100644
--- a/tests/src/com/vaadin/tests/layouts/DeepComponentTrees.java
+++ b/tests/testbench/com/vaadin/tests/layouts/DeepComponentTrees.java
diff --git a/tests/src/com/vaadin/tests/layouts/FormLayoutWithInvisibleComponent.java b/tests/testbench/com/vaadin/tests/layouts/FormLayoutWithInvisibleComponent.java
index e29c7559b3..e29c7559b3 100644
--- a/tests/src/com/vaadin/tests/layouts/FormLayoutWithInvisibleComponent.java
+++ b/tests/testbench/com/vaadin/tests/layouts/FormLayoutWithInvisibleComponent.java
diff --git a/tests/src/com/vaadin/tests/layouts/GridLayoutCaptions.java b/tests/testbench/com/vaadin/tests/layouts/GridLayoutCaptions.java
index 08df953e66..08df953e66 100644
--- a/tests/src/com/vaadin/tests/layouts/GridLayoutCaptions.java
+++ b/tests/testbench/com/vaadin/tests/layouts/GridLayoutCaptions.java
diff --git a/tests/src/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java b/tests/testbench/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java
index e9d206009a..e9d206009a 100644
--- a/tests/src/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java
+++ b/tests/testbench/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java
diff --git a/tests/src/com/vaadin/tests/layouts/GridLayoutInsidePanel.java b/tests/testbench/com/vaadin/tests/layouts/GridLayoutInsidePanel.java
index 1c864fdb47..1c864fdb47 100644
--- a/tests/src/com/vaadin/tests/layouts/GridLayoutInsidePanel.java
+++ b/tests/testbench/com/vaadin/tests/layouts/GridLayoutInsidePanel.java
diff --git a/tests/src/com/vaadin/tests/layouts/GridLayoutInsidePanel2.java b/tests/testbench/com/vaadin/tests/layouts/GridLayoutInsidePanel2.java
index 8fb42948fc..8fb42948fc 100644
--- a/tests/src/com/vaadin/tests/layouts/GridLayoutInsidePanel2.java
+++ b/tests/testbench/com/vaadin/tests/layouts/GridLayoutInsidePanel2.java
diff --git a/tests/src/com/vaadin/tests/layouts/GridLayoutMoveComponent.html b/tests/testbench/com/vaadin/tests/layouts/GridLayoutMoveComponent.html
index cde4341030..cde4341030 100644
--- a/tests/src/com/vaadin/tests/layouts/GridLayoutMoveComponent.html
+++ b/tests/testbench/com/vaadin/tests/layouts/GridLayoutMoveComponent.html
diff --git a/tests/src/com/vaadin/tests/layouts/GridLayoutMoveComponent.java b/tests/testbench/com/vaadin/tests/layouts/GridLayoutMoveComponent.java
index 265187e878..265187e878 100644
--- a/tests/src/com/vaadin/tests/layouts/GridLayoutMoveComponent.java
+++ b/tests/testbench/com/vaadin/tests/layouts/GridLayoutMoveComponent.java
diff --git a/tests/src/com/vaadin/tests/layouts/GridLayoutNPE.java b/tests/testbench/com/vaadin/tests/layouts/GridLayoutNPE.java
index 48ecb5832a..48ecb5832a 100644
--- a/tests/src/com/vaadin/tests/layouts/GridLayoutNPE.java
+++ b/tests/testbench/com/vaadin/tests/layouts/GridLayoutNPE.java
diff --git a/tests/src/com/vaadin/tests/layouts/GridLayoutRemoveFinalRow.java b/tests/testbench/com/vaadin/tests/layouts/GridLayoutRemoveFinalRow.java
index 8689503332..8689503332 100644
--- a/tests/src/com/vaadin/tests/layouts/GridLayoutRemoveFinalRow.java
+++ b/tests/testbench/com/vaadin/tests/layouts/GridLayoutRemoveFinalRow.java
diff --git a/tests/src/com/vaadin/tests/layouts/GridLayoutSpanExpansion.html b/tests/testbench/com/vaadin/tests/layouts/GridLayoutSpanExpansion.html
index 5237d5f49e..5237d5f49e 100644
--- a/tests/src/com/vaadin/tests/layouts/GridLayoutSpanExpansion.html
+++ b/tests/testbench/com/vaadin/tests/layouts/GridLayoutSpanExpansion.html
diff --git a/tests/src/com/vaadin/tests/layouts/GridLayoutSpanExpansion.java b/tests/testbench/com/vaadin/tests/layouts/GridLayoutSpanExpansion.java
index 9753526a9e..9753526a9e 100644
--- a/tests/src/com/vaadin/tests/layouts/GridLayoutSpanExpansion.java
+++ b/tests/testbench/com/vaadin/tests/layouts/GridLayoutSpanExpansion.java
diff --git a/tests/src/com/vaadin/tests/layouts/GridLayoutWidthChange.html b/tests/testbench/com/vaadin/tests/layouts/GridLayoutWidthChange.html
index aaad92e56d..aaad92e56d 100644
--- a/tests/src/com/vaadin/tests/layouts/GridLayoutWidthChange.html
+++ b/tests/testbench/com/vaadin/tests/layouts/GridLayoutWidthChange.html
diff --git a/tests/src/com/vaadin/tests/layouts/GridLayoutWidthChange.java b/tests/testbench/com/vaadin/tests/layouts/GridLayoutWidthChange.java
index 08bef51163..08bef51163 100644
--- a/tests/src/com/vaadin/tests/layouts/GridLayoutWidthChange.java
+++ b/tests/testbench/com/vaadin/tests/layouts/GridLayoutWidthChange.java
diff --git a/tests/src/com/vaadin/tests/layouts/HiddenHorizontalLayout.java b/tests/testbench/com/vaadin/tests/layouts/HiddenHorizontalLayout.java
index 50cf41f095..50cf41f095 100644
--- a/tests/src/com/vaadin/tests/layouts/HiddenHorizontalLayout.java
+++ b/tests/testbench/com/vaadin/tests/layouts/HiddenHorizontalLayout.java
diff --git a/tests/src/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.html b/tests/testbench/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.html
index 22d81ce11f..22d81ce11f 100644
--- a/tests/src/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.html
+++ b/tests/testbench/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.html
diff --git a/tests/src/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.java b/tests/testbench/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.java
index d21ecdd575..d21ecdd575 100644
--- a/tests/src/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.java
+++ b/tests/testbench/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.java
diff --git a/tests/src/com/vaadin/tests/layouts/MovingInvisibleField.html b/tests/testbench/com/vaadin/tests/layouts/MovingInvisibleField.html
index 84c2809382..84c2809382 100644
--- a/tests/src/com/vaadin/tests/layouts/MovingInvisibleField.html
+++ b/tests/testbench/com/vaadin/tests/layouts/MovingInvisibleField.html
diff --git a/tests/src/com/vaadin/tests/layouts/MovingInvisibleField.java b/tests/testbench/com/vaadin/tests/layouts/MovingInvisibleField.java
index 23ae31d786..23ae31d786 100644
--- a/tests/src/com/vaadin/tests/layouts/MovingInvisibleField.java
+++ b/tests/testbench/com/vaadin/tests/layouts/MovingInvisibleField.java
diff --git a/tests/src/com/vaadin/tests/layouts/OrderedLayoutBasics.java b/tests/testbench/com/vaadin/tests/layouts/OrderedLayoutBasics.java
index 620d33d43e..620d33d43e 100644
--- a/tests/src/com/vaadin/tests/layouts/OrderedLayoutBasics.java
+++ b/tests/testbench/com/vaadin/tests/layouts/OrderedLayoutBasics.java
diff --git a/tests/src/com/vaadin/tests/layouts/OrderedLayoutCSSCompatibility.java b/tests/testbench/com/vaadin/tests/layouts/OrderedLayoutCSSCompatibility.java
index 41f1de2c4a..41f1de2c4a 100644
--- a/tests/src/com/vaadin/tests/layouts/OrderedLayoutCSSCompatibility.java
+++ b/tests/testbench/com/vaadin/tests/layouts/OrderedLayoutCSSCompatibility.java
diff --git a/tests/src/com/vaadin/tests/layouts/TestAbsoluteLayout.java b/tests/testbench/com/vaadin/tests/layouts/TestAbsoluteLayout.java
index baf8218922..baf8218922 100644
--- a/tests/src/com/vaadin/tests/layouts/TestAbsoluteLayout.java
+++ b/tests/testbench/com/vaadin/tests/layouts/TestAbsoluteLayout.java
diff --git a/tests/src/com/vaadin/tests/layouts/TestLayoutClickListeners.html b/tests/testbench/com/vaadin/tests/layouts/TestLayoutClickListeners.html
index 743d59c007..743d59c007 100644
--- a/tests/src/com/vaadin/tests/layouts/TestLayoutClickListeners.html
+++ b/tests/testbench/com/vaadin/tests/layouts/TestLayoutClickListeners.html
diff --git a/tests/src/com/vaadin/tests/layouts/TestLayoutClickListeners.java b/tests/testbench/com/vaadin/tests/layouts/TestLayoutClickListeners.java
index 93c51d6b4a..93c51d6b4a 100644
--- a/tests/src/com/vaadin/tests/layouts/TestLayoutClickListeners.java
+++ b/tests/testbench/com/vaadin/tests/layouts/TestLayoutClickListeners.java
diff --git a/tests/src/com/vaadin/tests/layouts/TestLayoutPerformance.java b/tests/testbench/com/vaadin/tests/layouts/TestLayoutPerformance.java
index 31ee15983e..31ee15983e 100644
--- a/tests/src/com/vaadin/tests/layouts/TestLayoutPerformance.java
+++ b/tests/testbench/com/vaadin/tests/layouts/TestLayoutPerformance.java
diff --git a/tests/src/com/vaadin/tests/layouts/TreeWithBordersInLayout.html b/tests/testbench/com/vaadin/tests/layouts/TreeWithBordersInLayout.html
index cd4c8756cc..cd4c8756cc 100644
--- a/tests/src/com/vaadin/tests/layouts/TreeWithBordersInLayout.html
+++ b/tests/testbench/com/vaadin/tests/layouts/TreeWithBordersInLayout.html
diff --git a/tests/src/com/vaadin/tests/layouts/TreeWithBordersInLayout.java b/tests/testbench/com/vaadin/tests/layouts/TreeWithBordersInLayout.java
index 27b1ce6462..27b1ce6462 100644
--- a/tests/src/com/vaadin/tests/layouts/TreeWithBordersInLayout.java
+++ b/tests/testbench/com/vaadin/tests/layouts/TreeWithBordersInLayout.java
diff --git a/tests/src/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java b/tests/testbench/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java
index bbac07d20f..bbac07d20f 100644
--- a/tests/src/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java
+++ b/tests/testbench/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java
diff --git a/tests/src/com/vaadin/tests/layouts/VerticalLayoutWithRelativeSizeComponents.java b/tests/testbench/com/vaadin/tests/layouts/VerticalLayoutWithRelativeSizeComponents.java
index 361707a86c..361707a86c 100644
--- a/tests/src/com/vaadin/tests/layouts/VerticalLayoutWithRelativeSizeComponents.java
+++ b/tests/testbench/com/vaadin/tests/layouts/VerticalLayoutWithRelativeSizeComponents.java
diff --git a/tests/src/com/vaadin/tests/layouts/VerticalLayoutWithRelativeSizeComponentsInitiallyHidden.java b/tests/testbench/com/vaadin/tests/layouts/VerticalLayoutWithRelativeSizeComponentsInitiallyHidden.java
index 360cc73f5e..360cc73f5e 100644
--- a/tests/src/com/vaadin/tests/layouts/VerticalLayoutWithRelativeSizeComponentsInitiallyHidden.java
+++ b/tests/testbench/com/vaadin/tests/layouts/VerticalLayoutWithRelativeSizeComponentsInitiallyHidden.java
diff --git a/tests/src/com/vaadin/tests/layouts/WidgetImplementationSwap.html b/tests/testbench/com/vaadin/tests/layouts/WidgetImplementationSwap.html
index c335f5df5a..c335f5df5a 100644
--- a/tests/src/com/vaadin/tests/layouts/WidgetImplementationSwap.html
+++ b/tests/testbench/com/vaadin/tests/layouts/WidgetImplementationSwap.html
diff --git a/tests/src/com/vaadin/tests/layouts/WidgetImplementationSwap.java b/tests/testbench/com/vaadin/tests/layouts/WidgetImplementationSwap.java
index 283e9f7a54..283e9f7a54 100644
--- a/tests/src/com/vaadin/tests/layouts/WidgetImplementationSwap.java
+++ b/tests/testbench/com/vaadin/tests/layouts/WidgetImplementationSwap.java
diff --git a/tests/src/com/vaadin/tests/layouts/layouttester/AbstractLayoutTests.java b/tests/testbench/com/vaadin/tests/layouts/layouttester/AbstractLayoutTests.java
index 9bfbebc439..9bfbebc439 100644
--- a/tests/src/com/vaadin/tests/layouts/layouttester/AbstractLayoutTests.java
+++ b/tests/testbench/com/vaadin/tests/layouts/layouttester/AbstractLayoutTests.java
diff --git a/tests/src/com/vaadin/tests/layouts/layouttester/GridLayoutTests.java b/tests/testbench/com/vaadin/tests/layouts/layouttester/GridLayoutTests.java
index 6b56d93a30..6b56d93a30 100644
--- a/tests/src/com/vaadin/tests/layouts/layouttester/GridLayoutTests.java
+++ b/tests/testbench/com/vaadin/tests/layouts/layouttester/GridLayoutTests.java
diff --git a/tests/src/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java b/tests/testbench/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java
index ff6e76e480..ff6e76e480 100644
--- a/tests/src/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java
+++ b/tests/testbench/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java
diff --git a/tests/src/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.html b/tests/testbench/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.html
index b0e2444986..b0e2444986 100644
--- a/tests/src/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.html
+++ b/tests/testbench/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.html
diff --git a/tests/src/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.java b/tests/testbench/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.java
index 6f73a42497..6f73a42497 100644
--- a/tests/src/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.java
+++ b/tests/testbench/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.java
diff --git a/tests/src/com/vaadin/tests/layouts/layouttester/UndefWideLabel.java b/tests/testbench/com/vaadin/tests/layouts/layouttester/UndefWideLabel.java
index c998ce458a..c998ce458a 100644
--- a/tests/src/com/vaadin/tests/layouts/layouttester/UndefWideLabel.java
+++ b/tests/testbench/com/vaadin/tests/layouts/layouttester/UndefWideLabel.java
diff --git a/tests/src/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java b/tests/testbench/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java
index 8019ae5aca..8019ae5aca 100644
--- a/tests/src/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java
+++ b/tests/testbench/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java
diff --git a/tests/src/com/vaadin/tests/m.gif b/tests/testbench/com/vaadin/tests/m.gif
index 2201bdfc1c..2201bdfc1c 100644
--- a/tests/src/com/vaadin/tests/m.gif
+++ b/tests/testbench/com/vaadin/tests/m.gif
diff --git a/tests/src/com/vaadin/tests/resources/DownloadLargeFileResource.java b/tests/testbench/com/vaadin/tests/resources/DownloadLargeFileResource.java
index 3d7379aafe..3d7379aafe 100644
--- a/tests/src/com/vaadin/tests/resources/DownloadLargeFileResource.java
+++ b/tests/testbench/com/vaadin/tests/resources/DownloadLargeFileResource.java
diff --git a/tests/src/com/vaadin/tests/resources/NonExistingFileResource.java b/tests/testbench/com/vaadin/tests/resources/NonExistingFileResource.java
index 2299ba4d26..2299ba4d26 100644
--- a/tests/src/com/vaadin/tests/resources/NonExistingFileResource.java
+++ b/tests/testbench/com/vaadin/tests/resources/NonExistingFileResource.java
diff --git a/tests/src/com/vaadin/tests/resources/ResourceDownload.java b/tests/testbench/com/vaadin/tests/resources/ResourceDownload.java
index d7da9c2d63..d7da9c2d63 100644
--- a/tests/src/com/vaadin/tests/resources/ResourceDownload.java
+++ b/tests/testbench/com/vaadin/tests/resources/ResourceDownload.java
diff --git a/tests/src/com/vaadin/tests/themes/ButtonsTest.java b/tests/testbench/com/vaadin/tests/themes/ButtonsTest.java
index 9425cd9bd2..9425cd9bd2 100644
--- a/tests/src/com/vaadin/tests/themes/ButtonsTest.java
+++ b/tests/testbench/com/vaadin/tests/themes/ButtonsTest.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1225.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1225.java
index 0596fd4d49..0596fd4d49 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1225.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1225.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1230.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1230.java
index fd859459c0..fd859459c0 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1230.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1230.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket124.java b/tests/testbench/com/vaadin/tests/tickets/Ticket124.java
index 985d8bccac..985d8bccac 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket124.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket124.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1245.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1245.java
index e83ac6aded..e83ac6aded 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1245.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1245.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1362Login.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1362Login.java
index d8fdefbd38..d8fdefbd38 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1362Login.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1362Login.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1365.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1365.java
index be549ebf8c..be549ebf8c 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1365.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1365.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1368.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1368.java
index 9df316fdcb..9df316fdcb 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1368.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1368.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1397.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1397.java
index 282df33d89..282df33d89 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1397.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1397.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1435.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1435.java
index b961c0d6b1..b961c0d6b1 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1435.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1435.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1444.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1444.java
index 003b50240b..003b50240b 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1444.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1444.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1465ModalNotification.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1465ModalNotification.java
index ff716aefc1..ff716aefc1 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1465ModalNotification.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1465ModalNotification.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1506.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1506.java
index 4788d27aad..4788d27aad 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1506.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1506.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1506_Panel.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1506_Panel.java
index 37690612ed..37690612ed 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1506_Panel.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1506_Panel.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1506_TestContainer.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1506_TestContainer.java
index b8b6cfe5dd..b8b6cfe5dd 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1506_TestContainer.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1506_TestContainer.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1506_TestContainer2.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1506_TestContainer2.java
index c39454027a..c39454027a 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1506_TestContainer2.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1506_TestContainer2.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1519.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1519.java
index ff6d340372..ff6d340372 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1519.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1519.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1572.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1572.java
index a928e0f69c..a928e0f69c 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1572.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1572.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1581.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1581.java
index 6780b3c9de..6780b3c9de 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1581.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1581.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1589.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1589.java
index 5a2bf0c793..5a2bf0c793 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1589.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1589.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1598.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1598.java
index 20f1d4d985..20f1d4d985 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1598.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1598.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket161.java b/tests/testbench/com/vaadin/tests/tickets/Ticket161.java
index b2998c687d..b2998c687d 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket161.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket161.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1632.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1632.java
index e156752450..e156752450 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1632.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1632.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1659.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1659.java
index 8bba5a103e..8bba5a103e 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1659.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1659.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1663.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1663.java
index e7b98a4c99..e7b98a4c99 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1663.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1663.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1673.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1673.java
index 845e49daed..845e49daed 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1673.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1673.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1710.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1710.java
index 404301dfa5..404301dfa5 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1710.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1710.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1737.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1737.java
index f45fe88889..f45fe88889 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1737.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1737.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1767.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1767.java
index a65a601175..a65a601175 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1767.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1767.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1772.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1772.java
index 68e00e7f94..68e00e7f94 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1772.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1772.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1775.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1775.java
index f37737e929..f37737e929 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1775.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1775.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1804.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1804.java
index 265f3041e9..265f3041e9 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1804.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1804.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1805.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1805.java
index ad7a61d81f..ad7a61d81f 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1805.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1805.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1806.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1806.java
index f3406a9155..f3406a9155 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1806.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1806.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1811.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1811.java
index 8f373de6bf..8f373de6bf 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1811.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1811.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1819.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1819.java
index 6f06055fc4..6f06055fc4 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1819.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1819.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1834PanelScrolling.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1834PanelScrolling.java
index 7c9104e750..7c9104e750 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1834PanelScrolling.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1834PanelScrolling.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1857.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1857.java
index f82467b519..f82467b519 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1857.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1857.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1868.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1868.java
index edf9c1207d..edf9c1207d 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1868.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1868.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1869.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1869.java
index 953217f907..953217f907 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1869.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1869.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1878.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1878.java
index 0bb631aab5..0bb631aab5 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1878.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1878.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1900.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1900.java
index 2047b4698c..2047b4698c 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1900.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1900.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1904.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1904.java
index 1d79158333..1d79158333 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1904.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1904.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1916.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1916.java
index d340bf144a..d340bf144a 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1916.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1916.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1919.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1919.java
index 1e578cd8f5..1e578cd8f5 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1919.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1919.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1921.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1921.java
index 71c45c34ce..71c45c34ce 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1921.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1921.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1923.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1923.java
index 9fc0ecc586..9fc0ecc586 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1923.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1923.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1924ThemeChanging.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1924ThemeChanging.java
index 981fd9cd5c..981fd9cd5c 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1924ThemeChanging.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1924ThemeChanging.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1925.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1925.java
index 83e5e1cfd4..83e5e1cfd4 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1925.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1925.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1939.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1939.java
index 2970335d83..2970335d83 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1939.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1939.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1940.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1940.java
index a3264ecba4..a3264ecba4 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1940.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1940.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1953.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1953.java
index 43e7f10220..43e7f10220 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1953.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1953.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1966.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1966.java
index 5f1f152f3f..5f1f152f3f 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1966.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1966.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1966_2.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1966_2.java
index 65fe2cc2ff..65fe2cc2ff 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1966_2.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1966_2.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1966_3.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1966_3.java
index e4f99b9023..e4f99b9023 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1966_3.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1966_3.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1969.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1969.java
index 26c1c69470..26c1c69470 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1969.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1969.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1970.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1970.java
index 1442c9ea5b..1442c9ea5b 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1970.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1970.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1972.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1972.java
index 86d5b0f11d..86d5b0f11d 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1972.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1972.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1973.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1973.java
index c756ca12c3..c756ca12c3 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1973.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1973.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1973_2.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1973_2.java
index 5cffdbd5db..5cffdbd5db 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1973_2.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1973_2.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1975.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1975.java
index d162606ba7..d162606ba7 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1975.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1975.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1982.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1982.java
index 53e5630353..53e5630353 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1982.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1982.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1983.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1983.java
index fbab5c5244..fbab5c5244 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1983.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1983.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1986.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1986.java
index f2a173bcb0..f2a173bcb0 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1986.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1986.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1991.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1991.java
index 430c54ec92..430c54ec92 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1991.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1991.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1995.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1995.java
index c681cb5bd0..c681cb5bd0 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1995.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1995.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket20.java b/tests/testbench/com/vaadin/tests/tickets/Ticket20.java
index 55fee95de3..55fee95de3 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket20.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket20.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2001.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2001.java
index 4796451dc0..4796451dc0 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2001.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2001.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2002.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2002.java
index 4e07230f46..4e07230f46 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2002.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2002.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2007.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2007.java
index 84dafb41f3..84dafb41f3 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2007.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2007.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2009.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2009.java
index f726ff10de..f726ff10de 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2009.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2009.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2011.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2011.java
index e28ee9b4e2..e28ee9b4e2 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2011.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2011.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2014.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2014.java
index b005eefd03..b005eefd03 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2014.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2014.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2021.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2021.java
index 69858a57d6..69858a57d6 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2021.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2021.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2022.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2022.java
index 17df2a2700..17df2a2700 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2022.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2022.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2023.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2023.java
index ac80ef602b..ac80ef602b 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2023.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2023.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2024.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2024.java
index 5f0b432790..5f0b432790 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2024.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2024.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2026.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2026.java
index be329eb5b5..be329eb5b5 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2026.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2026.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2029.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2029.java
index cabbab2c32..cabbab2c32 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2029.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2029.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2037.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2037.java
index 652983c423..652983c423 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2037.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2037.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2038.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2038.java
index 85a5a4b701..85a5a4b701 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2038.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2038.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2040.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2040.java
index f1775da039..f1775da039 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2040.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2040.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2042.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2042.java
index 2dfe4a1cb5..2dfe4a1cb5 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2042.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2042.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2043.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2043.java
index faea096744..faea096744 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2043.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2043.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2048.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2048.java
index 65b5f73b53..65b5f73b53 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2048.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2048.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2051.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2051.java
index e901ebc343..e901ebc343 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2051.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2051.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2053.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2053.java
index f784b40aed..f784b40aed 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2053.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2053.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2060.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2060.java
index 63bf5b3ff7..63bf5b3ff7 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2060.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2060.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2061.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2061.java
index c9cc3ce328..c9cc3ce328 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2061.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2061.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2061b.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2061b.java
index 5dc6dde768..5dc6dde768 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2061b.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2061b.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2061c.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2061c.java
index 4cca979268..4cca979268 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2061c.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2061c.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2062.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2062.java
index 2dabffe5f4..2dabffe5f4 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2062.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2062.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2083.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2083.java
index e722c6826c..e722c6826c 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2083.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2083.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2090.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2090.java
index 5bc69e0a64..5bc69e0a64 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2090.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2090.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2095.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2095.java
index 0911cb6830..0911cb6830 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2095.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2095.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2098.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2098.java
index 829fb30070..829fb30070 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2098.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2098.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2099.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2099.java
index 4f79eb7e64..4f79eb7e64 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2099.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2099.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2101.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2101.java
index 8c12ca10ce..8c12ca10ce 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2101.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2101.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2103.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2103.java
index d65f4c1aec..d65f4c1aec 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2103.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2103.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2104.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2104.java
index 8b95fa35a2..8b95fa35a2 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2104.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2104.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2106.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2106.java
index 92908aa66d..92908aa66d 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2106.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2106.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2107.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2107.java
index 199b278343..199b278343 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2107.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2107.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2117.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2117.java
index 974b3c4572..974b3c4572 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2117.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2117.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2119.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2119.java
index c1e0d64dde..c1e0d64dde 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2119.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2119.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2125.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2125.java
index b296a4ff46..b296a4ff46 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2125.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2125.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2126.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2126.java
index 01ef18f2ef..01ef18f2ef 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2126.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2126.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2151.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2151.java
index 5a48156367..5a48156367 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2151.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2151.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2157.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2157.java
index 3d90907e50..3d90907e50 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2157.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2157.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2178.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2178.java
index a3461dd8b6..a3461dd8b6 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2178.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2178.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2179.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2179.java
index 165e770307..165e770307 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2179.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2179.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2180.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2180.java
index 9f5e2a2de1..9f5e2a2de1 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2180.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2180.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2181.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2181.java
index ea3d996b98..ea3d996b98 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2181.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2181.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2186.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2186.java
index bc9ff8c27d..bc9ff8c27d 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2186.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2186.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2204.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2204.java
index 6a047cb626..6a047cb626 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2204.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2204.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2208.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2208.java
index a326a0c381..a326a0c381 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2208.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2208.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2209.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2209.java
index 7ee8a07405..7ee8a07405 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2209.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2209.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2209OL.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2209OL.java
index b7b7b8aba1..b7b7b8aba1 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2209OL.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2209OL.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2209OL2.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2209OL2.java
index 99103e7e42..99103e7e42 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2209OL2.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2209OL2.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2215.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2215.java
index 221f84f86f..221f84f86f 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2215.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2215.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2221.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2221.java
index e6489da432..e6489da432 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2221.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2221.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2222.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2222.java
index 86dccede69..86dccede69 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2222.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2222.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2227OrderedlayoutInTable.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2227OrderedlayoutInTable.java
index c93b26bec2..c93b26bec2 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2227OrderedlayoutInTable.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2227OrderedlayoutInTable.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2231.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2231.java
index ba12dd7abc..ba12dd7abc 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2231.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2231.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2232.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2232.java
index 6df6717c33..6df6717c33 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2232.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2232.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2234.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2234.java
index 5c6167fbfe..5c6167fbfe 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2234.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2234.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2235.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2235.java
index 72a77e502e..72a77e502e 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2235.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2235.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2240.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2240.java
index 6d70d89af8..6d70d89af8 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2240.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2240.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2242.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2242.java
index fa25ff55f1..fa25ff55f1 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2242.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2242.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2244.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2244.java
index e9ae3ac720..e9ae3ac720 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2244.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2244.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2245.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2245.java
index bac85c95cd..bac85c95cd 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2245.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2245.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2267.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2267.java
index 020ea5c7c6..020ea5c7c6 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2267.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2267.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2271.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2271.java
index 50a99edb7a..50a99edb7a 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2271.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2271.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2279.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2279.java
index e3b446f242..e3b446f242 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2279.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2279.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2282.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2282.java
index c63faf2cef..c63faf2cef 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2282.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2282.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2283.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2283.java
index 89b90eaa01..89b90eaa01 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2283.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2283.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2287.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2287.java
index 5d4ac308ef..5d4ac308ef 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2287.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2287.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2289.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2289.java
index 19574b50fb..19574b50fb 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2289.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2289.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2292.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2292.java
index 2fd7c3511a..2fd7c3511a 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2292.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2292.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2294.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2294.java
index 37c29ca5e0..37c29ca5e0 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2294.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2294.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2296.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2296.java
index 1503811341..1503811341 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2296.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2296.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2297.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2297.java
index da257b4ae8..da257b4ae8 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2297.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2297.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2303.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2303.java
index 21b33d5bb6..21b33d5bb6 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2303.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2303.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2304.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2304.java
index 1b356c73fb..1b356c73fb 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2304.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2304.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2310.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2310.java
index 6363fddcaf..6363fddcaf 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2310.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2310.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2319.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2319.java
index b8a2ba8db8..b8a2ba8db8 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2319.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2319.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2323.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2323.java
index 503878ecad..503878ecad 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2323.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2323.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2325.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2325.java
index 1245254fa0..1245254fa0 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2325.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2325.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2329.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2329.java
index 57dbeb4033..57dbeb4033 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2329.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2329.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2337.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2337.java
index 9277a01f96..9277a01f96 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2337.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2337.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2339.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2339.java
index 6476807ada..6476807ada 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2339.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2339.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2341.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2341.java
index d7fbccfa4e..d7fbccfa4e 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2341.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2341.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2344.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2344.java
index 26ef216940..26ef216940 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2344.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2344.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2347.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2347.java
index 76e59146db..76e59146db 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2347.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2347.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2364.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2364.java
index 7f7290dd80..7f7290dd80 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2364.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2364.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2365.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2365.java
index 0c8a095ec9..0c8a095ec9 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2365.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2365.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2398.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2398.java
index dee0417eff..dee0417eff 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2398.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2398.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2404.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2404.java
index 478d8b7786..478d8b7786 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2404.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2404.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2405.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2405.java
index 9ab0d851ad..9ab0d851ad 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2405.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2405.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2406.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2406.java
index b7c9f902d2..b7c9f902d2 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2406.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2406.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2407.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2407.java
index e095bb294c..e095bb294c 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2407.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2407.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2411.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2411.java
index 3159be360b..3159be360b 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2411.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2411.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2415.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2415.java
index 5c1d0c2a51..5c1d0c2a51 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2415.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2415.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2420.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2420.java
index e40d73877c..e40d73877c 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2420.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2420.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2425.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2425.java
index 75810137ad..75810137ad 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2425.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2425.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2426.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2426.java
index 90e2ce438d..90e2ce438d 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2426.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2426.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2431.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2431.java
index e1eb2531f2..e1eb2531f2 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2431.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2431.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2432.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2432.java
index 326f27d58a..326f27d58a 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2432.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2432.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2434.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2434.java
index 5d4a884895..5d4a884895 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2434.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2434.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2436.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2436.java
index 0d8c5ad2dd..0d8c5ad2dd 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2436.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2436.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2440.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2440.java
index cd1e8e682e..cd1e8e682e 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2440.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2440.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2526.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2526.java
index 5fc06c27bf..5fc06c27bf 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2526.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2526.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2742.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2742.java
index 11eb01e051..11eb01e051 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2742.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2742.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2901.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2901.java
index 9e28908c22..9e28908c22 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2901.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2901.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2998.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2998.java
index 81ffcf5a01..81ffcf5a01 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2998.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2998.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket3146.java b/tests/testbench/com/vaadin/tests/tickets/Ticket3146.java
index 6afa25efda..6afa25efda 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket3146.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket3146.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket34.java b/tests/testbench/com/vaadin/tests/tickets/Ticket34.java
index 7d3baf78fa..7d3baf78fa 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket34.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket34.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket5053.java b/tests/testbench/com/vaadin/tests/tickets/Ticket5053.java
index bbb9a1ebc2..bbb9a1ebc2 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket5053.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket5053.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket5157.java b/tests/testbench/com/vaadin/tests/tickets/Ticket5157.java
index f620cd27be..f620cd27be 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket5157.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket5157.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket5952.java b/tests/testbench/com/vaadin/tests/tickets/Ticket5952.java
index 4a5d405858..4a5d405858 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket5952.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket5952.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket6002.java b/tests/testbench/com/vaadin/tests/tickets/Ticket6002.java
index 888f1c05ca..888f1c05ca 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket6002.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket6002.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket677.java b/tests/testbench/com/vaadin/tests/tickets/Ticket677.java
index ee7320e59b..ee7320e59b 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket677.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket677.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket695.java b/tests/testbench/com/vaadin/tests/tickets/Ticket695.java
index f122031b6e..f122031b6e 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket695.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket695.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket736.java b/tests/testbench/com/vaadin/tests/tickets/Ticket736.java
index c530b7ca99..c530b7ca99 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket736.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket736.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket846.java b/tests/testbench/com/vaadin/tests/tickets/Ticket846.java
index 23f3134308..23f3134308 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket846.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket846.java
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket932.java b/tests/testbench/com/vaadin/tests/tickets/Ticket932.java
index a9333b5e0f..a9333b5e0f 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket932.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket932.java
diff --git a/tests/src/com/vaadin/tests/util/Log.java b/tests/testbench/com/vaadin/tests/util/Log.java
index bdb40d56d7..bdb40d56d7 100644
--- a/tests/src/com/vaadin/tests/util/Log.java
+++ b/tests/testbench/com/vaadin/tests/util/Log.java
diff --git a/tests/src/com/vaadin/tests/util/LogPrintWriter.java b/tests/testbench/com/vaadin/tests/util/LogPrintWriter.java
index 1f07a9c7ae..1f07a9c7ae 100644
--- a/tests/src/com/vaadin/tests/util/LogPrintWriter.java
+++ b/tests/testbench/com/vaadin/tests/util/LogPrintWriter.java
diff --git a/tests/src/com/vaadin/tests/util/LoremIpsum.java b/tests/testbench/com/vaadin/tests/util/LoremIpsum.java
index 3dc775badf..3dc775badf 100644
--- a/tests/src/com/vaadin/tests/util/LoremIpsum.java
+++ b/tests/testbench/com/vaadin/tests/util/LoremIpsum.java
diff --git a/tests/src/com/vaadin/tests/util/Person.java b/tests/testbench/com/vaadin/tests/util/Person.java
index 822f62d17a..822f62d17a 100644
--- a/tests/src/com/vaadin/tests/util/Person.java
+++ b/tests/testbench/com/vaadin/tests/util/Person.java
diff --git a/tests/src/com/vaadin/tests/util/PersonContainer.java b/tests/testbench/com/vaadin/tests/util/PersonContainer.java
index 8195b4d5f0..8195b4d5f0 100644
--- a/tests/src/com/vaadin/tests/util/PersonContainer.java
+++ b/tests/testbench/com/vaadin/tests/util/PersonContainer.java
diff --git a/tests/src/com/vaadin/tests/util/PortableRandom.java b/tests/testbench/com/vaadin/tests/util/PortableRandom.java
index 2e6d7ce9af..2e6d7ce9af 100644
--- a/tests/src/com/vaadin/tests/util/PortableRandom.java
+++ b/tests/testbench/com/vaadin/tests/util/PortableRandom.java
diff --git a/tests/src/com/vaadin/tests/util/SampleDirectory.java b/tests/testbench/com/vaadin/tests/util/SampleDirectory.java
index ab52e4050c..ab52e4050c 100644
--- a/tests/src/com/vaadin/tests/util/SampleDirectory.java
+++ b/tests/testbench/com/vaadin/tests/util/SampleDirectory.java
diff --git a/tests/src/com/vaadin/tests/util/TestClickListener.java b/tests/testbench/com/vaadin/tests/util/TestClickListener.java
index 95b9cf2d40..95b9cf2d40 100644
--- a/tests/src/com/vaadin/tests/util/TestClickListener.java
+++ b/tests/testbench/com/vaadin/tests/util/TestClickListener.java
diff --git a/tests/src/com/vaadin/tests/util/TestUtils.java b/tests/testbench/com/vaadin/tests/util/TestUtils.java
index aed69055c7..aed69055c7 100644
--- a/tests/src/com/vaadin/tests/util/TestUtils.java
+++ b/tests/testbench/com/vaadin/tests/util/TestUtils.java
diff --git a/tests/src/com/vaadin/tests/vaadin_spin.swf b/tests/testbench/com/vaadin/tests/vaadin_spin.swf
index 9e58ce29c6..9e58ce29c6 100644
--- a/tests/src/com/vaadin/tests/vaadin_spin.swf
+++ b/tests/testbench/com/vaadin/tests/vaadin_spin.swf
diff --git a/tests/src/com/vaadin/tests/validation/EmptyFieldErrorIndicators.html b/tests/testbench/com/vaadin/tests/validation/EmptyFieldErrorIndicators.html
index c8fcb20411..c8fcb20411 100644
--- a/tests/src/com/vaadin/tests/validation/EmptyFieldErrorIndicators.html
+++ b/tests/testbench/com/vaadin/tests/validation/EmptyFieldErrorIndicators.html
diff --git a/tests/src/com/vaadin/tests/validation/EmptyFieldErrorIndicators.java b/tests/testbench/com/vaadin/tests/validation/EmptyFieldErrorIndicators.java
index b1d6a8f068..b1d6a8f068 100644
--- a/tests/src/com/vaadin/tests/validation/EmptyFieldErrorIndicators.java
+++ b/tests/testbench/com/vaadin/tests/validation/EmptyFieldErrorIndicators.java
diff --git a/tests/src/com/vaadin/tests/validation/RequiredErrorMessage.java b/tests/testbench/com/vaadin/tests/validation/RequiredErrorMessage.java
index 7f5048bd80..7f5048bd80 100644
--- a/tests/src/com/vaadin/tests/validation/RequiredErrorMessage.java
+++ b/tests/testbench/com/vaadin/tests/validation/RequiredErrorMessage.java
diff --git a/tests/src/com/vaadin/tests/validation/RequiredIndicatorForReadOnly.java b/tests/testbench/com/vaadin/tests/validation/RequiredIndicatorForReadOnly.java
index 6e806b60f4..6e806b60f4 100644
--- a/tests/src/com/vaadin/tests/validation/RequiredIndicatorForReadOnly.java
+++ b/tests/testbench/com/vaadin/tests/validation/RequiredIndicatorForReadOnly.java
diff --git a/tests/src/com/vaadin/tests/validation/TestValidators.java b/tests/testbench/com/vaadin/tests/validation/TestValidators.java
index 5264d47c9d..5264d47c9d 100644
--- a/tests/src/com/vaadin/tests/validation/TestValidators.java
+++ b/tests/testbench/com/vaadin/tests/validation/TestValidators.java