Support finding components in v7 packages with ComponentLocator

Change-Id: I60eabf3b1c6363be505a2d21f7ed439c5357f61f

226 files changed, 317 insertions, 567 deletions

diff --git a/client/src/main/java/com/vaadin/client/componentlocator/VaadinFinderLocatorStrategy.java b/client/src/main/java/com/vaadin/client/componentlocator/VaadinFinderLocatorStrategy.java
index 3ba6284cf2..3f46a0a812 100644
--- a/client/src/main/java/com/vaadin/client/componentlocator/VaadinFinderLocatorStrategy.java
+++ b/client/src/main/java/com/vaadin/client/componentlocator/VaadinFinderLocatorStrategy.java
@@ -609,12 +609,11 @@ public class VaadinFinderLocatorStrategy implements LocatorStrategy {
 
         List<String> ids = getIDsForConnector(connector);
 
-        Integer[] widgetTags = client.getConfiguration()
-                .getTagsForServerSideClassName(getFullClassName(widgetName));
-        if (widgetTags.length == 0) {
-            widgetTags = client.getConfiguration()
-                    .getTagsForServerSideClassName(
-                            getFullClassName("com.vaadin.ui." + widgetName));
+        List<Integer> widgetTags = new ArrayList<>();
+        widgetTags.addAll(getTags(widgetName));
+
+        if (widgetTags.size() == 0) {
+            widgetTags.addAll(getTags("com.vaadin.ui" + widgetName));
         }
 
         for (int i = 0, l = ids.size(); i < l; ++i) {
@@ -627,7 +626,7 @@ public class VaadinFinderLocatorStrategy implements LocatorStrategy {
             final String simpleName = getSimpleClassName(name);
             final String fullName = getFullClassName(name);
 
-            if (widgetTags.length > 0) {
+            if (widgetTags.size() > 0) {
                 Integer[] foundTags = client.getConfiguration()
                         .getTagsForServerSideClassName(fullName);
                 for (int tag : foundTags) {
@@ -656,6 +655,28 @@ public class VaadinFinderLocatorStrategy implements LocatorStrategy {
     }
 
     /**
+     * Gets the tags for server side class name. Also includes tags for older
+     * components in v7 package.
+     *
+     * @param widgetName
+     *            the server side class name for widget
+     * @return list of tags
+     */
+    private List<Integer> getTags(String widgetName) {
+        List<Integer> widgetTags = new ArrayList<>();
+        Arrays.stream(client.getConfiguration()
+                .getTagsForServerSideClassName(getFullClassName(widgetName)))
+                .forEach(widgetTags::add);
+        if (widgetName.startsWith("com.vaadin.ui")) {
+            Arrays.stream(client.getConfiguration()
+                    .getTagsForServerSideClassName(getFullClassName(widgetName
+                            .replace("com.vaadin.ui", "com.vaadin.v7.ui"))))
+                    .forEach(widgetTags::add);
+        }
+        return widgetTags;
+    }
+
+    /**
      * Extracts the name of the widget class from a path fragment
      *
      * @param pathFragment
@@ -738,9 +759,9 @@ public class VaadinFinderLocatorStrategy implements LocatorStrategy {
         return list;
     }
 
-    private boolean tagsMatch(Integer[] targets, Integer tag) {
-        for (int i = 0; i < targets.length; ++i) {
-            if (targets[i].equals(tag)) {
+    private boolean tagsMatch(List<Integer> targets, Integer tag) {
+        for (int i = 0; i < targets.size(); ++i) {
+            if (targets.get(i).equals(tag)) {
                 return true;
             }
         }
diff --git a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/CalendarElement.java b/uitest-common/src/main/java/com/vaadin/testbench/customelements/CalendarElement.java
index c43ebd80ba..3ba2cbbf6a 100644
--- a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/CalendarElement.java
+++ b/uitest-common/src/main/java/com/vaadin/testbench/customelements/CalendarElement.java
@@ -1,4 +1,4 @@
-package com.vaadin.v7.testbench.customelements;
+package com.vaadin.testbench.customelements;
 
 import java.util.List;
 
@@ -7,7 +7,7 @@ import org.openqa.selenium.WebElement;
 import com.vaadin.testbench.By;
 import com.vaadin.testbench.elementsbase.ServerClass;
 
-@ServerClass("com.vaadin.v7.ui.Calendar")
+@ServerClass("com.vaadin.ui.Calendar")
 public class CalendarElement
         extends com.vaadin.testbench.elements.CalendarElement {
     public List<WebElement> getWeekNumbers() {
diff --git a/uitest-common/src/main/java/com/vaadin/testbench/customelements/NativeSelectElement.java b/uitest-common/src/main/java/com/vaadin/testbench/customelements/NativeSelectElement.java
index e5d572eaa9..289162ee27 100644
--- a/uitest-common/src/main/java/com/vaadin/testbench/customelements/NativeSelectElement.java
+++ b/uitest-common/src/main/java/com/vaadin/testbench/customelements/NativeSelectElement.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2016 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -19,6 +19,7 @@ import java.util.List;
 
 import org.openqa.selenium.support.ui.Select;
 
+import com.vaadin.testbench.By;
 import com.vaadin.testbench.TestBenchElement;
 import com.vaadin.testbench.elements.AbstractSelectElement;
 import com.vaadin.testbench.elementsbase.ServerClass;
@@ -30,7 +31,12 @@ public class NativeSelectElement extends AbstractSelectElement {
     @Override
     protected void init() {
         super.init();
-        selectElement = new Select(this);
+        // FIXME: Newer NativeSelect has different DOM structure.
+        if (getTagName().equals("select")) {
+            selectElement = new Select(this);
+        } else {
+            selectElement = new Select(findElement(By.tagName("select")));
+        }
     }
 
     public List<TestBenchElement> getOptions() {
diff --git a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/TableElement.java b/uitest-common/src/main/java/com/vaadin/testbench/customelements/TableElement.java
index 3737fa0e04..b84b67a896 100644
--- a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/TableElement.java
+++ b/uitest-common/src/main/java/com/vaadin/testbench/customelements/TableElement.java
@@ -1,4 +1,4 @@
-package com.vaadin.v7.testbench.customelements;
+package com.vaadin.testbench.customelements;
 
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
@@ -6,7 +6,7 @@ import org.openqa.selenium.WebElement;
 import com.vaadin.testbench.elementsbase.AbstractElement;
 import com.vaadin.testbench.elementsbase.ServerClass;
 
-@ServerClass("com.vaadin.v7.ui.Table")
+@ServerClass("com.vaadin.ui.Table")
 public class TableElement extends com.vaadin.testbench.elements.TableElement {
     public CollapseMenu openCollapseMenu() {
         getCollapseMenuToggle().click();
diff --git a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/CheckBoxElement.java b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/CheckBoxElement.java
deleted file mode 100644
index 9ab5ceae89..0000000000
--- a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/CheckBoxElement.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.vaadin.v7.testbench.customelements;
-
-import com.vaadin.testbench.elementsbase.ServerClass;
-
-@ServerClass("com.vaadin.v7.ui.CheckBox")
-public class CheckBoxElement
-        extends com.vaadin.testbench.elements.CheckBoxElement {
-
-}
diff --git a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/ColorPickerAreaElement.java b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/ColorPickerAreaElement.java
deleted file mode 100644
index 151dee9915..0000000000
--- a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/ColorPickerAreaElement.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.vaadin.v7.testbench.customelements;
-
-import com.vaadin.testbench.elementsbase.ServerClass;
-
-@ServerClass("com.vaadin.v7.ui.ColorPickerArea")
-public class ColorPickerAreaElement
-        extends com.vaadin.testbench.elements.ColorPickerAreaElement {
-
-}
diff --git a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/ColorPickerElement.java b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/ColorPickerElement.java
deleted file mode 100644
index 749a54f967..0000000000
--- a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/ColorPickerElement.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.vaadin.v7.testbench.customelements;
-
-import com.vaadin.testbench.elementsbase.ServerClass;
-
-@ServerClass("com.vaadin.v7.ui.ColorPicker")
-public class ColorPickerElement
-        extends com.vaadin.testbench.elements.ColorPickerElement {
-
-}
diff --git a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/ComboBoxElement.java b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/ComboBoxElement.java
deleted file mode 100644
index d5208e6338..0000000000
--- a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/ComboBoxElement.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.vaadin.v7.testbench.customelements;
-
-import org.junit.Assert;
-import org.openqa.selenium.WebElement;
-
-import com.vaadin.testbench.By;
-import com.vaadin.testbench.elementsbase.ServerClass;
-
-@ServerClass("com.vaadin.v7.ui.ComboBox")
-public class ComboBoxElement
-        extends com.vaadin.testbench.elements.ComboBoxElement {
-
-    private static org.openqa.selenium.By bySuggestionPopup = By
-            .vaadin("#popup");
-
-    public WebElement getInputField() {
-        return findElement(By.vaadin("#textbox"));
-    }
-
-    @Override
-    public String getText() {
-        return getInputField().getAttribute("value");
-    }
-
-    @Override
-    public void clear() {
-        getInputField().clear();
-    }
-
-    public WebElement getSuggestionPopup() {
-        return findElement(bySuggestionPopup);
-    }
-
-    @Override
-    public void sendKeys(CharSequence... keysToSend) {
-        sendKeys(50, keysToSend);
-    }
-
-    /**
-     * Use this method to simulate typing into an element, which may set its
-     * value.
-     *
-     * @param delay
-     *            delay after sending each individual key (mainly needed for
-     *            PhantomJS)
-     * @param keysToSend
-     *            keys to type into the element
-     */
-    public void sendKeys(int delay, CharSequence... keysToSend) {
-        WebElement input = getInputField();
-
-        for (CharSequence key : keysToSend) {
-            input.sendKeys(key);
-            try {
-                Thread.sleep(delay);
-            } catch (InterruptedException e) {
-                Assert.fail(e.getMessage());
-            }
-        }
-    }
-}
diff --git a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/DateFieldElement.java b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/DateFieldElement.java
deleted file mode 100644
index c69c2ad22c..0000000000
--- a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/DateFieldElement.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2000-2016 Vaadin Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.vaadin.v7.testbench.customelements;
-
-import com.vaadin.testbench.elementsbase.ServerClass;
-
-@ServerClass("com.vaadin.v7.ui.DateField")
-public class DateFieldElement
-        extends com.vaadin.testbench.elements.DateFieldElement {
-
-}
diff --git a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/GridElement.java b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/GridElement.java
deleted file mode 100644
index b3c24c5c3a..0000000000
--- a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/GridElement.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * Copyright (C) 2012 Vaadin Ltd
- *
- * This program is available under Commercial Vaadin Add-On License 3.0
- * (CVALv3).
- *
- * See the file licensing.txt distributed with this software for more
- * information about licensing.
- *
- * You should have received a copy of the license along with this program.
- * If not, see <http://vaadin.com/license/cval-3>.
- */
-package com.vaadin.v7.testbench.customelements;
-
-import org.openqa.selenium.NoSuchElementException;
-
-import com.vaadin.testbench.By;
-import com.vaadin.testbench.TestBenchElement;
-import com.vaadin.testbench.elementsbase.ServerClass;
-
-/**
- * TestBench Element API for Grid
- *
- * @since 8.0
- * @author Vaadin Ltd
- */
-@ServerClass("com.vaadin.v7.ui.Grid")
-public class GridElement extends com.vaadin.testbench.elements.GridElement {
-
-    /**
-     * Gets the element that contains the details of a row.
-     *
-     * @since 8.0
-     * @param rowIndex
-     *            the index of the row for the details
-     * @return the element that contains the details of a row. <code>null</code>
-     *         if no widget is defined for the detials row
-     * @throws NoSuchElementException
-     *             if the given details row is currently not open
-     */
-    public TestBenchElement getDetails(int rowIndex)
-            throws NoSuchElementException {
-        return getSubPart("#details[" + rowIndex + "]");
-    }
-
-    private TestBenchElement getSubPart(String subPartSelector) {
-        return (TestBenchElement) findElement(By.vaadin(subPartSelector));
-    }
-
-}
diff --git a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/InlineDateFieldElement.java b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/InlineDateFieldElement.java
deleted file mode 100644
index 22618d73d5..0000000000
--- a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/InlineDateFieldElement.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright 2000-2016 Vaadin Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.vaadin.v7.testbench.customelements;
-
-import com.vaadin.testbench.elementsbase.ServerClass;
-
-/**
- * @author Vaadin Ltd
- *
- */
-@ServerClass("com.vaadin.v7.ui.InlineDateField")
-public class InlineDateFieldElement
-        extends com.vaadin.testbench.elements.InlineDateFieldElement {
-
-}
diff --git a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/ListSelectElement.java b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/ListSelectElement.java
deleted file mode 100644
index ac59fd62e4..0000000000
--- a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/ListSelectElement.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.vaadin.v7.testbench.customelements;
-
-import com.vaadin.testbench.elementsbase.ServerClass;
-
-@ServerClass("com.vaadin.v7.ui.ListSelect")
-public class ListSelectElement
-        extends com.vaadin.testbench.elements.ListSelectElement {
-
-}
diff --git a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/NativeSelectElement.java b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/NativeSelectElement.java
deleted file mode 100644
index ffb116a6fb..0000000000
--- a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/NativeSelectElement.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.vaadin.v7.testbench.customelements;
-
-import com.vaadin.testbench.elementsbase.ServerClass;
-
-@ServerClass("com.vaadin.v7.ui.NativeSelect")
-public class NativeSelectElement
-        extends com.vaadin.testbench.elements.NativeSelectElement {
-
-}
diff --git a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/OptionGroupElement.java b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/OptionGroupElement.java
deleted file mode 100644
index fed5533f18..0000000000
--- a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/OptionGroupElement.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.vaadin.v7.testbench.customelements;
-
-import com.vaadin.testbench.elementsbase.ServerClass;
-
-@ServerClass("com.vaadin.v7.ui.OptionGroup")
-public class OptionGroupElement
-        extends com.vaadin.testbench.elements.OptionGroupElement {
-
-}
diff --git a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/PasswordFieldElement.java b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/PasswordFieldElement.java
deleted file mode 100644
index dccf14351f..0000000000
--- a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/PasswordFieldElement.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.vaadin.v7.testbench.customelements;
-
-import com.vaadin.testbench.elementsbase.ServerClass;
-
-@ServerClass("com.vaadin.v7.ui.PasswordField")
-public class PasswordFieldElement
-        extends com.vaadin.testbench.elements.PasswordFieldElement {
-
-}
diff --git a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/PopupDateFieldElement.java b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/PopupDateFieldElement.java
deleted file mode 100644
index 777e55ae0a..0000000000
--- a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/PopupDateFieldElement.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright 2000-2016 Vaadin Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.vaadin.v7.testbench.customelements;
-
-import com.vaadin.testbench.elementsbase.ServerClass;
-
-/**
- * @author Vaadin Ltd
- *
- */
-@ServerClass("com.vaadin.v7.ui.PopupDateField")
-public class PopupDateFieldElement
-        extends com.vaadin.testbench.elements.PopupDateFieldElement {
-
-}
diff --git a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/RichTextAreaElement.java b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/RichTextAreaElement.java
deleted file mode 100644
index f83d83393a..0000000000
--- a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/RichTextAreaElement.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.vaadin.v7.testbench.customelements;
-
-import com.vaadin.testbench.elementsbase.ServerClass;
-
-@ServerClass("com.vaadin.v7.ui.RichTextArea")
-public class RichTextAreaElement
-        extends com.vaadin.testbench.elements.RichTextAreaElement {
-
-}
diff --git a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/SelectElement.java b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/SelectElement.java
deleted file mode 100644
index 607bfebeae..0000000000
--- a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/SelectElement.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.vaadin.v7.testbench.customelements;
-
-import com.vaadin.testbench.elementsbase.ServerClass;
-
-@ServerClass("com.vaadin.v7.ui.Select")
-public class SelectElement extends com.vaadin.testbench.elements.SelectElement {
-
-}
diff --git a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/TextAreaElement.java b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/TextAreaElement.java
deleted file mode 100644
index f4099985ad..0000000000
--- a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/TextAreaElement.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.vaadin.v7.testbench.customelements;
-
-import com.vaadin.testbench.elementsbase.ServerClass;
-
-@ServerClass("com.vaadin.v7.ui.TextArea")
-public class TextAreaElement
-        extends com.vaadin.testbench.elements.TextAreaElement {
-
-}
diff --git a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/TextFieldElement.java b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/TextFieldElement.java
deleted file mode 100644
index 3329eed510..0000000000
--- a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/TextFieldElement.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.vaadin.v7.testbench.customelements;
-
-import com.vaadin.testbench.elementsbase.ServerClass;
-
-@ServerClass("com.vaadin.v7.ui.TextField")
-public class TextFieldElement
-        extends com.vaadin.testbench.elements.TextFieldElement {
-
-}
diff --git a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/TreeElement.java b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/TreeElement.java
deleted file mode 100644
index ab9811d7e0..0000000000
--- a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/TreeElement.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.vaadin.v7.testbench.customelements;
-
-import com.vaadin.testbench.elementsbase.ServerClass;
-
-@ServerClass("com.vaadin.v7.ui.Tree")
-public class TreeElement extends com.vaadin.testbench.elements.TreeElement {
-
-}
diff --git a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/TreeTableElement.java b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/TreeTableElement.java
deleted file mode 100644
index f236fc863a..0000000000
--- a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/TreeTableElement.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.vaadin.v7.testbench.customelements;
-
-import com.vaadin.testbench.elementsbase.ServerClass;
-
-@ServerClass("com.vaadin.v7.ui.TreeTable")
-public class TreeTableElement
-        extends com.vaadin.testbench.elements.TreeTableElement {
-
-}
diff --git a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/TwinColSelectElement.java b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/TwinColSelectElement.java
deleted file mode 100644
index 663ebc0456..0000000000
--- a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/TwinColSelectElement.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.vaadin.v7.testbench.customelements;
-
-import com.vaadin.testbench.elementsbase.ServerClass;
-
-@ServerClass("com.vaadin.v7.ui.TwinColSelect")
-public class TwinColSelectElement
-        extends com.vaadin.testbench.elements.TwinColSelectElement {
-
-}
diff --git a/uitest/src/main/java/com/vaadin/tests/componentlocator/ComponentLocatorOldClasses.java b/uitest/src/main/java/com/vaadin/tests/componentlocator/ComponentLocatorOldClasses.java
new file mode 100644
index 0000000000..fc1471dd14
--- /dev/null
+++ b/uitest/src/main/java/com/vaadin/tests/componentlocator/ComponentLocatorOldClasses.java
@@ -0,0 +1,22 @@
+package com.vaadin.tests.componentlocator;
+
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUI;
+
+public class ComponentLocatorOldClasses extends AbstractTestUI {
+
+    @Override
+    protected void setup(VaadinRequest request) {
+        com.vaadin.ui.TextField newTF = new com.vaadin.ui.TextField();
+        newTF.setId("new");
+        addComponent(newTF);
+        com.vaadin.v7.ui.TextField oldTF = new com.vaadin.v7.ui.TextField();
+        oldTF.setId("old");
+        addComponent(oldTF);
+    }
+
+    @Override
+    protected String getTestDescription() {
+        return "Component locator should find both text fields";
+    }
+}
diff --git a/uitest/src/test/java/com/vaadin/tests/applicationservlet/SystemMessagesTest.java b/uitest/src/test/java/com/vaadin/tests/applicationservlet/SystemMessagesTest.java
index 6710e96b47..dd5248ce76 100644
--- a/uitest/src/test/java/com/vaadin/tests/applicationservlet/SystemMessagesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/applicationservlet/SystemMessagesTest.java
@@ -4,9 +4,9 @@ import org.junit.Assert;
 import org.junit.Test;
 
 import com.vaadin.testbench.elements.ButtonElement;
+import com.vaadin.testbench.elements.NativeSelectElement;
 import com.vaadin.testbench.elements.NotificationElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.NativeSelectElement;
 
 public class SystemMessagesTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/componentlocator/ComponentLocatorOldClassesTest.java b/uitest/src/test/java/com/vaadin/tests/componentlocator/ComponentLocatorOldClassesTest.java
new file mode 100644
index 0000000000..eb465f2c51
--- /dev/null
+++ b/uitest/src/test/java/com/vaadin/tests/componentlocator/ComponentLocatorOldClassesTest.java
@@ -0,0 +1,19 @@
+package com.vaadin.tests.componentlocator;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.vaadin.testbench.elements.TextFieldElement;
+import com.vaadin.tests.tb3.SingleBrowserTest;
+
+public class ComponentLocatorOldClassesTest extends SingleBrowserTest {
+
+    @Test
+    public void testTestBenchFindsBothTextFields() {
+        openTestURL();
+        Assert.assertEquals(
+                "ComponentLocator did not find elements as expected.", 2,
+                $(TextFieldElement.class).all().size());
+    }
+
+}
diff --git a/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarDisabledTest.java b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarDisabledTest.java
index 2b5524831f..dc1be07676 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarDisabledTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarDisabledTest.java
@@ -4,8 +4,8 @@ import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
+import com.vaadin.testbench.customelements.CalendarElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.CalendarElement;
 
 public class CalendarDisabledTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarHtmlInEventsTest.java b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarHtmlInEventsTest.java
index a05b7102e3..b51a75c027 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarHtmlInEventsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarHtmlInEventsTest.java
@@ -20,10 +20,10 @@ import org.junit.Test;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 
+import com.vaadin.testbench.customelements.CalendarElement;
 import com.vaadin.testbench.elements.CheckBoxElement;
+import com.vaadin.testbench.elements.NativeSelectElement;
 import com.vaadin.tests.tb3.SingleBrowserTest;
-import com.vaadin.v7.testbench.customelements.CalendarElement;
-import com.vaadin.v7.testbench.customelements.NativeSelectElement;
 
 public class CalendarHtmlInEventsTest extends SingleBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarReadOnlyTest.java b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarReadOnlyTest.java
index 90367ffa5d..da8dec927b 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarReadOnlyTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarReadOnlyTest.java
@@ -11,8 +11,8 @@ import org.junit.Test;
 import org.openqa.selenium.WebElement;
 
 import com.vaadin.testbench.By;
+import com.vaadin.testbench.customelements.CalendarElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.CalendarElement;
 
 public class CalendarReadOnlyTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/colorpicker/DefaultCaptionWidthTest.java b/uitest/src/test/java/com/vaadin/tests/components/colorpicker/DefaultCaptionWidthTest.java
index a2abbc930f..1cce6b1827 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/colorpicker/DefaultCaptionWidthTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/colorpicker/DefaultCaptionWidthTest.java
@@ -20,8 +20,8 @@ import org.junit.Before;
 import org.junit.Test;
 import org.openqa.selenium.By;
 
+import com.vaadin.testbench.elements.ColorPickerElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.ColorPickerElement;
 
 /**
  * Test for default caption behavior in color picker.
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxClosePopupRetainTextTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxClosePopupRetainTextTest.java
index 44c0d44e48..27ef1e247c 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxClosePopupRetainTextTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxClosePopupRetainTextTest.java
@@ -21,8 +21,8 @@ import org.junit.Test;
 import org.openqa.selenium.WebElement;
 
 import com.vaadin.testbench.By;
+import com.vaadin.testbench.customelements.ComboBoxElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.ComboBoxElement;
 
 public class ComboBoxClosePopupRetainTextTest extends MultiBrowserTest {
     @Override
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcutTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcutTest.java
index d895046a75..0b582d48c4 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcutTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcutTest.java
@@ -19,8 +19,8 @@ import org.junit.Assert;
 import org.junit.Test;
 import org.openqa.selenium.Keys;
 
+import com.vaadin.testbench.customelements.ComboBoxElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.ComboBoxElement;
 
 public class ComboBoxCombinedWithEnterShortcutTest extends MultiBrowserTest {
     @Test
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemAddingWithFocusListenerTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemAddingWithFocusListenerTest.java
index 13f4414115..ed2765ff3a 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemAddingWithFocusListenerTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemAddingWithFocusListenerTest.java
@@ -21,9 +21,9 @@ import org.junit.Test;
 
 import com.vaadin.testbench.By;
 import com.vaadin.testbench.TestBenchElement;
+import com.vaadin.testbench.customelements.ComboBoxElement;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.ComboBoxElement;
 
 public class ComboBoxItemAddingWithFocusListenerTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemStyleGeneratorTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemStyleGeneratorTest.java
index 22335c953a..8e498d091c 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemStyleGeneratorTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemStyleGeneratorTest.java
@@ -22,8 +22,8 @@ import org.junit.Test;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 
+import com.vaadin.testbench.customelements.ComboBoxElement;
 import com.vaadin.tests.tb3.SingleBrowserTest;
-import com.vaadin.v7.testbench.customelements.ComboBoxElement;
 
 public class ComboBoxItemStyleGeneratorTest extends SingleBrowserTest {
     @Test
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxLargeIconsTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxLargeIconsTest.java
index 88f4e74a2e..a6f4fb72fd 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxLargeIconsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxLargeIconsTest.java
@@ -6,8 +6,8 @@ import org.openqa.selenium.interactions.Actions;
 
 import com.vaadin.testbench.By;
 import com.vaadin.testbench.customelements.ComboBoxElement;
+import com.vaadin.testbench.elements.NativeSelectElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.NativeSelectElement;
 
 public class ComboBoxLargeIconsTest extends MultiBrowserTest {
     @Override
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxOnSmallScreenTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxOnSmallScreenTest.java
index 00787cca8e..9cba77ed72 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxOnSmallScreenTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxOnSmallScreenTest.java
@@ -24,9 +24,9 @@ import org.openqa.selenium.Dimension;
 import org.openqa.selenium.WebDriver.Window;
 import org.openqa.selenium.WebElement;
 
+import com.vaadin.testbench.customelements.ComboBoxElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
 import com.vaadin.v7.client.ui.VFilterSelect;
-import com.vaadin.v7.testbench.customelements.ComboBoxElement;
 
 /**
  * ComboBox suggestion popup should not obscure the text input box.
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxResetValueTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxResetValueTest.java
index 955c498996..9dba2ee435 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxResetValueTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxResetValueTest.java
@@ -21,9 +21,9 @@ import static org.junit.Assert.assertThat;
 import org.junit.Test;
 import org.openqa.selenium.Keys;
 
+import com.vaadin.testbench.customelements.ComboBoxElement;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.ComboBoxElement;
 
 public class ComboBoxResetValueTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSetNullWhenNewItemsAllowedTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSetNullWhenNewItemsAllowedTest.java
index 7de663f1e4..d650ef8146 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSetNullWhenNewItemsAllowedTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSetNullWhenNewItemsAllowedTest.java
@@ -24,9 +24,9 @@ import org.openqa.selenium.interactions.Actions;
 
 import com.vaadin.testbench.By;
 import com.vaadin.testbench.commands.TestBenchElementCommands;
+import com.vaadin.testbench.customelements.ComboBoxElement;
 import com.vaadin.testbench.parallel.BrowserUtil;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.ComboBoxElement;
 
 /**
  * ComboBox should clear its value when setting to null with new items.
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxValueInputTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxValueInputTest.java
index 0d1c9284eb..e16c321d8a 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxValueInputTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxValueInputTest.java
@@ -25,9 +25,9 @@ import org.junit.Test;
 import org.openqa.selenium.WebElement;
 
 import com.vaadin.testbench.By;
+import com.vaadin.testbench.customelements.ComboBoxElement;
 import com.vaadin.testbench.elements.VerticalLayoutElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.ComboBoxElement;
 
 /**
  * Tests ComboBox inputs and selections.
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/FilteringTurkishLocaleTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/FilteringTurkishLocaleTest.java
index b4ff27338d..7ddcbf7173 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/FilteringTurkishLocaleTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/FilteringTurkishLocaleTest.java
@@ -22,8 +22,8 @@ import org.junit.Test;
 
 import com.vaadin.testbench.By;
 import com.vaadin.testbench.customelements.ComboBoxElement;
+import com.vaadin.testbench.customelements.NativeSelectElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.NativeSelectElement;
 
 public class FilteringTurkishLocaleTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/LegacyDateFieldIsValidTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/LegacyDateFieldIsValidTest.java
index 1c34d57c6a..19f77ea5da 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/datefield/LegacyDateFieldIsValidTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/LegacyDateFieldIsValidTest.java
@@ -21,9 +21,9 @@ import org.openqa.selenium.Keys;
 import org.openqa.selenium.WebElement;
 
 import com.vaadin.testbench.By;
+import com.vaadin.testbench.customelements.DateFieldElement;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.DateFieldElement;
 
 /**
  * @author Vaadin Ltd
diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateFieldValueChangeEventsTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateFieldValueChangeEventsTest.java
index 3431a0e374..c29b6de36d 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateFieldValueChangeEventsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateFieldValueChangeEventsTest.java
@@ -25,8 +25,8 @@ import org.openqa.selenium.support.ui.Select;
 import com.vaadin.testbench.By;
 import com.vaadin.testbench.elements.DateFieldElement;
 import com.vaadin.testbench.elements.LabelElement;
+import com.vaadin.testbench.elements.NativeSelectElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.NativeSelectElement;
 
 public class PopupDateFieldValueChangeEventsTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/formlayout/FormLayoutResizingTest.java b/uitest/src/test/java/com/vaadin/tests/components/formlayout/FormLayoutResizingTest.java
index 7f9614fd9f..3b9d69601d 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/formlayout/FormLayoutResizingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/formlayout/FormLayoutResizingTest.java
@@ -22,11 +22,11 @@ import org.junit.Test;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.elements.FormLayoutElement;
 import com.vaadin.testbench.parallel.BrowserUtil;
 import com.vaadin.tests.tb3.MultiBrowserThemeTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class FormLayoutResizingTest extends MultiBrowserThemeTest {
     @Test
diff --git a/uitest/src/test/java/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrollingTest.java b/uitest/src/test/java/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrollingTest.java
index bc6b42b511..3897c8a14a 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrollingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrollingTest.java
@@ -7,8 +7,8 @@ import org.junit.Test;
 import org.openqa.selenium.Keys;
 import org.openqa.selenium.interactions.Actions;
 
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class TableInFormLayoutCausesScrollingTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectAddRemoveItemsTest.java b/uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectAddRemoveItemsTest.java
index bd279a4367..ed1cbbea71 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectAddRemoveItemsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectAddRemoveItemsTest.java
@@ -21,8 +21,8 @@ import org.junit.Assert;
 import org.junit.Test;
 
 import com.vaadin.testbench.elements.ButtonElement;
+import com.vaadin.testbench.elements.ListSelectElement;
 import com.vaadin.tests.tb3.SingleBrowserTest;
-import com.vaadin.v7.testbench.customelements.ListSelectElement;
 
 public class ListSelectAddRemoveItemsTest extends SingleBrowserTest {
     @Test
diff --git a/uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectNoDomRebuildTest.java b/uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectNoDomRebuildTest.java
index 28cc52133c..e63f10f987 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectNoDomRebuildTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectNoDomRebuildTest.java
@@ -24,8 +24,8 @@ import org.openqa.selenium.Keys;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;
 
+import com.vaadin.testbench.elements.ListSelectElement;
 import com.vaadin.tests.tb3.SingleBrowserTest;
-import com.vaadin.v7.testbench.customelements.ListSelectElement;
 
 public class ListSelectNoDomRebuildTest extends SingleBrowserTest {
     @Override
diff --git a/uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectPushSelectionChangesTest.java b/uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectPushSelectionChangesTest.java
index 3679794c0c..44cc4b86b8 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectPushSelectionChangesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectPushSelectionChangesTest.java
@@ -24,9 +24,9 @@ import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.ui.Select;
 
 import com.vaadin.testbench.elements.ButtonElement;
+import com.vaadin.testbench.elements.ListSelectElement;
+import com.vaadin.testbench.elements.OptionGroupElement;
 import com.vaadin.tests.tb3.SingleBrowserTestPhantomJS2;
-import com.vaadin.v7.testbench.customelements.ListSelectElement;
-import com.vaadin.v7.testbench.customelements.OptionGroupElement;
 
 public class ListSelectPushSelectionChangesTest
         extends SingleBrowserTestPhantomJS2 {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/notification/NotificationsWaiAriaTest.java b/uitest/src/test/java/com/vaadin/tests/components/notification/NotificationsWaiAriaTest.java
index e9c3bc799c..7e7a267d63 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/notification/NotificationsWaiAriaTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/notification/NotificationsWaiAriaTest.java
@@ -22,11 +22,11 @@ import org.openqa.selenium.WebElement;
 import com.vaadin.shared.ui.ui.NotificationRole;
 import com.vaadin.testbench.By;
 import com.vaadin.testbench.elements.ButtonElement;
+import com.vaadin.testbench.elements.NativeSelectElement;
 import com.vaadin.testbench.elements.NotificationElement;
 import com.vaadin.testbench.elements.TextFieldElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
 import com.vaadin.v7.data.util.converter.StringToEnumConverter;
-import com.vaadin.v7.testbench.customelements.NativeSelectElement;
 
 /**
  * Unit test class for Notification ARIA (Accessible Rich Internet Applications)
diff --git a/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/ErrorIndicatorTest.java b/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/ErrorIndicatorTest.java
index 89a0412336..bdf0e55f04 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/ErrorIndicatorTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/ErrorIndicatorTest.java
@@ -25,8 +25,8 @@ import org.openqa.selenium.interactions.Mouse;
 import org.openqa.selenium.interactions.internal.Coordinates;
 import org.openqa.selenium.internal.Locatable;
 
+import com.vaadin.testbench.elements.TextFieldElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TextFieldElement;
 
 public class ErrorIndicatorTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/select/EnumSelectTest.java b/uitest/src/test/java/com/vaadin/tests/components/select/EnumSelectTest.java
index b7a88f85fb..be72a67f5f 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/select/EnumSelectTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/select/EnumSelectTest.java
@@ -23,8 +23,8 @@ import org.junit.Test;
 import com.vaadin.testbench.By;
 import com.vaadin.testbench.TestBenchElement;
 import com.vaadin.testbench.customelements.ComboBoxElement;
+import com.vaadin.testbench.customelements.NativeSelectElement;
 import com.vaadin.tests.tb3.SingleBrowserTest;
-import com.vaadin.v7.testbench.customelements.NativeSelectElement;
 
 public class EnumSelectTest extends SingleBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/select/SelectWithIntegersTest.java b/uitest/src/test/java/com/vaadin/tests/components/select/SelectWithIntegersTest.java
index 998f166b7f..b2b9a3e153 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/select/SelectWithIntegersTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/select/SelectWithIntegersTest.java
@@ -18,8 +18,8 @@ package com.vaadin.tests.components.select;
 import org.junit.Assert;
 import org.junit.Test;
 
+import com.vaadin.testbench.elements.ListSelectElement;
 import com.vaadin.tests.tb3.SingleBrowserTest;
-import com.vaadin.v7.testbench.customelements.ListSelectElement;
 
 public class SelectWithIntegersTest extends SingleBrowserTest {
     @Test
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/AsyncPushUpdatesTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/AsyncPushUpdatesTest.java
index 1b128de75e..56da15f6e6 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/AsyncPushUpdatesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/AsyncPushUpdatesTest.java
@@ -20,9 +20,9 @@ import org.junit.Test;
 import org.openqa.selenium.NoSuchElementException;
 import org.openqa.selenium.WebElement;
 
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Test to see if VScrollTable handles Push updates correctly.
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansionTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansionTest.java
index 3813db636c..5b120e52b5 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansionTest.java
@@ -23,10 +23,10 @@ import org.openqa.selenium.JavascriptExecutor;
 import org.openqa.selenium.WebElement;
 
 import com.vaadin.testbench.TestBenchElement;
+import com.vaadin.testbench.customelements.TableElement;
+import com.vaadin.testbench.customelements.TableElement.ContextMenuElement;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
-import com.vaadin.v7.testbench.customelements.TableElement.ContextMenuElement;
 
 public class ColumnCollapsingAndColumnExpansionTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/ColumnReorderingWithManyColumnsTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/ColumnReorderingWithManyColumnsTest.java
index 4700d43d3a..9fdf5413cf 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/ColumnReorderingWithManyColumnsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/ColumnReorderingWithManyColumnsTest.java
@@ -9,9 +9,9 @@ import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;
 
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.TableHeaderElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class ColumnReorderingWithManyColumnsTest extends MultiBrowserTest {
     @Test
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/ContainerSizeChangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/ContainerSizeChangeTest.java
index b2906feb7a..accb428992 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/ContainerSizeChangeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/ContainerSizeChangeTest.java
@@ -10,9 +10,9 @@ import org.junit.Test;
 import org.openqa.selenium.NoSuchElementException;
 
 import com.vaadin.testbench.By;
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class ContainerSizeChangeTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/DisabledSortingTableTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/DisabledSortingTableTest.java
index ef1ea807d5..b35dbf7a6e 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/DisabledSortingTableTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/DisabledSortingTableTest.java
@@ -8,9 +8,9 @@ import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.support.ui.ExpectedCondition;
 
 import com.vaadin.testbench.TestBenchElement;
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class DisabledSortingTableTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/EditableModeChangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/EditableModeChangeTest.java
index 9b37f36106..1a8152f61a 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/EditableModeChangeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/EditableModeChangeTest.java
@@ -26,8 +26,8 @@ import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;
 
 import com.vaadin.testbench.TestBenchElement;
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Tests that editing and selecting work correctly.
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/FocusOnSelectedItemTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/FocusOnSelectedItemTest.java
index 1f61c0be7d..a0fd3e7a21 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/FocusOnSelectedItemTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/FocusOnSelectedItemTest.java
@@ -20,9 +20,9 @@ import org.junit.Test;
 import org.openqa.selenium.WebElement;
 
 import com.vaadin.testbench.By;
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Test to see if the correct row gets the focus when the row is selected from
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/FooterClickTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/FooterClickTest.java
index 6a3309bf17..f3ff1623f8 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/FooterClickTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/FooterClickTest.java
@@ -24,10 +24,10 @@ import java.util.Arrays;
 import org.junit.Test;
 
 import com.vaadin.testbench.TestBenchElement;
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.CheckBoxElement;
 import com.vaadin.testbench.elements.TextFieldElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Tests Table Footer ClickListener
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/FooterTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/FooterTest.java
index 9768aa239b..13b5a49509 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/FooterTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/FooterTest.java
@@ -25,11 +25,11 @@ import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.support.ui.ExpectedCondition;
 
 import com.vaadin.testbench.TestBenchElement;
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.elements.CheckBoxElement;
 import com.vaadin.testbench.elements.TextFieldElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Tests Table Footer
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/HeaderClickTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderClickTest.java
index 46f0d8c135..4071b6a5df 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/HeaderClickTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderClickTest.java
@@ -22,10 +22,10 @@ import java.io.IOException;
 import org.junit.Test;
 
 import com.vaadin.testbench.TestBenchElement;
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.CheckBoxElement;
 import com.vaadin.testbench.elements.TextFieldElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Tests Table Footer ClickListener
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddleTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddleTest.java
index f12d68f226..7a04c72c08 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddleTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddleTest.java
@@ -23,8 +23,8 @@ import java.util.Arrays;
 import org.junit.Test;
 import org.openqa.selenium.By;
 
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Tests Table Footer ClickListener
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/HeaderPositionWhenSortingTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderPositionWhenSortingTest.java
index 3f8498034a..0b388bcd22 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/HeaderPositionWhenSortingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderPositionWhenSortingTest.java
@@ -20,8 +20,8 @@ import java.io.IOException;
 import org.junit.Test;
 
 import com.vaadin.testbench.TestBenchElement;
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Tests Table Footer ClickListener
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/HeaderRightClickAfterDragTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderRightClickAfterDragTest.java
index c70d6075e6..78ceadc34a 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/HeaderRightClickAfterDragTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderRightClickAfterDragTest.java
@@ -22,9 +22,9 @@ import org.openqa.selenium.interactions.Actions;
 import org.openqa.selenium.support.ui.ExpectedCondition;
 
 import com.vaadin.testbench.TestBenchElement;
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.WindowElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Tests whether right-click on a column header works after the column is
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/HeaderSyncOnScrollTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderSyncOnScrollTest.java
index 9e60fd865a..3b6cf0ffaa 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/HeaderSyncOnScrollTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderSyncOnScrollTest.java
@@ -19,9 +19,9 @@ import java.io.IOException;
 
 import org.junit.Test;
 
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Tests Table Footer ClickListener
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/HeaderUpdateWhenNoRowsTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderUpdateWhenNoRowsTest.java
index d78c08678f..95e948f957 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/HeaderUpdateWhenNoRowsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderUpdateWhenNoRowsTest.java
@@ -20,9 +20,9 @@ import java.io.IOException;
 import org.junit.Test;
 
 import com.vaadin.testbench.TestBenchElement;
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.CheckBoxElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Tests Table Footer ClickListener
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/ItemClickEventsTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/ItemClickEventsTest.java
index 1037794e30..e482bbac47 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/ItemClickEventsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/ItemClickEventsTest.java
@@ -22,10 +22,10 @@ import org.junit.Before;
 import org.junit.Test;
 
 import com.vaadin.testbench.TestBenchElement;
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.CheckBoxElement;
 import com.vaadin.testbench.elements.LabelElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class ItemClickEventsTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/ItemClickEventsTestWithShiftOrCtrl.java b/uitest/src/test/java/com/vaadin/tests/components/table/ItemClickEventsTestWithShiftOrCtrl.java
index b0c053e55b..0391547353 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/ItemClickEventsTestWithShiftOrCtrl.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/ItemClickEventsTestWithShiftOrCtrl.java
@@ -26,11 +26,11 @@ import org.openqa.selenium.Keys;
 import org.openqa.selenium.remote.DesiredCapabilities;
 
 import com.vaadin.testbench.TestBenchElement;
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.CheckBoxElement;
 import com.vaadin.testbench.elements.LabelElement;
 import com.vaadin.testbench.parallel.Browser;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class ItemClickEventsTestWithShiftOrCtrl extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTableTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTableTest.java
index f22bcd459d..186edc714a 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTableTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTableTest.java
@@ -23,8 +23,8 @@ import org.junit.Test;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Tests clicks on different types of Table contents.
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/LongMultiselectTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/LongMultiselectTest.java
index c7806e1694..3272db77f0 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/LongMultiselectTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/LongMultiselectTest.java
@@ -10,9 +10,9 @@ import org.openqa.selenium.Keys;
 import org.openqa.selenium.interactions.Actions;
 import org.openqa.selenium.remote.DesiredCapabilities;
 
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class LongMultiselectTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/MemoryLeakTableTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/MemoryLeakTableTest.java
index 386549b098..f950319e71 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/MemoryLeakTableTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/MemoryLeakTableTest.java
@@ -24,9 +24,9 @@ import org.openqa.selenium.By;
 import org.openqa.selenium.JavascriptExecutor;
 import org.openqa.selenium.WebElement;
 
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Test case creating and deleting table component in a loop, testing memory
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/OnlyCollapsibleInMenu.java b/uitest/src/test/java/com/vaadin/tests/components/table/OnlyCollapsibleInMenu.java
index 7cca83be62..54be135ff8 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/OnlyCollapsibleInMenu.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/OnlyCollapsibleInMenu.java
@@ -18,9 +18,9 @@ package com.vaadin.tests.components.table;
 import org.junit.Assert;
 import org.junit.Test;
 
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.SingleBrowserTest;
 import com.vaadin.v7.shared.ui.table.CollapseMenuContent;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class OnlyCollapsibleInMenu extends SingleBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/ReloadWidgetsTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/ReloadWidgetsTest.java
index 1ae9adebbf..fcf7a020ad 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/ReloadWidgetsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/ReloadWidgetsTest.java
@@ -9,8 +9,8 @@ import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.ui.ExpectedCondition;
 
 import com.vaadin.testbench.By;
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class ReloadWidgetsTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/SelectAllConstantViewportTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/SelectAllConstantViewportTest.java
index 219c6b1c49..054d467151 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/SelectAllConstantViewportTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/SelectAllConstantViewportTest.java
@@ -26,9 +26,9 @@ import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.ui.ExpectedCondition;
 
 import com.vaadin.testbench.By;
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.CheckBoxElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class SelectAllConstantViewportTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/SelectAllRowsTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/SelectAllRowsTest.java
index f77403c957..46a8f79b51 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/SelectAllRowsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/SelectAllRowsTest.java
@@ -30,10 +30,10 @@ import org.openqa.selenium.interactions.Actions;
 import org.openqa.selenium.remote.DesiredCapabilities;
 import org.openqa.selenium.support.ui.ExpectedCondition;
 
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.elements.LabelElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Test to see if all items of the table can be selected by selecting first row,
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/SelectableEditableTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/SelectableEditableTest.java
index 90ed3da93e..57da274fbd 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/SelectableEditableTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/SelectableEditableTest.java
@@ -3,8 +3,8 @@ package com.vaadin.tests.components.table;
 import org.junit.Assert;
 import org.junit.Test;
 
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class SelectableEditableTest extends MultiBrowserTest {
     @Test
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndexTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndexTest.java
index 4803e86e39..bf381a982b 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndexTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndexTest.java
@@ -23,9 +23,9 @@ import org.junit.Test;
 import org.openqa.selenium.NoSuchElementException;
 
 import com.vaadin.testbench.TestBenchElement;
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 import junit.framework.Assert;
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/SortLabelsInTableTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/SortLabelsInTableTest.java
index df61c13630..0045fd9bf7 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/SortLabelsInTableTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/SortLabelsInTableTest.java
@@ -19,8 +19,8 @@ import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Tests sorting labels in table.
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/SortableHeaderStylesTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/SortableHeaderStylesTest.java
index f85d1c870b..6756feb705 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/SortableHeaderStylesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/SortableHeaderStylesTest.java
@@ -18,9 +18,9 @@ package com.vaadin.tests.components.table;
 import org.junit.Assert;
 import org.junit.Test;
 
+import com.vaadin.testbench.customelements.TableElement;
+import com.vaadin.testbench.elements.OptionGroupElement;
 import com.vaadin.tests.tb3.SingleBrowserTest;
-import com.vaadin.v7.testbench.customelements.OptionGroupElement;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class SortableHeaderStylesTest extends SingleBrowserTest {
     @Test
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableBlurFocusTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableBlurFocusTest.java
index 7ff937aad7..9fa2a62390 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableBlurFocusTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableBlurFocusTest.java
@@ -23,9 +23,9 @@ import java.util.Arrays;
 import org.junit.Test;
 import org.openqa.selenium.By;
 
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class TableBlurFocusTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponentsTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponentsTest.java
index aa4e748edc..923546c13d 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponentsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponentsTest.java
@@ -25,8 +25,8 @@ import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;
 
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Tests that clicking on active fields doesn't change Table selection, nor does
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnAddAndResizeTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnAddAndResizeTest.java
index ac3f109f1f..25f8abbc1f 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnAddAndResizeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnAddAndResizeTest.java
@@ -20,10 +20,10 @@ import static org.junit.Assert.assertFalse;
 
 import org.junit.Test;
 
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.elements.NotificationElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class TableColumnAddAndResizeTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnResizeContentsWidthTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnResizeContentsWidthTest.java
index e0fd37df0d..736fb5a701 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnResizeContentsWidthTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnResizeContentsWidthTest.java
@@ -26,9 +26,9 @@ import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;
 import org.openqa.selenium.support.ui.ExpectedCondition;
 
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Tests that components within table cells get resized when their column gets
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnWidthsAndSortingTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnWidthsAndSortingTest.java
index 5913e08868..89a545bf1b 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnWidthsAndSortingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnWidthsAndSortingTest.java
@@ -18,8 +18,8 @@ package com.vaadin.tests.components.table;
 import org.junit.Assert;
 import org.junit.Test;
 
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class TableColumnWidthsAndSortingTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableContextMenuAndIconsTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableContextMenuAndIconsTest.java
index 7def9cbe43..75fb500564 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableContextMenuAndIconsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableContextMenuAndIconsTest.java
@@ -7,8 +7,8 @@ import org.openqa.selenium.interactions.Actions;
 import org.openqa.selenium.remote.DesiredCapabilities;
 
 import com.vaadin.testbench.TestBenchElement;
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class TableContextMenuAndIconsTest extends MultiBrowserTest {
     @Override
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableDragColumnTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableDragColumnTest.java
index a642b49681..00cf5bfda4 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableDragColumnTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableDragColumnTest.java
@@ -21,9 +21,9 @@ import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;
 
 import com.vaadin.testbench.By;
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.TableHeaderElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class TableDragColumnTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableDropIndicatorValoTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableDropIndicatorValoTest.java
index 87b4e2d69f..7a0241de54 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableDropIndicatorValoTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableDropIndicatorValoTest.java
@@ -23,8 +23,8 @@ import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;
 
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Tests that clicking on active fields doesn't change Table selection, nor does
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableInIframeRowClickScrollJumpTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableInIframeRowClickScrollJumpTest.java
index 46f24bdc2c..ff6b5f7285 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableInIframeRowClickScrollJumpTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableInIframeRowClickScrollJumpTest.java
@@ -24,9 +24,9 @@ import org.openqa.selenium.JavascriptExecutor;
 import org.openqa.selenium.WebElement;
 
 import com.vaadin.testbench.By;
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * For testing that UI scroll does not jump back to up when: 1. UI is in iframe
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableItemDescriptionGeneratorUITest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableItemDescriptionGeneratorUITest.java
index 17726f6921..632053af6d 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableItemDescriptionGeneratorUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableItemDescriptionGeneratorUITest.java
@@ -24,9 +24,9 @@ import org.openqa.selenium.interactions.Actions;
 
 import com.vaadin.testbench.By;
 import com.vaadin.testbench.TestBenchElement;
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.CheckBoxElement;
 import com.vaadin.tests.tb3.TooltipTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Tests Table tooltips with various settings.
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableMatchesMouseDownMouseUpElementTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableMatchesMouseDownMouseUpElementTest.java
index 379dbcad37..8c684becea 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableMatchesMouseDownMouseUpElementTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableMatchesMouseDownMouseUpElementTest.java
@@ -25,8 +25,8 @@ import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;
 
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Regular click cases already covered by @LabelEmbeddedClickThroughForTableTest
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableNavigationPageDownTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableNavigationPageDownTest.java
index 77c63f153f..9df559502d 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableNavigationPageDownTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableNavigationPageDownTest.java
@@ -29,9 +29,9 @@ import org.openqa.selenium.interactions.Actions;
 import org.openqa.selenium.remote.DesiredCapabilities;
 import org.openqa.selenium.support.ui.ExpectedCondition;
 
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.parallel.Browser;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Tests that navigation with PageDown/PageUp/Home/End in Table works
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableParentEnabledStateChangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableParentEnabledStateChangeTest.java
index 91872a9439..85a5fbf42f 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableParentEnabledStateChangeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableParentEnabledStateChangeTest.java
@@ -18,10 +18,10 @@ package com.vaadin.tests.components.table;
 import org.junit.Assert;
 import org.junit.Test;
 
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.elements.TableRowElement;
 import com.vaadin.tests.tb3.SingleBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class TableParentEnabledStateChangeTest extends SingleBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableRepairsScrollPositionOnReAddingAllRowsTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableRepairsScrollPositionOnReAddingAllRowsTest.java
index 57666944c4..50f4b0d21f 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableRepairsScrollPositionOnReAddingAllRowsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableRepairsScrollPositionOnReAddingAllRowsTest.java
@@ -21,8 +21,8 @@ import static org.hamcrest.number.IsCloseTo.closeTo;
 import org.junit.Before;
 import org.junit.Test;
 
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Scroll position should be restored when removing and re-adding all rows in
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableRowHeight2Test.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableRowHeight2Test.java
index 956dbee1cf..4856c9348d 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableRowHeight2Test.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableRowHeight2Test.java
@@ -22,8 +22,8 @@ import org.junit.Test;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Tests that rows are completely visible and clicking buttons doesn't change
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableRowScrolledBottomTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableRowScrolledBottomTest.java
index 2a0842dd75..cb5f4ea2c6 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableRowScrolledBottomTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableRowScrolledBottomTest.java
@@ -24,9 +24,9 @@ import org.junit.Test;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Tests that adding long labels to a Table and scrolling to the bottom works as
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableScrollUpOnSelectTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableScrollUpOnSelectTest.java
index ed1ac464ed..34ded9056f 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableScrollUpOnSelectTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableScrollUpOnSelectTest.java
@@ -22,8 +22,8 @@ import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.ui.ExpectedCondition;
 
 import com.vaadin.testbench.By;
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Test to see if Table appears to scroll up under an obscure set of conditions
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableScrollsOnSelectionTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableScrollsOnSelectionTest.java
index 04e7751519..28977eb69b 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableScrollsOnSelectionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableScrollsOnSelectionTest.java
@@ -4,8 +4,8 @@ import java.io.IOException;
 
 import org.junit.Test;
 
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class TableScrollsOnSelectionTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableSetUndefinedSizeTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableSetUndefinedSizeTest.java
index ad630eb3a7..9272d5d486 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableSetUndefinedSizeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableSetUndefinedSizeTest.java
@@ -4,9 +4,9 @@ import org.junit.Test;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.support.ui.ExpectedCondition;
 
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class TableSetUndefinedSizeTest extends MultiBrowserTest {
     @Test
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableSortingIndicatorTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableSortingIndicatorTest.java
index 6328820c5e..c45ac018ac 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableSortingIndicatorTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableSortingIndicatorTest.java
@@ -18,9 +18,9 @@ package com.vaadin.tests.components.table;
 import org.junit.Assert;
 import org.junit.Test;
 
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Tests if the sort indicator is visible after the table has been sorted from
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableToggleColumnVisibilityTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableToggleColumnVisibilityTest.java
index fca736e13e..cf32afbf3d 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableToggleColumnVisibilityTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableToggleColumnVisibilityTest.java
@@ -19,10 +19,10 @@ import org.junit.Assert;
 import org.junit.Test;
 import org.openqa.selenium.By;
 
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.elements.TableHeaderElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Tests that column keeps its header, icon, alignment after toggling visibility
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemIdTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemIdTest.java
index 4d70818472..fdda329a8d 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemIdTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemIdTest.java
@@ -23,8 +23,8 @@ import org.junit.Test;
 import org.openqa.selenium.WebElement;
 
 import com.vaadin.testbench.By;
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Test for a Table with a customised BeanItemContainer.
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableWithPollingTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableWithPollingTest.java
index 2d64ab435c..2594db28ea 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableWithPollingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableWithPollingTest.java
@@ -21,8 +21,8 @@ import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;
 
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class TableWithPollingTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/UpdateTableWhenUnfocusedTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/UpdateTableWhenUnfocusedTest.java
index 4ce1a2a630..0ac3901594 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/UpdateTableWhenUnfocusedTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/UpdateTableWhenUnfocusedTest.java
@@ -23,9 +23,9 @@ import java.io.IOException;
 import org.junit.Test;
 
 import com.vaadin.testbench.TestBenchElement;
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class UpdateTableWhenUnfocusedTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/textfield/EnumTextFieldTest.java b/uitest/src/test/java/com/vaadin/tests/components/textfield/EnumTextFieldTest.java
index cb9b07f2e1..b810de2e5f 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/textfield/EnumTextFieldTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/textfield/EnumTextFieldTest.java
@@ -19,8 +19,8 @@ import org.junit.Assert;
 import org.junit.Test;
 import org.openqa.selenium.Keys;
 
+import com.vaadin.testbench.elements.TextFieldElement;
 import com.vaadin.tests.tb3.SingleBrowserTest;
-import com.vaadin.v7.testbench.customelements.TextFieldElement;
 
 public class EnumTextFieldTest extends SingleBrowserTest {
     @Test
diff --git a/uitest/src/test/java/com/vaadin/tests/components/textfield/LocaleChangeOnReadOnlyFieldTest.java b/uitest/src/test/java/com/vaadin/tests/components/textfield/LocaleChangeOnReadOnlyFieldTest.java
index 72af8d2243..c6a52be38a 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/textfield/LocaleChangeOnReadOnlyFieldTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/textfield/LocaleChangeOnReadOnlyFieldTest.java
@@ -6,8 +6,8 @@ import static org.hamcrest.core.Is.is;
 import org.junit.Test;
 
 import com.vaadin.testbench.elements.ButtonElement;
+import com.vaadin.testbench.elements.TextFieldElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TextFieldElement;
 
 public class LocaleChangeOnReadOnlyFieldTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/textfield/RequiredTextFieldTest.java b/uitest/src/test/java/com/vaadin/tests/components/textfield/RequiredTextFieldTest.java
index a7b4dcc69e..cfef5a97d4 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/textfield/RequiredTextFieldTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/textfield/RequiredTextFieldTest.java
@@ -19,8 +19,8 @@ import org.junit.Assert;
 import org.junit.Test;
 
 import com.vaadin.testbench.elements.ButtonElement;
+import com.vaadin.testbench.elements.TextFieldElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TextFieldElement;
 
 /**
  * Test for .v-required style
diff --git a/uitest/src/test/java/com/vaadin/tests/components/tree/TreeHtmlContentAllowedTest.java b/uitest/src/test/java/com/vaadin/tests/components/tree/TreeHtmlContentAllowedTest.java
index fc11db0284..e784f990f3 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/tree/TreeHtmlContentAllowedTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/tree/TreeHtmlContentAllowedTest.java
@@ -23,8 +23,8 @@ import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 
 import com.vaadin.testbench.elements.CheckBoxElement;
+import com.vaadin.testbench.elements.TreeElement;
 import com.vaadin.tests.tb3.SingleBrowserTest;
-import com.vaadin.v7.testbench.customelements.TreeElement;
 
 public class TreeHtmlContentAllowedTest extends SingleBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/treetable/DisappearingComponentsTest.java b/uitest/src/test/java/com/vaadin/tests/components/treetable/DisappearingComponentsTest.java
index 7f1162ee84..684b41e333 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/treetable/DisappearingComponentsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/treetable/DisappearingComponentsTest.java
@@ -21,8 +21,8 @@ import org.junit.Test;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 
+import com.vaadin.testbench.elements.TreeTableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TreeTableElement;
 
 /**
  * Tests that expanded cells with component contents aren't empty.
diff --git a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableContainerHierarchicalWrapperTest.java b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableContainerHierarchicalWrapperTest.java
index 9ab67bade8..e8676fcedf 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableContainerHierarchicalWrapperTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableContainerHierarchicalWrapperTest.java
@@ -22,8 +22,8 @@ import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 
 import com.vaadin.testbench.TestBenchElement;
+import com.vaadin.testbench.elements.TreeTableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TreeTableElement;
 
 /**
  * Tests that TreeTable with ContainerHierarchicalWrapper is updated correctly
diff --git a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableItemDescriptionGeneratorUITest.java b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableItemDescriptionGeneratorUITest.java
index 9f90dd5fc3..66513098a2 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableItemDescriptionGeneratorUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableItemDescriptionGeneratorUITest.java
@@ -24,8 +24,8 @@ import org.junit.Test;
 import com.vaadin.testbench.By;
 import com.vaadin.testbench.TestBenchElement;
 import com.vaadin.testbench.elements.CheckBoxElement;
+import com.vaadin.testbench.elements.TreeTableElement;
 import com.vaadin.tests.tb3.TooltipTest;
-import com.vaadin.v7.testbench.customelements.TreeTableElement;
 
 /**
  * Tests TreeTable tooltips with various settings.
diff --git a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableOutOfSyncTest.java b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableOutOfSyncTest.java
index ce64913289..469b94f518 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableOutOfSyncTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableOutOfSyncTest.java
@@ -23,8 +23,8 @@ import org.junit.Test;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 
+import com.vaadin.testbench.elements.TreeTableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TreeTableElement;
 
 /**
  * Tests that opening the root node and clicking a generated component doesn't
diff --git a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesPageLength0Test.java b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesPageLength0Test.java
index fbf8947ba9..217184454f 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesPageLength0Test.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesPageLength0Test.java
@@ -24,8 +24,8 @@ import org.junit.Test;
 import org.openqa.selenium.WebElement;
 
 import com.vaadin.testbench.By;
+import com.vaadin.testbench.elements.TreeTableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TreeTableElement;
 
 /**
  * Tests expanding TreeTable rows when page length is zero.
diff --git a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesTest.java b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesTest.java
index 4b2694607d..9620c01395 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesTest.java
@@ -27,8 +27,8 @@ import org.openqa.selenium.support.ui.ExpectedConditions;
 
 import com.vaadin.testbench.By;
 import com.vaadin.testbench.commands.TestBenchElementCommands;
+import com.vaadin.testbench.elements.TreeTableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TreeTableElement;
 
 /**
  * Tests partial updates of a TreeTable.
diff --git a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableScrollOnExpandTest.java b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableScrollOnExpandTest.java
index e9b974a920..c5d8661d80 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableScrollOnExpandTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableScrollOnExpandTest.java
@@ -23,8 +23,8 @@ import org.junit.Test;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 
+import com.vaadin.testbench.elements.TreeTableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TreeTableElement;
 
 public class TreeTableScrollOnExpandTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/ui/TextAreaEventPropagationModifierKeysTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/TextAreaEventPropagationModifierKeysTest.java
index 61ea600b91..2786e52849 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/ui/TextAreaEventPropagationModifierKeysTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/TextAreaEventPropagationModifierKeysTest.java
@@ -24,9 +24,9 @@ import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;
 import org.openqa.selenium.remote.DesiredCapabilities;
 
+import com.vaadin.testbench.elements.TextAreaElement;
 import com.vaadin.testbench.parallel.Browser;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TextAreaElement;
 
 public class TextAreaEventPropagationModifierKeysTest extends MultiBrowserTest {
     @Test
diff --git a/uitest/src/test/java/com/vaadin/tests/components/ui/TextAreaEventPropagationTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/TextAreaEventPropagationTest.java
index e7496a8ce6..8ee6c85f19 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/ui/TextAreaEventPropagationTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/TextAreaEventPropagationTest.java
@@ -22,9 +22,9 @@ import org.openqa.selenium.Keys;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;
 
+import com.vaadin.testbench.elements.TextAreaElement;
 import com.vaadin.testbench.elements.TextFieldElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TextAreaElement;
 
 /**
  * Tests that the TextArea widget correctly stops ENTER events from propagating.
diff --git a/uitest/src/test/java/com/vaadin/tests/components/ui/UIPollingTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/UIPollingTest.java
index c0eabbe7e3..bfc856d1b1 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/ui/UIPollingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/UIPollingTest.java
@@ -3,8 +3,8 @@ package com.vaadin.tests.components.ui;
 import org.junit.Assert;
 import org.junit.Test;
 
+import com.vaadin.testbench.elements.TextFieldElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TextFieldElement;
 
 public class UIPollingTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/uitest/ThemeTest.java b/uitest/src/test/java/com/vaadin/tests/components/uitest/ThemeTest.java
index b8baaff102..387d0d6723 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/uitest/ThemeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/uitest/ThemeTest.java
@@ -8,15 +8,15 @@ import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;
 
 import com.vaadin.testbench.By;
+import com.vaadin.testbench.customelements.ComboBoxElement;
 import com.vaadin.testbench.customelements.DateFieldElement;
 import com.vaadin.testbench.customelements.FixedNotificationElement;
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.customelements.WindowElement;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.elements.TabSheetElement;
 import com.vaadin.testbench.parallel.BrowserUtil;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.ComboBoxElement;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 public abstract class ThemeTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/window/OpenModalWindowAndFocusFieldTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/OpenModalWindowAndFocusFieldTest.java
index 4c14a370e2..cebb4ba181 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/window/OpenModalWindowAndFocusFieldTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/window/OpenModalWindowAndFocusFieldTest.java
@@ -20,8 +20,8 @@ import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 
 import com.vaadin.testbench.elements.ButtonElement;
+import com.vaadin.testbench.elements.TextAreaElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TextAreaElement;
 
 public class OpenModalWindowAndFocusFieldTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/containers/sqlcontainer/TableQueryWithNonUniqueFirstPrimaryKeyTest.java b/uitest/src/test/java/com/vaadin/tests/containers/sqlcontainer/TableQueryWithNonUniqueFirstPrimaryKeyTest.java
index b48f252d27..30182c70b1 100644
--- a/uitest/src/test/java/com/vaadin/tests/containers/sqlcontainer/TableQueryWithNonUniqueFirstPrimaryKeyTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/containers/sqlcontainer/TableQueryWithNonUniqueFirstPrimaryKeyTest.java
@@ -9,8 +9,8 @@ import org.openqa.selenium.Keys;
 import org.openqa.selenium.WebElement;
 
 import com.vaadin.testbench.By;
+import com.vaadin.testbench.customelements.ComboBoxElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.ComboBoxElement;
 
 public class TableQueryWithNonUniqueFirstPrimaryKeyTest
         extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/contextclick/GridContextClickTest.java b/uitest/src/test/java/com/vaadin/tests/contextclick/GridContextClickTest.java
index 6bdbfe718e..fa5d6d7e2b 100644
--- a/uitest/src/test/java/com/vaadin/tests/contextclick/GridContextClickTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/contextclick/GridContextClickTest.java
@@ -20,8 +20,8 @@ import static org.junit.Assert.assertEquals;
 import org.junit.Test;
 import org.openqa.selenium.WebElement;
 
+import com.vaadin.testbench.customelements.GridElement;
 import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.v7.testbench.customelements.GridElement;
 
 public class GridContextClickTest extends AbstractContextClickTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/contextclick/TableContextClickTest.java b/uitest/src/test/java/com/vaadin/tests/contextclick/TableContextClickTest.java
index 9da14c1331..a7cd84e9aa 100644
--- a/uitest/src/test/java/com/vaadin/tests/contextclick/TableContextClickTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/contextclick/TableContextClickTest.java
@@ -19,8 +19,8 @@ import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class TableContextClickTest extends TableContextClickTestBase {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/contextclick/TableContextClickTestBase.java b/uitest/src/test/java/com/vaadin/tests/contextclick/TableContextClickTestBase.java
index 84cf12a4dd..74e9c017f1 100644
--- a/uitest/src/test/java/com/vaadin/tests/contextclick/TableContextClickTestBase.java
+++ b/uitest/src/test/java/com/vaadin/tests/contextclick/TableContextClickTestBase.java
@@ -17,7 +17,7 @@ package com.vaadin.tests.contextclick;
 
 import static org.junit.Assert.assertEquals;
 
-import com.vaadin.v7.testbench.customelements.TableElement;
+import com.vaadin.testbench.customelements.TableElement;
 
 public abstract class TableContextClickTestBase
         extends AbstractContextClickTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/contextclick/TreeContextClickTest.java b/uitest/src/test/java/com/vaadin/tests/contextclick/TreeContextClickTest.java
index f91b579d35..99cb978859 100644
--- a/uitest/src/test/java/com/vaadin/tests/contextclick/TreeContextClickTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/contextclick/TreeContextClickTest.java
@@ -24,7 +24,7 @@ import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;
 
 import com.vaadin.testbench.By;
-import com.vaadin.v7.testbench.customelements.TreeElement;
+import com.vaadin.testbench.elements.TreeElement;
 
 public class TreeContextClickTest extends AbstractContextClickTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/converter/ConverterThatEnforcesAFormatTest.java b/uitest/src/test/java/com/vaadin/tests/converter/ConverterThatEnforcesAFormatTest.java
index fe3207c248..97c400c347 100644
--- a/uitest/src/test/java/com/vaadin/tests/converter/ConverterThatEnforcesAFormatTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/converter/ConverterThatEnforcesAFormatTest.java
@@ -5,8 +5,8 @@ import org.openqa.selenium.Keys;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.support.ui.ExpectedCondition;
 
+import com.vaadin.testbench.elements.TextFieldElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TextFieldElement;
 
 public class ConverterThatEnforcesAFormatTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/dd/DnDOnSubtreeTest.java b/uitest/src/test/java/com/vaadin/tests/dd/DnDOnSubtreeTest.java
index ca19fdfa42..2bceb905c4 100644
--- a/uitest/src/test/java/com/vaadin/tests/dd/DnDOnSubtreeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/dd/DnDOnSubtreeTest.java
@@ -8,8 +8,8 @@ import org.openqa.selenium.support.ui.ExpectedCondition;
 
 import com.vaadin.testbench.By;
 import com.vaadin.testbench.TestBenchElement;
+import com.vaadin.testbench.elements.TreeElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TreeElement;
 
 public class DnDOnSubtreeTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudGridEditorRowTest.java b/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudGridEditorRowTest.java
index ff430d29de..0fd537055c 100644
--- a/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudGridEditorRowTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudGridEditorRowTest.java
@@ -25,13 +25,13 @@ import org.openqa.selenium.Keys;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;
 
+import com.vaadin.testbench.customelements.DateFieldElement;
+import com.vaadin.testbench.customelements.GridElement;
 import com.vaadin.testbench.elements.CheckBoxElement;
 import com.vaadin.testbench.elements.GridElement.GridCellElement;
 import com.vaadin.testbench.elements.GridElement.GridEditorElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.DateFieldElement;
-import com.vaadin.v7.testbench.customelements.GridElement;
 
 @TestCategory("grid")
 public class BasicCrudGridEditorRowTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudGridTest.java b/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudGridTest.java
index cab06c5c4e..33651ac7b8 100644
--- a/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudGridTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudGridTest.java
@@ -21,10 +21,10 @@ import org.junit.Assert;
 import org.junit.Test;
 
 import com.vaadin.testbench.AbstractHasTestBenchCommandExecutor;
+import com.vaadin.testbench.customelements.GridElement;
 import com.vaadin.testbench.elements.AbstractComponentElement;
 import com.vaadin.testbench.elements.TextFieldElement;
 import com.vaadin.tests.tb3.SingleBrowserTestPhantomJS2;
-import com.vaadin.v7.testbench.customelements.GridElement;
 
 public class BasicCrudGridTest extends SingleBrowserTestPhantomJS2 {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudTableTest.java b/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudTableTest.java
index b06331f781..0ee93caef4 100644
--- a/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudTableTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudTableTest.java
@@ -21,10 +21,10 @@ import org.junit.Assert;
 import org.junit.Test;
 
 import com.vaadin.testbench.AbstractHasTestBenchCommandExecutor;
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.AbstractComponentElement;
 import com.vaadin.testbench.elements.TextFieldElement;
 import com.vaadin.tests.tb3.SingleBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class BasicCrudTableTest extends SingleBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicPersonFormTest.java b/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicPersonFormTest.java
index c00fda6f91..3020eaa4d4 100644
--- a/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicPersonFormTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicPersonFormTest.java
@@ -19,14 +19,14 @@ import org.junit.Assert;
 
 import com.vaadin.testbench.TestBenchElement;
 import com.vaadin.testbench.customelements.FixedNotificationElement;
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.elements.CheckBoxElement;
 import com.vaadin.testbench.elements.TableRowElement;
+import com.vaadin.testbench.elements.TextAreaElement;
+import com.vaadin.testbench.elements.TextFieldElement;
 import com.vaadin.tests.data.bean.Sex;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
-import com.vaadin.v7.testbench.customelements.TextAreaElement;
-import com.vaadin.v7.testbench.customelements.TextFieldElement;
 
 public abstract class BasicPersonFormTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/fieldgroup/DateFormTest.java b/uitest/src/test/java/com/vaadin/tests/fieldgroup/DateFormTest.java
index ec11ea22f5..0e7e872947 100644
--- a/uitest/src/test/java/com/vaadin/tests/fieldgroup/DateFormTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/fieldgroup/DateFormTest.java
@@ -5,11 +5,11 @@ import org.junit.Test;
 import org.openqa.selenium.WebElement;
 
 import com.vaadin.testbench.By;
+import com.vaadin.testbench.customelements.DateFieldElement;
+import com.vaadin.testbench.elements.InlineDateFieldElement;
+import com.vaadin.testbench.elements.PopupDateFieldElement;
+import com.vaadin.testbench.elements.TextFieldElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.DateFieldElement;
-import com.vaadin.v7.testbench.customelements.InlineDateFieldElement;
-import com.vaadin.v7.testbench.customelements.PopupDateFieldElement;
-import com.vaadin.v7.testbench.customelements.TextFieldElement;
 
 public class DateFormTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/fieldgroup/MultipleValidationErrorsTest.java b/uitest/src/test/java/com/vaadin/tests/fieldgroup/MultipleValidationErrorsTest.java
index d0472bf5fb..17168ab068 100644
--- a/uitest/src/test/java/com/vaadin/tests/fieldgroup/MultipleValidationErrorsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/fieldgroup/MultipleValidationErrorsTest.java
@@ -7,8 +7,8 @@ import org.junit.Test;
 
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.elements.LabelElement;
+import com.vaadin.testbench.elements.TextFieldElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TextFieldElement;
 
 public class MultipleValidationErrorsTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/fonticon/FontIconsTest.java b/uitest/src/test/java/com/vaadin/tests/fonticon/FontIconsTest.java
index d832bbfb2d..3f6dcb01ac 100644
--- a/uitest/src/test/java/com/vaadin/tests/fonticon/FontIconsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/fonticon/FontIconsTest.java
@@ -22,8 +22,8 @@ import java.io.IOException;
 import org.junit.Test;
 import org.openqa.selenium.Keys;
 
+import com.vaadin.testbench.customelements.ComboBoxElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.ComboBoxElement;
 
 public class FontIconsTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/integration/AbstractServletIntegrationTest.java b/uitest/src/test/java/com/vaadin/tests/integration/AbstractServletIntegrationTest.java
index b17febee04..6a1d77317d 100644
--- a/uitest/src/test/java/com/vaadin/tests/integration/AbstractServletIntegrationTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/integration/AbstractServletIntegrationTest.java
@@ -24,8 +24,8 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized.Parameters;
 
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.ParameterizedTB3Runner;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Base class for servlet integration tests. Automatically prepends "/demo" to
diff --git a/uitest/src/test/java/com/vaadin/tests/navigator/NavigationTest.java b/uitest/src/test/java/com/vaadin/tests/navigator/NavigationTest.java
index e55cc36e3e..44390e1288 100644
--- a/uitest/src/test/java/com/vaadin/tests/navigator/NavigationTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/navigator/NavigationTest.java
@@ -7,11 +7,11 @@ import static org.junit.Assert.assertTrue;
 import org.junit.Test;
 
 import com.vaadin.testbench.By;
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.elements.TableRowElement;
 import com.vaadin.testbench.elements.TextFieldElement;
 import com.vaadin.tests.tb3.SingleBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class NavigationTest extends SingleBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/push/PushConfigurationTest.java b/uitest/src/test/java/com/vaadin/tests/push/PushConfigurationTest.java
index 2ba0389f55..255b69947e 100644
--- a/uitest/src/test/java/com/vaadin/tests/push/PushConfigurationTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/PushConfigurationTest.java
@@ -21,9 +21,9 @@ import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.ui.ExpectedCondition;
 
+import com.vaadin.testbench.elements.NativeSelectElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.NativeSelectElement;
 
 @TestCategory("push")
 abstract class PushConfigurationTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/push/SendMultibyteCharactersTest.java b/uitest/src/test/java/com/vaadin/tests/push/SendMultibyteCharactersTest.java
index 3026aa25a0..95c03d9959 100644
--- a/uitest/src/test/java/com/vaadin/tests/push/SendMultibyteCharactersTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/SendMultibyteCharactersTest.java
@@ -3,9 +3,9 @@ package com.vaadin.tests.push;
 import org.junit.Test;
 
 import com.vaadin.testbench.By;
+import com.vaadin.testbench.elements.TextAreaElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TextAreaElement;
 
 @TestCategory("push")
 public abstract class SendMultibyteCharactersTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/themes/LegacyComponentThemeChangeTest.java b/uitest/src/test/java/com/vaadin/tests/themes/LegacyComponentThemeChangeTest.java
index f54cf722ea..7117090d5f 100644
--- a/uitest/src/test/java/com/vaadin/tests/themes/LegacyComponentThemeChangeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/themes/LegacyComponentThemeChangeTest.java
@@ -23,14 +23,14 @@ import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.remote.DesiredCapabilities;
 
+import com.vaadin.testbench.customelements.ComboBoxElement;
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.elements.EmbeddedElement;
 import com.vaadin.testbench.elements.MenuBarElement;
 import com.vaadin.testbench.parallel.Browser;
 import com.vaadin.testbench.parallel.BrowserUtil;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.ComboBoxElement;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class LegacyComponentThemeChangeTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/themes/valo/CollapsibleTableColumnTest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/CollapsibleTableColumnTest.java
index eaae1acfd8..41b1ace31d 100644
--- a/uitest/src/test/java/com/vaadin/tests/themes/valo/CollapsibleTableColumnTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/CollapsibleTableColumnTest.java
@@ -22,8 +22,8 @@ import org.junit.Test;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Test for non-collapsible column opacity for item in column configuration
diff --git a/uitest/src/test/java/com/vaadin/tests/themes/valo/ValoDefaultCaptionWidthTest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/ValoDefaultCaptionWidthTest.java
index 1c654b8108..4bdd9fc0f1 100644
--- a/uitest/src/test/java/com/vaadin/tests/themes/valo/ValoDefaultCaptionWidthTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/ValoDefaultCaptionWidthTest.java
@@ -22,8 +22,8 @@ import static org.junit.Assert.assertThat;
 
 import org.junit.Test;
 
+import com.vaadin.testbench.elements.ColorPickerElement;
 import com.vaadin.tests.components.colorpicker.DefaultCaptionWidthTest;
-import com.vaadin.v7.testbench.customelements.ColorPickerElement;
 
 /**
  * Test for default caption behavior in color picker using Valo theme.
diff --git a/uitest/src/test/java/com/vaadin/tests/themes/valo/ValoThemeUITest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/ValoThemeUITest.java
index 0156f99e51..9c55a029ab 100644
--- a/uitest/src/test/java/com/vaadin/tests/themes/valo/ValoThemeUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/ValoThemeUITest.java
@@ -26,9 +26,9 @@ import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.elements.CheckBoxElement;
 import com.vaadin.testbench.elements.CssLayoutElement;
 import com.vaadin.testbench.elements.LabelElement;
+import com.vaadin.testbench.elements.TreeElement;
 import com.vaadin.testbench.parallel.Browser;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TreeElement;
 
 public class ValoThemeUITest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/tooltip/ValidatorCaptionTooltipTest.java b/uitest/src/test/java/com/vaadin/tests/tooltip/ValidatorCaptionTooltipTest.java
index 77cd2b669f..4cb358f5c2 100644
--- a/uitest/src/test/java/com/vaadin/tests/tooltip/ValidatorCaptionTooltipTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/tooltip/ValidatorCaptionTooltipTest.java
@@ -17,8 +17,8 @@ package com.vaadin.tests.tooltip;
 
 import org.junit.Test;
 
+import com.vaadin.testbench.elements.TextFieldElement;
 import com.vaadin.tests.tb3.TooltipTest;
-import com.vaadin.v7.testbench.customelements.TextFieldElement;
 
 /**
  * Test to see if validators create error tooltips correctly.
diff --git a/uitest/src/test/java/com/vaadin/tests/validation/ValidationOfRequiredEmptyFieldsTest.java b/uitest/src/test/java/com/vaadin/tests/validation/ValidationOfRequiredEmptyFieldsTest.java
index 3e88bf62db..f8c1025975 100644
--- a/uitest/src/test/java/com/vaadin/tests/validation/ValidationOfRequiredEmptyFieldsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/validation/ValidationOfRequiredEmptyFieldsTest.java
@@ -11,9 +11,9 @@ import org.openqa.selenium.remote.DesiredCapabilities;
 import org.openqa.selenium.support.ui.ExpectedCondition;
 
 import com.vaadin.testbench.elements.CheckBoxElement;
+import com.vaadin.testbench.elements.TextFieldElement;
 import com.vaadin.testbench.elements.VerticalLayoutElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TextFieldElement;
 
 public class ValidationOfRequiredEmptyFieldsTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/CustomRendererTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/CustomRendererTest.java
index be3c4660b0..393be40f78 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/CustomRendererTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/CustomRendererTest.java
@@ -24,7 +24,7 @@ import org.junit.Test;
 import com.vaadin.testbench.elements.LabelElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 import com.vaadin.v7.tests.components.grid.CustomRenderer;
 
 @TestCategory("grid")
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridAddAndRemoveDataOnInitTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridAddAndRemoveDataOnInitTest.java
index 7e0fca9043..0e315fc280 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridAddAndRemoveDataOnInitTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridAddAndRemoveDataOnInitTest.java
@@ -21,7 +21,7 @@ import org.junit.Test;
 import com.vaadin.testbench.By;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 @TestCategory("grid")
 public class GridAddAndRemoveDataOnInitTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridAddRowTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridAddRowTest.java
index 50acaf6ff7..aa5e13a236 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridAddRowTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridAddRowTest.java
@@ -21,7 +21,7 @@ import org.junit.Test;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 @TestCategory("grid")
 public class GridAddRowTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridCellFocusOnResetSizeTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridCellFocusOnResetSizeTest.java
index b64a78c2dc..98d5b250fc 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridCellFocusOnResetSizeTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridCellFocusOnResetSizeTest.java
@@ -22,10 +22,10 @@ import java.io.IOException;
 import org.junit.Test;
 import org.openqa.selenium.By;
 
+import com.vaadin.testbench.customelements.GridElement;
 import com.vaadin.testbench.elementsbase.ServerClass;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
 
 @TestCategory("grid")
 public class GridCellFocusOnResetSizeTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridCheckBoxDisplayTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridCheckBoxDisplayTest.java
index 70d96f832b..87c7a7cf72 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridCheckBoxDisplayTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridCheckBoxDisplayTest.java
@@ -19,10 +19,10 @@ import org.junit.Assert;
 import org.junit.Test;
 import org.openqa.selenium.By;
 
+import com.vaadin.testbench.customelements.GridElement;
+import com.vaadin.testbench.elements.CheckBoxElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.SingleBrowserTest;
-import com.vaadin.v7.testbench.customelements.CheckBoxElement;
-import com.vaadin.v7.testbench.customelements.GridElement;
 
 @TestCategory("grid")
 public class GridCheckBoxDisplayTest extends SingleBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridClientRenderers.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridClientRenderers.java
index 980dafe355..2a7e4cc9d1 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridClientRenderers.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridClientRenderers.java
@@ -28,16 +28,16 @@ import org.openqa.selenium.remote.DesiredCapabilities;
 
 import com.vaadin.testbench.By;
 import com.vaadin.testbench.TestBenchElement;
+import com.vaadin.testbench.customelements.GridElement;
 import com.vaadin.testbench.elements.GridElement.GridCellElement;
 import com.vaadin.testbench.elements.LabelElement;
 import com.vaadin.testbench.elements.NativeButtonElement;
+import com.vaadin.testbench.elements.NativeSelectElement;
 import com.vaadin.testbench.elementsbase.ServerClass;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
 import com.vaadin.tests.widgetset.client.v7.grid.GridClientColumnRendererConnector.Renderers;
 import com.vaadin.tests.widgetset.server.v7.grid.GridClientColumnRenderers;
-import com.vaadin.v7.testbench.customelements.GridElement;
-import com.vaadin.v7.testbench.customelements.NativeSelectElement;
 
 /**
  * Tests Grid client side renderers
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridColspansTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridColspansTest.java
index c05e7675ca..d57fd5a62f 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridColspansTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridColspansTest.java
@@ -26,7 +26,7 @@ import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.elements.GridElement.GridCellElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 @TestCategory("grid")
 public class GridColspansTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridColumnAutoExpandTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridColumnAutoExpandTest.java
index a5370d5ba3..99dc40ef12 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridColumnAutoExpandTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridColumnAutoExpandTest.java
@@ -21,7 +21,7 @@ import org.junit.Test;
 
 import com.vaadin.testbench.elements.GridElement.GridCellElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 public class GridColumnAutoExpandTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridColumnAutoWidthClientTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridColumnAutoWidthClientTest.java
index 38bc158065..9a1ca896d4 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridColumnAutoWidthClientTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridColumnAutoWidthClientTest.java
@@ -25,4 +25,4 @@ public class GridColumnAutoWidthClientTest
     protected Class<?> getUIClass() {
         return GridColumnAutoWidthClient.class;
     }
-}
\ No newline at end of file
+}
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridColumnAutoWidthServerTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridColumnAutoWidthServerTest.java
index 8235d87696..44647c50fa 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridColumnAutoWidthServerTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridColumnAutoWidthServerTest.java
@@ -25,4 +25,4 @@ public class GridColumnAutoWidthServerTest
     protected Class<?> getUIClass() {
         return GridColumnAutoWidth.class;
     }
-}
\ No newline at end of file
+}
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridColumnWidthRecalculationTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridColumnWidthRecalculationTest.java
index 40e57fffd9..de15148c14 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridColumnWidthRecalculationTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridColumnWidthRecalculationTest.java
@@ -24,7 +24,7 @@ import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.elements.GridElement.GridCellElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.SingleBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 @TestCategory("grid")
 public class GridColumnWidthRecalculationTest extends SingleBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridColumnWidthsWithoutDataTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridColumnWidthsWithoutDataTest.java
index c6c9352656..81f0a83ea2 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridColumnWidthsWithoutDataTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridColumnWidthsWithoutDataTest.java
@@ -20,13 +20,13 @@ import java.util.List;
 import org.junit.Assert;
 import org.junit.Test;
 
+import com.vaadin.testbench.customelements.GridElement;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.elements.GridElement.GridCellElement;
+import com.vaadin.testbench.elements.NativeSelectElement;
 import com.vaadin.testbench.elements.NotificationElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.SingleBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
-import com.vaadin.v7.testbench.customelements.NativeSelectElement;
 
 @TestCategory("grid")
 public class GridColumnWidthsWithoutDataTest extends SingleBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridCustomSelectionModelTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridCustomSelectionModelTest.java
index 76b0d40ebd..31c90c401d 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridCustomSelectionModelTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridCustomSelectionModelTest.java
@@ -25,7 +25,7 @@ import org.openqa.selenium.Keys;
 import com.vaadin.testbench.elements.GridElement.GridCellElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 @TestCategory("grid")
 public class GridCustomSelectionModelTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDataSourceResetTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDataSourceResetTest.java
index 7c1214dc4d..cc3d2ce564 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDataSourceResetTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDataSourceResetTest.java
@@ -22,7 +22,7 @@ import org.junit.Test;
 
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.tests.tb3.SingleBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 public class GridDataSourceResetTest extends SingleBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDefaultSelectionModeTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDefaultSelectionModeTest.java
index 4534c13192..01d8e890f3 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDefaultSelectionModeTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDefaultSelectionModeTest.java
@@ -23,7 +23,7 @@ import org.junit.Test;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.elements.GridElement.GridCellElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 public class GridDefaultSelectionModeTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDetailsDetachTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDetailsDetachTest.java
index 3047d5dd2f..bd29b3fabd 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDetailsDetachTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDetailsDetachTest.java
@@ -25,7 +25,7 @@ import org.openqa.selenium.WebElement;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 @TestCategory("grid")
 public class GridDetailsDetachTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDetailsLayoutExpandTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDetailsLayoutExpandTest.java
index a3a507fca2..f014b129f6 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDetailsLayoutExpandTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDetailsLayoutExpandTest.java
@@ -28,7 +28,7 @@ import com.vaadin.testbench.elements.LabelElement;
 import com.vaadin.testbench.parallel.Browser;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 /**
  * Tests the layouting of Grid's details row when it contains a HorizontalLayout
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDetailsLocationTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDetailsLocationTest.java
index de8e4ea9c4..eabd38a461 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDetailsLocationTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDetailsLocationTest.java
@@ -36,7 +36,7 @@ import com.vaadin.testbench.elements.GridElement.GridRowElement;
 import com.vaadin.testbench.elements.TextFieldElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 @TestCategory("grid")
 public class GridDetailsLocationTest extends MultiBrowserTest {
@@ -316,4 +316,4 @@ public class GridDetailsLocationTest extends MultiBrowserTest {
                 .findElement(By.className("v-grid-scroller-horizontal"));
         return scrollBar;
     }
-}
\ No newline at end of file
+}
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDetailsWidthTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDetailsWidthTest.java
index 458a0eeeb1..d467437151 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDetailsWidthTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDetailsWidthTest.java
@@ -25,7 +25,7 @@ import org.openqa.selenium.WebElement;
 import com.vaadin.testbench.elements.GridElement.GridCellElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.SingleBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 @TestCategory("grid")
 public class GridDetailsWidthTest extends SingleBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDisabledMultiselectTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDisabledMultiselectTest.java
index 44f3aab1aa..d822051992 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDisabledMultiselectTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDisabledMultiselectTest.java
@@ -77,4 +77,4 @@ public class GridDisabledMultiselectTest extends MultiBrowserTest {
 
         assertThat(getFirstSelectCheckBox().isSelected(), is(false));
     }
-}
\ No newline at end of file
+}
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDisabledSideBarTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDisabledSideBarTest.java
index 0471fd77d5..390b4a801b 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDisabledSideBarTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDisabledSideBarTest.java
@@ -85,4 +85,4 @@ public class GridDisabledSideBarTest extends GridBasicClientFeaturesTest {
 
         assertSideBarContainsClass("closed");
     }
-}
\ No newline at end of file
+}
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDragSelectionWhileScrolledTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDragSelectionWhileScrolledTest.java
index 9e3f8a49cc..af5d77adce 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDragSelectionWhileScrolledTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDragSelectionWhileScrolledTest.java
@@ -26,7 +26,7 @@ import org.openqa.selenium.interactions.Actions;
 
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 @TestCategory("grid")
 public class GridDragSelectionWhileScrolledTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridEditingWithNoScrollBarsTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridEditingWithNoScrollBarsTest.java
index 32225283b7..453a9e8b1f 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridEditingWithNoScrollBarsTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridEditingWithNoScrollBarsTest.java
@@ -21,7 +21,7 @@ import org.junit.Test;
 
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 @TestCategory("grid")
 public class GridEditingWithNoScrollBarsTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridEditorConverterNotFoundTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridEditorConverterNotFoundTest.java
index 4f330c6af2..e83329bce6 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridEditorConverterNotFoundTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridEditorConverterNotFoundTest.java
@@ -19,7 +19,7 @@ import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 import com.vaadin.v7.tests.components.grid.GridEditorConverterNotFound;
 import com.vaadin.v7.tests.components.grid.basicfeatures.GridBasicFeaturesTest;
 
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridEditorCustomFieldTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridEditorCustomFieldTest.java
index e330b4e16f..f7b56f53d6 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridEditorCustomFieldTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridEditorCustomFieldTest.java
@@ -19,11 +19,11 @@ import org.junit.Assert;
 import org.junit.Test;
 
 import com.vaadin.testbench.TestBenchElement;
+import com.vaadin.testbench.customelements.ComboBoxElement;
 import com.vaadin.testbench.elements.GridElement.GridEditorElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.ComboBoxElement;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 @TestCategory("grid")
 public class GridEditorCustomFieldTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridEditorFrozenColumnsUITest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridEditorFrozenColumnsUITest.java
index 4675a8e89f..37834756ad 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridEditorFrozenColumnsUITest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridEditorFrozenColumnsUITest.java
@@ -27,7 +27,7 @@ import org.openqa.selenium.interactions.Actions;
 import com.vaadin.testbench.elements.GridElement.GridCellElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 @TestCategory("grid")
 public class GridEditorFrozenColumnsUITest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridEditorMultiselectTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridEditorMultiselectTest.java
index f144615227..dc3d393545 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridEditorMultiselectTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridEditorMultiselectTest.java
@@ -9,7 +9,7 @@ import org.openqa.selenium.WebElement;
 import com.vaadin.testbench.By;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 @TestCategory("grid")
 public class GridEditorMultiselectTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridEditorUITest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridEditorUITest.java
index e51b5fd20c..c87159988a 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridEditorUITest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridEditorUITest.java
@@ -26,12 +26,12 @@ import org.openqa.selenium.Keys;
 import org.openqa.selenium.interactions.Actions;
 
 import com.vaadin.testbench.By;
+import com.vaadin.testbench.customelements.GridElement;
 import com.vaadin.testbench.elements.GridElement.GridCellElement;
 import com.vaadin.testbench.elements.NotificationElement;
+import com.vaadin.testbench.elements.PasswordFieldElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
-import com.vaadin.v7.testbench.customelements.PasswordFieldElement;
 
 @TestCategory("grid")
 public class GridEditorUITest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridExtensionCommunicationTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridExtensionCommunicationTest.java
index 2991cc5c19..c35263a634 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridExtensionCommunicationTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridExtensionCommunicationTest.java
@@ -22,7 +22,7 @@ import org.junit.Test;
 import com.vaadin.testbench.elements.GridElement.GridCellElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.SingleBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 @TestCategory("grid")
 public class GridExtensionCommunicationTest extends SingleBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridGeneratedPropertiesTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridGeneratedPropertiesTest.java
index 57ebb51239..fa755484eb 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridGeneratedPropertiesTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridGeneratedPropertiesTest.java
@@ -25,7 +25,7 @@ import com.vaadin.testbench.elements.GridElement.GridCellElement;
 import com.vaadin.testbench.elements.NotificationElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 @TestCategory("grid")
 public class GridGeneratedPropertiesTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridHeaderFooterComponentsTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridHeaderFooterComponentsTest.java
index bc11ab3411..ae4d8e568f 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridHeaderFooterComponentsTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridHeaderFooterComponentsTest.java
@@ -26,7 +26,7 @@ import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.elements.GridElement.GridCellElement;
 import com.vaadin.testbench.elements.TextFieldElement;
 import com.vaadin.tests.tb3.SingleBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 public class GridHeaderFooterComponentsTest extends SingleBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridHeaderFormatChangeTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridHeaderFormatChangeTest.java
index 39dd75ef88..0d64db4275 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridHeaderFormatChangeTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridHeaderFormatChangeTest.java
@@ -22,7 +22,7 @@ import org.openqa.selenium.By;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 @TestCategory("grid")
 public class GridHeaderFormatChangeTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridHeaderStyleNamesTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridHeaderStyleNamesTest.java
index ba7eca515c..11aea58da2 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridHeaderStyleNamesTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridHeaderStyleNamesTest.java
@@ -25,7 +25,7 @@ import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.elements.GridElement.GridCellElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.SingleBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 @TestCategory("grid")
 public class GridHeaderStyleNamesTest extends SingleBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridHeightTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridHeightTest.java
index 15c8498676..a8a6980d3a 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridHeightTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridHeightTest.java
@@ -27,11 +27,10 @@ import org.junit.Assert;
 import org.junit.Test;
 import org.openqa.selenium.By;
 
+import com.vaadin.testbench.customelements.GridElement;
+import com.vaadin.testbench.elements.OptionGroupElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
-import com.vaadin.v7.testbench.customelements.OptionGroupElement;
-import com.vaadin.v7.tests.components.grid.GridHeight;
 
 /**
  * Tests that Grid gets correct height based on height mode, and resizes
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridInTabSheetTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridInTabSheetTest.java
index 775d79397c..1ebe898b24 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridInTabSheetTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridInTabSheetTest.java
@@ -25,7 +25,7 @@ import com.vaadin.testbench.elements.NotificationElement;
 import com.vaadin.testbench.elements.TabSheetElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 @TestCategory("grid")
 public class GridInTabSheetTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridInWindowResizeTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridInWindowResizeTest.java
index 6f859a015e..0a94c108b5 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridInWindowResizeTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridInWindowResizeTest.java
@@ -25,7 +25,7 @@ import org.openqa.selenium.remote.DesiredCapabilities;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.parallel.Browser;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 public class GridInWindowResizeTest extends MultiBrowserTest {
     @Override
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridInitiallyHiddenColumnsTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridInitiallyHiddenColumnsTest.java
index 509ef262db..e86d21b5d9 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridInitiallyHiddenColumnsTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridInitiallyHiddenColumnsTest.java
@@ -24,7 +24,7 @@ import org.openqa.selenium.WebElement;
 
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.SingleBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 @TestCategory("grid")
 public class GridInitiallyHiddenColumnsTest extends SingleBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridItemSetChangeTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridItemSetChangeTest.java
index e43e5a22a6..63b5eec440 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridItemSetChangeTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridItemSetChangeTest.java
@@ -21,7 +21,7 @@ import org.junit.Test;
 
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.tests.tb3.SingleBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 public class GridItemSetChangeTest extends SingleBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridLayoutDetailsRowTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridLayoutDetailsRowTest.java
index 72de2efdf2..cd744ea51e 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridLayoutDetailsRowTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridLayoutDetailsRowTest.java
@@ -25,7 +25,7 @@ import com.vaadin.testbench.elements.GridLayoutElement;
 import com.vaadin.testbench.elements.LabelElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 /**
  * Tests that details row displays GridLayout contents properly.
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridMultiSelectionOnInitTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridMultiSelectionOnInitTest.java
index d976b586fb..79f6aecb02 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridMultiSelectionOnInitTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridMultiSelectionOnInitTest.java
@@ -24,7 +24,7 @@ import org.openqa.selenium.By;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 @TestCategory("grid")
 public class GridMultiSelectionOnInitTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridMultiSelectionScrollBarTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridMultiSelectionScrollBarTest.java
index 757e577d78..eff1a69b3c 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridMultiSelectionScrollBarTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridMultiSelectionScrollBarTest.java
@@ -22,7 +22,7 @@ import java.io.IOException;
 import org.junit.Test;
 
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 public class GridMultiSelectionScrollBarTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridRendererChangeTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridRendererChangeTest.java
index 0b078b3b7d..a96cad5e20 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridRendererChangeTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridRendererChangeTest.java
@@ -27,7 +27,7 @@ import org.openqa.selenium.By;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.elements.GridElement.GridCellElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 public class GridRendererChangeTest extends MultiBrowserTest {
 
@@ -56,4 +56,4 @@ public class GridRendererChangeTest extends MultiBrowserTest {
                 cell.isElementPresent(By.tagName("button")));
     }
 
-}
\ No newline at end of file
+}
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridReplaceContainerTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridReplaceContainerTest.java
index 8e0071018b..660722173e 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridReplaceContainerTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridReplaceContainerTest.java
@@ -20,7 +20,7 @@ import org.junit.Test;
 
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.tests.tb3.SingleBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 public class GridReplaceContainerTest extends SingleBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridResizeAndScrollTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridResizeAndScrollTest.java
index 5e6d99e6d4..f2f76eeb31 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridResizeAndScrollTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridResizeAndScrollTest.java
@@ -20,7 +20,7 @@ import org.junit.Test;
 
 import com.vaadin.testbench.elements.GridElement.GridCellElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 public class GridResizeAndScrollTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridResizeHiddenColumnTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridResizeHiddenColumnTest.java
index af8b8fe3ed..e3e06c1da2 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridResizeHiddenColumnTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridResizeHiddenColumnTest.java
@@ -28,7 +28,7 @@ import org.openqa.selenium.interactions.Actions;
 import com.vaadin.testbench.elements.GridElement.GridCellElement;
 import com.vaadin.testbench.parallel.BrowserUtil;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 public class GridResizeHiddenColumnTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridRowHeightChangeTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridRowHeightChangeTest.java
index 0962ef5118..7e30829cef 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridRowHeightChangeTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridRowHeightChangeTest.java
@@ -8,9 +8,9 @@ import java.util.List;
 import org.junit.Test;
 
 import com.vaadin.testbench.By;
+import com.vaadin.testbench.customelements.GridElement;
+import com.vaadin.testbench.elements.NativeSelectElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
-import com.vaadin.v7.testbench.customelements.NativeSelectElement;
 
 public class GridRowHeightChangeTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridScrollToLineWhileResizingTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridScrollToLineWhileResizingTest.java
index bcb23a759c..66532e1f24 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridScrollToLineWhileResizingTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridScrollToLineWhileResizingTest.java
@@ -25,7 +25,7 @@ import org.openqa.selenium.WebElement;
 
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 @TestCategory("grid")
 public class GridScrollToLineWhileResizingTest extends MultiBrowserTest {
@@ -46,4 +46,4 @@ public class GridScrollToLineWhileResizingTest extends MultiBrowserTest {
 
         assertTrue(foundCell21);
     }
-}
\ No newline at end of file
+}
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSelectAllCellTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSelectAllCellTest.java
index 56f6a01047..6b1feed7c1 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSelectAllCellTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSelectAllCellTest.java
@@ -11,7 +11,7 @@ import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;
 
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 public class GridSelectAllCellTest extends MultiBrowserTest {
 
@@ -34,4 +34,4 @@ public class GridSelectAllCellTest extends MultiBrowserTest {
                 .findElement(By.cssSelector("input"));
         assertThat(selectAllCheckbox.isSelected(), is(true));
     }
-}
\ No newline at end of file
+}
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSidebarPositionTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSidebarPositionTest.java
index 0c8451d9ac..1bfe232379 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSidebarPositionTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSidebarPositionTest.java
@@ -25,7 +25,7 @@ import org.openqa.selenium.Point;
 import org.openqa.selenium.WebElement;
 
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 import com.vaadin.v7.tests.components.grid.GridSidebarPosition;
 
 public class GridSidebarPositionTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSingleColumnTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSingleColumnTest.java
index 23903f74ad..a0d79ccc73 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSingleColumnTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSingleColumnTest.java
@@ -22,7 +22,7 @@ import com.vaadin.testbench.elements.GridElement.GridCellElement;
 import com.vaadin.testbench.elements.NotificationElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 @TestCategory("grid")
 public class GridSingleColumnTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSortIndicatorTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSortIndicatorTest.java
index 5f35acc507..61762301c2 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSortIndicatorTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSortIndicatorTest.java
@@ -21,7 +21,7 @@ import org.junit.Test;
 
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 @TestCategory("grid")
 public class GridSortIndicatorTest extends MultiBrowserTest {
@@ -50,4 +50,4 @@ public class GridSortIndicatorTest extends MultiBrowserTest {
         assertTrue(grid.getHeaderCell(0, 1).getAttribute("class")
                 .contains("sort-desc"));
     }
-}
\ No newline at end of file
+}
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSpacerDecoClipTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSpacerDecoClipTest.java
index ed392d848f..03b9b780c5 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSpacerDecoClipTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSpacerDecoClipTest.java
@@ -24,7 +24,7 @@ import com.vaadin.testbench.TestBenchElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.minitutorials.v7_5.ShowingExtraDataForRows;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 /**
  * Test for "Grid detail row outline overflows" (#17826)
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSubPixelProblemWrappingTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSubPixelProblemWrappingTest.java
index f47f2f2c05..989d9f6052 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSubPixelProblemWrappingTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSubPixelProblemWrappingTest.java
@@ -22,7 +22,7 @@ import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.elements.GridElement.GridRowElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 @TestCategory("grid")
 public class GridSubPixelProblemWrappingTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSwitchRenderersTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSwitchRenderersTest.java
index 79c2e45a28..9ad5a73c94 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSwitchRenderersTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSwitchRenderersTest.java
@@ -21,7 +21,7 @@ import org.junit.Test;
 import com.vaadin.testbench.elements.CheckBoxElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 @TestCategory("grid")
 public class GridSwitchRenderersTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridThemeChangeTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridThemeChangeTest.java
index 175dd1e11a..98ffec4570 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridThemeChangeTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridThemeChangeTest.java
@@ -23,7 +23,7 @@ import org.openqa.selenium.remote.DesiredCapabilities;
 
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 @TestCategory("grid")
 public class GridThemeChangeTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridThemeUITest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridThemeUITest.java
index 7b2f8ae356..a8adc83b40 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridThemeUITest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridThemeUITest.java
@@ -21,15 +21,15 @@ import org.openqa.selenium.Keys;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;
 
+import com.vaadin.testbench.customelements.DateFieldElement;
+import com.vaadin.testbench.customelements.GridElement;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.elements.GridElement.GridCellElement;
 import com.vaadin.testbench.elements.GridElement.GridEditorElement;
+import com.vaadin.testbench.elements.NativeSelectElement;
+import com.vaadin.testbench.elements.TextFieldElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserThemeTest;
-import com.vaadin.v7.testbench.customelements.DateFieldElement;
-import com.vaadin.v7.testbench.customelements.GridElement;
-import com.vaadin.v7.testbench.customelements.NativeSelectElement;
-import com.vaadin.v7.testbench.customelements.TextFieldElement;
 
 @TestCategory("grid")
 public class GridThemeUITest extends MultiBrowserThemeTest {
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridWidthIncreaseTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridWidthIncreaseTest.java
index fda1984ccf..f3ce36ee5a 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridWidthIncreaseTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridWidthIncreaseTest.java
@@ -26,7 +26,7 @@ import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.parallel.BrowserUtil;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 import com.vaadin.v7.tests.components.grid.GridWidthIncrease;
 
 @TestCategory("grid")
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridWithBrokenRendererTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridWithBrokenRendererTest.java
index a6efe88e32..c9bbe591d3 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridWithBrokenRendererTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridWithBrokenRendererTest.java
@@ -19,7 +19,7 @@ import org.junit.Assert;
 import org.junit.Test;
 
 import com.vaadin.tests.tb3.SingleBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 public class GridWithBrokenRendererTest extends SingleBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridWithLabelEditorTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridWithLabelEditorTest.java
index 6524ee261d..e81fca5614 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridWithLabelEditorTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridWithLabelEditorTest.java
@@ -20,7 +20,7 @@ import static org.junit.Assert.assertEquals;
 import org.junit.Test;
 
 import com.vaadin.tests.tb3.SingleBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 public class GridWithLabelEditorTest extends SingleBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/InitialFrozenColumnsTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/InitialFrozenColumnsTest.java
index f5c6bf9889..522e6802c1 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/InitialFrozenColumnsTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/InitialFrozenColumnsTest.java
@@ -24,7 +24,7 @@ import org.openqa.selenium.WebElement;
 import com.vaadin.testbench.elements.NotificationElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 @TestCategory("grid")
 public class InitialFrozenColumnsTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/JavaScriptRenderersTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/JavaScriptRenderersTest.java
index 206d597cc1..4d248a7129 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/JavaScriptRenderersTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/JavaScriptRenderersTest.java
@@ -21,7 +21,7 @@ import org.junit.Test;
 import com.vaadin.testbench.elements.GridElement.GridCellElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 @TestCategory("grid")
 public class JavaScriptRenderersTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/NullHeadersTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/NullHeadersTest.java
index fa1a9a7318..013f29c678 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/NullHeadersTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/NullHeadersTest.java
@@ -19,7 +19,7 @@ import org.junit.Assert;
 import org.junit.Test;
 
 import com.vaadin.tests.tb3.SingleBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 public class NullHeadersTest extends SingleBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/NullRenderersTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/NullRenderersTest.java
index a8114467d7..7ab958ecfd 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/NullRenderersTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/NullRenderersTest.java
@@ -22,7 +22,7 @@ import org.junit.Test;
 import com.vaadin.testbench.elements.LabelElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 import com.vaadin.v7.tests.components.grid.CustomRenderer;
 
 @TestCategory("grid")
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/ProgrammaticEditorControlTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/ProgrammaticEditorControlTest.java
index aae82d1188..911c9a986b 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/ProgrammaticEditorControlTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/ProgrammaticEditorControlTest.java
@@ -22,7 +22,7 @@ import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.elements.TextFieldElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.SingleBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 @TestCategory("grid")
 public class ProgrammaticEditorControlTest extends SingleBrowserTest {
@@ -61,4 +61,4 @@ public class ProgrammaticEditorControlTest extends SingleBrowserTest {
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/SelectDuringInitTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/SelectDuringInitTest.java
index 7d9d62b45c..052aae5a60 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/SelectDuringInitTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/SelectDuringInitTest.java
@@ -20,7 +20,7 @@ import org.junit.Test;
 
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.SingleBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 @TestCategory("grid")
 public class SelectDuringInitTest extends SingleBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/SortableHeaderStylesTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/SortableHeaderStylesTest.java
index 3d731e1285..bef04bda7f 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/SortableHeaderStylesTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/SortableHeaderStylesTest.java
@@ -18,9 +18,9 @@ package com.vaadin.v7.tests.components.grid;
 import org.junit.Assert;
 import org.junit.Test;
 
+import com.vaadin.testbench.customelements.GridElement;
+import com.vaadin.testbench.elements.OptionGroupElement;
 import com.vaadin.tests.tb3.SingleBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
-import com.vaadin.v7.testbench.customelements.OptionGroupElement;
 
 public class SortableHeaderStylesTest extends SingleBrowserTest {
     @Test
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/WidgetRenderersTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/WidgetRenderersTest.java
index e3e6c5ba98..3786c818d3 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/WidgetRenderersTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/WidgetRenderersTest.java
@@ -31,7 +31,7 @@ import com.vaadin.testbench.elements.GridElement.GridCellElement;
 import com.vaadin.testbench.elements.NotificationElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 import com.vaadin.v7.tests.components.grid.WidgetRenderers;
 
 /**
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridBasicClientFeaturesTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridBasicClientFeaturesTest.java
index f4bd915cce..2eb8e3c598 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridBasicClientFeaturesTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridBasicClientFeaturesTest.java
@@ -21,8 +21,7 @@ import org.openqa.selenium.WebElement;
 
 import com.vaadin.testbench.By;
 import com.vaadin.testbench.TestBenchElement;
-import com.vaadin.v7.testbench.customelements.GridElement;
-import com.vaadin.v7.tests.components.grid.basicfeatures.GridBasicClientFeatures;
+import com.vaadin.testbench.customelements.GridElement;
 
 /**
  * GridBasicClientFeatures.
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridBasicFeaturesTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridBasicFeaturesTest.java
index 5787c2facc..ae6ef31cd5 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridBasicFeaturesTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridBasicFeaturesTest.java
@@ -28,11 +28,10 @@ import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;
 
 import com.vaadin.testbench.TestBenchElement;
+import com.vaadin.testbench.customelements.GridElement;
 import com.vaadin.testbench.elements.GridElement.GridCellElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
-import com.vaadin.v7.tests.components.grid.basicfeatures.GridBasicFeatures;
 
 @TestCategory("grid")
 public abstract class GridBasicFeaturesTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridDefaultTextRendererTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridDefaultTextRendererTest.java
index 4766a29018..7969e55f66 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridDefaultTextRendererTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridDefaultTextRendererTest.java
@@ -23,10 +23,10 @@ import org.junit.Before;
 import org.junit.Test;
 
 import com.vaadin.testbench.By;
+import com.vaadin.testbench.customelements.GridElement;
 import com.vaadin.testbench.elements.NotificationElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
 import com.vaadin.v7.tests.components.grid.GridCellFocusOnResetSizeTest.MyGridElement;
 
 @TestCategory("grid")
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridHeightByRowOnInitTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridHeightByRowOnInitTest.java
index de51053535..a8094f01a2 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridHeightByRowOnInitTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridHeightByRowOnInitTest.java
@@ -2,9 +2,9 @@ package com.vaadin.v7.tests.components.grid.basicfeatures;
 
 import org.junit.Test;
 
+import com.vaadin.testbench.customelements.GridElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
 
 @SuppressWarnings("all")
 @TestCategory("grid")
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/client/GridClientColumnPropertiesTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/client/GridClientColumnPropertiesTest.java
index a0ca714824..2d90e654be 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/client/GridClientColumnPropertiesTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/client/GridClientColumnPropertiesTest.java
@@ -24,10 +24,10 @@ import java.util.List;
 
 import org.junit.Test;
 
+import com.vaadin.testbench.customelements.GridElement;
 import com.vaadin.testbench.elements.GridElement.GridCellElement;
-import com.vaadin.tests.widgetset.client.v7.grid.GridBasicClientFeaturesWidget;
 import com.vaadin.testbench.elements.NotificationElement;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.tests.widgetset.client.v7.grid.GridBasicClientFeaturesWidget;
 import com.vaadin.v7.tests.components.grid.basicfeatures.GridBasicClientFeaturesTest;
 
 public class GridClientColumnPropertiesTest
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/client/GridSidebarContentTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/client/GridSidebarContentTest.java
index 5adae48d62..d7549bf5ff 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/client/GridSidebarContentTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/client/GridSidebarContentTest.java
@@ -22,7 +22,7 @@ import org.junit.Test;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 import com.vaadin.v7.tests.components.grid.basicfeatures.GridBasicClientFeaturesTest;
 
 public class GridSidebarContentTest extends GridBasicClientFeaturesTest {
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridCellFocusAdjustmentTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridCellFocusAdjustmentTest.java
index 515c7dbdbf..1400349164 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridCellFocusAdjustmentTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridCellFocusAdjustmentTest.java
@@ -21,7 +21,7 @@ import org.junit.Test;
 import org.openqa.selenium.Keys;
 import org.openqa.selenium.interactions.Actions;
 
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 import com.vaadin.v7.tests.components.grid.basicfeatures.GridBasicFeaturesTest;
 
 public class GridCellFocusAdjustmentTest extends GridBasicFeaturesTest {
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridClearContainerTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridClearContainerTest.java
index 12636c7817..c9b1adbded 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridClearContainerTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridClearContainerTest.java
@@ -18,10 +18,10 @@ package com.vaadin.v7.tests.components.grid.basicfeatures.server;
 import org.junit.Assert;
 import org.junit.Test;
 
+import com.vaadin.testbench.customelements.GridElement;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
 
 /**
  * Tests that removing and adding rows doesn't cause an infinite loop in the
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridKeyboardNavigationTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridKeyboardNavigationTest.java
index 34fcea09fb..f71ae9f615 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridKeyboardNavigationTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridKeyboardNavigationTest.java
@@ -24,7 +24,7 @@ import org.openqa.selenium.Keys;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;
 
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 import com.vaadin.v7.tests.components.grid.basicfeatures.GridBasicFeatures;
 import com.vaadin.v7.tests.components.grid.basicfeatures.GridBasicFeaturesTest;
 
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridScrollTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridScrollTest.java
index d3fefddeea..4f10c5b72a 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridScrollTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridScrollTest.java
@@ -20,7 +20,7 @@ import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 import com.vaadin.v7.tests.components.grid.basicfeatures.GridBasicFeaturesTest;
 
 public class GridScrollTest extends GridBasicFeaturesTest {
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridSelectionTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridSelectionTest.java
index 319848fec3..1bb989be1d 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridSelectionTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridSelectionTest.java
@@ -26,9 +26,9 @@ import org.openqa.selenium.interactions.Actions;
 import org.openqa.selenium.support.ui.ExpectedCondition;
 
 import com.vaadin.testbench.By;
+import com.vaadin.testbench.customelements.GridElement;
 import com.vaadin.testbench.elements.GridElement.GridCellElement;
 import com.vaadin.testbench.elements.GridElement.GridRowElement;
-import com.vaadin.v7.testbench.customelements.GridElement;
 import com.vaadin.v7.tests.components.grid.basicfeatures.GridBasicFeatures;
 import com.vaadin.v7.tests.components.grid.basicfeatures.GridBasicFeaturesTest;
 
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridSortingTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridSortingTest.java
index 5cb6f59021..969f975cdd 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridSortingTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridSortingTest.java
@@ -31,8 +31,8 @@ import org.openqa.selenium.interactions.Actions;
 
 import com.vaadin.shared.data.sort.SortDirection;
 import com.vaadin.testbench.By;
+import com.vaadin.testbench.customelements.GridElement;
 import com.vaadin.testbench.elements.GridElement.GridCellElement;
-import com.vaadin.v7.testbench.customelements.GridElement;
 import com.vaadin.v7.tests.components.grid.basicfeatures.GridBasicFeatures;
 import com.vaadin.v7.tests.components.grid.basicfeatures.GridBasicFeaturesTest;
 
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridStructureTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridStructureTest.java
index ed84b9d056..aa38f61083 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridStructureTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridStructureTest.java
@@ -31,9 +31,9 @@ import org.openqa.selenium.WebElement;
 
 import com.vaadin.testbench.By;
 import com.vaadin.testbench.TestBenchElement;
+import com.vaadin.testbench.customelements.GridElement;
 import com.vaadin.testbench.elements.GridElement.GridCellElement;
 import com.vaadin.testbench.elements.NotificationElement;
-import com.vaadin.v7.testbench.customelements.GridElement;
 import com.vaadin.v7.tests.components.grid.basicfeatures.GridBasicFeatures;
 import com.vaadin.v7.tests.components.grid.basicfeatures.GridBasicFeaturesTest;
 
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/LoadingIndicatorTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/LoadingIndicatorTest.java
index 7d7e88f8c1..1b25aa22f4 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/LoadingIndicatorTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/LoadingIndicatorTest.java
@@ -22,7 +22,7 @@ import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.support.ui.ExpectedCondition;
 import org.openqa.selenium.support.ui.ExpectedConditions;
 
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 import com.vaadin.v7.tests.components.grid.basicfeatures.GridBasicFeaturesTest;
 
 public class LoadingIndicatorTest extends GridBasicFeaturesTest {
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/nativeselect/NativeSelectNullTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/nativeselect/NativeSelectNullTest.java
index cb33b9e93f..2ddb68988e 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/nativeselect/NativeSelectNullTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/nativeselect/NativeSelectNullTest.java
@@ -3,8 +3,8 @@ package com.vaadin.v7.tests.components.nativeselect;
 import org.junit.Assert;
 import org.junit.Test;
 
+import com.vaadin.testbench.elements.NativeSelectElement;
 import com.vaadin.tests.tb3.SingleBrowserTestPhantomJS2;
-import com.vaadin.v7.testbench.customelements.NativeSelectElement;
 
 public class NativeSelectNullTest extends SingleBrowserTestPhantomJS2 {
     @Test
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/nativeselect/NativeSelectsFocusAndBlurListenerTests.java b/uitest/src/test/java/com/vaadin/v7/tests/components/nativeselect/NativeSelectsFocusAndBlurListenerTests.java
index d0d9bcbe3d..a9e7d1b624 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/nativeselect/NativeSelectsFocusAndBlurListenerTests.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/nativeselect/NativeSelectsFocusAndBlurListenerTests.java
@@ -20,10 +20,10 @@ import org.junit.Test;
 import org.openqa.selenium.By;
 import org.openqa.selenium.interactions.Actions;
 
+import com.vaadin.testbench.elements.NativeSelectElement;
 import com.vaadin.testbench.parallel.BrowserUtil;
 import com.vaadin.tests.components.nativeselect.NativeSelects;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.NativeSelectElement;
 
 public class NativeSelectsFocusAndBlurListenerTests extends MultiBrowserTest {